diff --git a/Manifest.files.gz b/Manifest.files.gz
index bccd843b09aa..ad9ca9496f82 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index c793484e4e59..de8379d3d4fc 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/opendmarc/opendmarc-1.ebuild b/acct-group/opendmarc/opendmarc-1.ebuild
new file mode 100644
index 000000000000..87306502f6d3
--- /dev/null
+++ b/acct-group/opendmarc/opendmarc-1.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/opendmarc"
+ACCT_GROUP_ID=244
diff --git a/acct-group/radius/metadata.xml b/acct-group/radius/metadata.xml
index aeaeea373703..fcf1cd64f680 100644
--- a/acct-group/radius/metadata.xml
+++ b/acct-group/radius/metadata.xml
@@ -1,12 +1,5 @@
-
- geaaru@gmail.com
- Daniele Rondina
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
+
+
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index e9d05ca7f54f..693dfe146722 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/radius/metadata.xml b/acct-user/radius/metadata.xml
index aeaeea373703..fcf1cd64f680 100644
--- a/acct-user/radius/metadata.xml
+++ b/acct-user/radius/metadata.xml
@@ -1,12 +1,5 @@
-
- geaaru@gmail.com
- Daniele Rondina
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
+
+
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cd5084041da6..74c807836384 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index b49699f96a8b..44046ae4af55 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,3 +1,3 @@
-DIST graylog-3.3.15.tgz 129427763 BLAKE2B 60e6f72662d2343b7f85263d0c45f58279599936781a85eaba94642c8ab75133c5a0716ccd0e9c6cd5e557671f68e09e9f372e369d00428884e84f4285f4e8b4 SHA512 93c2cf3728add6c8fc9cc0c17134edf5921511e1ee0bbd2a56a4dff443f0dc60e79d306c2b6510d60f34092648b6521d322a7775c3664e425ae8447fc5968831
-DIST graylog-4.0.14.tgz 190700195 BLAKE2B 4a5100c062ffc7de1636f5cec4f68a114a1fbdeb00b173600d3c6b39c626ef6e2b5b021a5a1d75a49c4268e813b2939c385ee0564d72aadefb83c53cfaf86cfa SHA512 4d06d7be90f2352867a533338400a862b0487f7abb71aabac858797067f7425bb6853be83a3f4820d330ae6b41233ce1e2c21c89e1de8494873c349111eead42
-DIST graylog-4.1.9.tgz 197211219 BLAKE2B c777d43b91c3a474dae911f8cd1effedd15d0c7b9b3964d219c25c9fc6df217ca587c411a33953ee42fcebb38f8ad12cdd3c79b6421c093e8ec24d29d1b1d445 SHA512 406605d0d6e5f94c1ac09a5a6598f8e029a7a7d1f9637cb971e00b8388f2001be931342780c14512c7a92eb1fe3715fe866b56ce19c7f2f521c740ffd56f12b2
+DIST graylog-3.3.16.tgz 129430640 BLAKE2B aa50a101c9aec9d0e32fe7dfbc0a1c29a7473658ca881f4977e6cc18c4764dde44991af35c19451e5452c0fd832b098743c01eb460d733ba2b1da7d2c5c42865 SHA512 bd6fcc71ad437293500359563662253ef7a38f5961a4dd8f5bfac67ef38ae7025593a69dd160bd8fe5efb48648125c0d441b2c7533e7432927069d6d68e0a239
+DIST graylog-4.0.15.tgz 190661423 BLAKE2B 2c651ba3aa539090cad2c9110b45f1f0faaec30571afa7e225d1c3b3dd3a5379d2cb5176ae708b9d2fb8e1704577966622f0e6fadc5463a152fb93873be31f29 SHA512 a25c1648b7b6237a9cb15801d4ca18a0a2e17c3140684550ffa11bb15e5ab34792a3dbea7241023fcef9aa436670ca9a582f05d1c145ab320006f8686ed6fc1c
+DIST graylog-4.1.10.tgz 197206255 BLAKE2B d92891a9d746b39f607ac736e60e8369a5dca59144b096ee12421f5d05d350e8e05cc3d73d90bf4dc045b2b76273d8ad67c85cb8f5436b1e1c4ae1af3907525d SHA512 2a7e0c7ffaa2f2508f087c807d9b248346ecb399b824410090ea7c59a6341e02a7bfedf6b4956e1def721535857de18e379673202f722384451653dd12e7bf3e
diff --git a/app-admin/graylog/graylog-3.3.15.ebuild b/app-admin/graylog/graylog-3.3.16.ebuild
similarity index 100%
rename from app-admin/graylog/graylog-3.3.15.ebuild
rename to app-admin/graylog/graylog-3.3.16.ebuild
diff --git a/app-admin/graylog/graylog-4.0.14.ebuild b/app-admin/graylog/graylog-4.0.15.ebuild
similarity index 100%
rename from app-admin/graylog/graylog-4.0.14.ebuild
rename to app-admin/graylog/graylog-4.0.15.ebuild
diff --git a/app-admin/graylog/graylog-4.1.9.ebuild b/app-admin/graylog/graylog-4.1.10.ebuild
similarity index 100%
rename from app-admin/graylog/graylog-4.1.9.ebuild
rename to app-admin/graylog/graylog-4.1.10.ebuild
diff --git a/app-admin/mcelog/mcelog-180-r1.ebuild b/app-admin/mcelog/mcelog-180-r1.ebuild
new file mode 100644
index 000000000000..b52399135375
--- /dev/null
+++ b/app-admin/mcelog/mcelog-180-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_9 python3_10)
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+DEPEND="${PYTHON_DEPS}"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~X86_MCE"
+ kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+ python_fix_shebang genconfig.py
+}
+
+src_install() {
+ default
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit ${PN}.service
+
+ dodoc *.pdf
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 07003498c207..597a9b979738 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 71e1020fd8db..d07beee0476a 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1 +1,2 @@
DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
+DIST wrk-4.2.0.tar.gz 10973405 BLAKE2B e81698f70017cd7d55ee7adceb050ea48b2ed9d2ef9195e5b2743dafb637f78d54c8003d049c2965f90457f9b7a80620b86bc0b9bb1a259b88e5c66d6af8cc79 SHA512 c356b1314f37b558f39f30d9a9c6a2a9c2f646eaf7c0cb4262325850922528148f89ccbe7c33390c87e40f8fef6fffd704e3cfe75a89e4e9b178101043fa038d
diff --git a/app-benchmarks/wrk/files/wrk-4.2.0-makefile.patch b/app-benchmarks/wrk/files/wrk-4.2.0-makefile.patch
new file mode 100644
index 000000000000..b5a32ae9b5eb
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-4.2.0-makefile.patch
@@ -0,0 +1,54 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT
++CFLAGS += -std=c99 -Wall -D_REENTRANT
+ LIBS := -lm -lssl -lcrypto -lpthread
+
+ TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
+@@ -24,15 +24,13 @@
+
+ ODIR := obj
+ OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o
+-LIBS := -lluajit-5.1 $(LIBS)
++LIBS := $(LUA_LIBS) $(LIBS)
+
+ DEPS :=
+ CFLAGS += -I$(ODIR)/include
+-LDFLAGS += -L$(ODIR)/lib
+
+ ifneq ($(WITH_LUAJIT),)
+- CFLAGS += -I$(WITH_LUAJIT)/include
+- LDFLAGS += -L$(WITH_LUAJIT)/lib
++ CFLAGS += $(WITH_LUAJIT)
+ else
+ CFLAGS += -I$(ODIR)/include/luajit-2.1
+ DEPS += $(ODIR)/lib/libluajit-5.1.a
+@@ -40,7 +38,6 @@
+
+ ifneq ($(WITH_OPENSSL),)
+ CFLAGS += -I$(WITH_OPENSSL)/include
+- LDFLAGS += -L$(WITH_OPENSSL)/lib
+ else
+ DEPS += $(ODIR)/lib/libssl.a
+ endif
+@@ -51,8 +48,7 @@
+ $(RM) -rf $(BIN) obj/*
+
+ $(BIN): $(OBJ)
+- @echo LINK $(BIN)
+- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ $(OBJ): config.h Makefile $(DEPS) | $(ODIR)
+
+@@ -67,8 +63,7 @@
+ @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ -
+
+ $(ODIR)/%.o : %.c
+- @echo CC $<
+- @$(CC) $(CFLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) -c -o $@ $<
+
+ # Dependencies
+
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
index a72f75b15bd4..ae473486ff83 100644
--- a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
@@ -5,7 +5,7 @@ EAPI=7
LUA_COMPAT=( luajit )
-inherit lua-single
+inherit lua-single toolchain-funcs
DESCRIPTION="A HTTP benchmarking tool"
HOMEPAGE="https://www.github.com/wg/wrk"
diff --git a/app-benchmarks/wrk/wrk-4.2.0.ebuild b/app-benchmarks/wrk/wrk-4.2.0.ebuild
new file mode 100644
index 000000000000..93042e4f6647
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit lua-single toolchain-funcs
+
+DESCRIPTION="A HTTP benchmarking tool"
+HOMEPAGE="https://www.github.com/wg/wrk"
+SRC_URI="https://www.github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+ dev-libs/openssl:0=
+ ${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" )
+
+PATCHES=( "${FILESDIR}/${PN}-4.2.0-makefile.patch" )
+
+src_compile() {
+ myemakeargs=(
+ CC="$(tc-getCC)"
+ LUA_LIBS="$(lua_get_LIBS)"
+ VER="${PV}"
+ WITH_LUAJIT="$(lua_get_CFLAGS)"
+ WITH_OPENSSL="/usr"
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_install() {
+ dobin wrk
+
+ insinto /usr/share/wrk
+ doins -r scripts
+
+ einstalldocs
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a36c11204c5d..dd75948bbff5 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 361b8317215c..7402ad50fecf 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,2 +1 @@
-DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
deleted file mode 100644
index 9a250d65624c..000000000000
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ /dev/null
@@ -1,186 +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} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 +lmdb otp selinux ssl static-libs test X"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- ssl? (
- >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
- )
- berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
- gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
- lmdb? ( dev-db/lmdb )
- caps? ( sys-libs/libcap-ng )
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
- afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0 )
- X? (
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXt
- )
- !!app-crypt/mit-krb5
- !!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- dev-perl/JSON
- virtual/pkgconfig
- sys-apps/texinfo
- >=sys-devel/autoconf-2.62
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/krb5-types.h
- /usr/include/cms_asn1.h
- /usr/include/digest_asn1.h
- /usr/include/hdb_asn1.h
- /usr/include/krb5_asn1.h
- /usr/include/pkcs12_asn1.h
- /usr/include/pkinit_asn1.h
- /usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-PATCHES=(
- "${FILESDIR}/heimdal_disable-check-iprop.patch"
- "${FILESDIR}/heimdal_tinfo.patch"
- "${FILESDIR}/heimdal_hcrypto.patch"
- "${FILESDIR}/heimdal_build-headers-before-use.patch"
- "${FILESDIR}/heimdal_fix-db60.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-kcm
- --disable-osfc2
- --enable-shared
- --with-libintl="${EPREFIX}"/usr
- --with-readline="${EPREFIX}"/usr
- --with-sqlite3="${EPREFIX}"/usr
- --libexecdir="${EPREFIX}"/usr/sbin
- --enable-pthread-support
- --enable-kx509
- --enable-pk-init
- $(use_enable afs afs-support)
- $(use_enable gdbm ndbm-db)
- $(use_enable lmdb mdb-db)
- $(use_enable otp)
- $(use_enable static-libs static)
- $(multilib_native_use_with caps capng)
- $(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
- $(use_with ipv6)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(multilib_native_use_with X x)
- )
- if use berkdb; then
- myeconfargs+=(
- --with-berkeley-db
- --with-berkeley-db-include="$(db_includedir)"
- )
- else
- myeconfargs+=(
- --without-berkeley-db
- )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- emake -C include
- emake -C lib
- emake -C kdc
- emake -C tools
- emake -C tests/plugin
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
- else
- emake -C include DESTDIR="${D}" install
- emake -C lib DESTDIR="${D}" install
- emake -C kdc DESTDIR="${D}" install
- emake -C tools DESTDIR="${D}" install
- emake -C tests/plugin DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog* README NEWS TODO
-
- # client rename
- mv "${ED}"/usr/share/man/man1/{,k}su.1
- mv "${ED}"/usr/bin/{,k}su
-
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
- insinto /etc
- newins "${S}"/krb5.conf krb5.conf.example
-
- if use hdb-ldap; then
- insinto /etc/openldap/schema
- doins "${S}/lib/hdb/hdb.schema"
- fi
-
- if ! use static-libs ; then
- find "${ED}" -name "*.la" -delete || die
- fi
-
- # default database dir
- keepdir /var/heimdal
-}
diff --git a/app-crypt/xca/xca-2.4.0-r2.ebuild b/app-crypt/xca/xca-2.4.0-r2.ebuild
index 5fcc2c93e237..24e383caf260 100644
--- a/app-crypt/xca/xca-2.4.0-r2.ebuild
+++ b/app-crypt/xca/xca-2.4.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc"
RDEPEND="
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 4facac76a43e..cddf513adae4 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild b/app-dicts/aspell-af/aspell-af-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-af/aspell-af-0.50.0.ebuild
rename to app-dicts/aspell-af/aspell-af-0.50.0-r1.ebuild
index f4c79c820ed0..2cb86b9ca73d 100644
--- a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
+++ b/app-dicts/aspell-af/aspell-af-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Afrikaans"
diff --git a/app-dicts/aspell-am/aspell-am-0.03.1.ebuild b/app-dicts/aspell-am/aspell-am-0.03.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-am/aspell-am-0.03.1.ebuild
rename to app-dicts/aspell-am/aspell-am-0.03.1-r1.ebuild
index eceeaee89652..9827cd228c8d 100644
--- a/app-dicts/aspell-am/aspell-am-0.03.1.ebuild
+++ b/app-dicts/aspell-am/aspell-am-0.03.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Amharic"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild b/app-dicts/aspell-ar/aspell-ar-1.2.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild
rename to app-dicts/aspell-ar/aspell-ar-1.2.0-r1.ebuild
index 6ae9cd54bd1f..5402196ad815 100644
--- a/app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild
+++ b/app-dicts/aspell-ar/aspell-ar-1.2.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Arabic"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-ast/aspell-ast-0.01.ebuild b/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-ast/aspell-ast-0.01.ebuild
rename to app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild
index e89f4a588705..35d266f9214d 100644
--- a/app-dicts/aspell-ast/aspell-ast-0.01.ebuild
+++ b/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Asturian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-az/aspell-az-0.02.0.ebuild b/app-dicts/aspell-az/aspell-az-0.02.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-az/aspell-az-0.02.0.ebuild
rename to app-dicts/aspell-az/aspell-az-0.02.0-r1.ebuild
index 59b4ca9751bf..5e569343cef5 100644
--- a/app-dicts/aspell-az/aspell-az-0.02.0.ebuild
+++ b/app-dicts/aspell-az/aspell-az-0.02.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Azerbaijani"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild b/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild
similarity index 98%
rename from app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
rename to app-dicts/aspell-be/aspell-be-0.01-r2.ebuild
index 8f0a7b14d104..b2ec769036cb 100644
--- a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
+++ b/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Belarusian"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild b/app-dicts/aspell-bg/aspell-bg-4.1.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
rename to app-dicts/aspell-bg/aspell-bg-4.1.0-r1.ebuild
index 0a1ca7120237..f738da67102f 100644
--- a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
+++ b/app-dicts/aspell-bg/aspell-bg-4.1.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Bulgarian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild b/app-dicts/aspell-bn/aspell-bn-0.01.1.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild
rename to app-dicts/aspell-bn/aspell-bn-0.01.1.1-r1.ebuild
index 48dbbfd61063..abae490a6535 100644
--- a/app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild
+++ b/app-dicts/aspell-bn/aspell-bn-0.01.1.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Bengali"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild b/app-dicts/aspell-br/aspell-br-0.50.2-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-br/aspell-br-0.50.2.ebuild
rename to app-dicts/aspell-br/aspell-br-0.50.2-r1.ebuild
index 9802d4cfd520..082f50172c84 100644
--- a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
+++ b/app-dicts/aspell-br/aspell-br-0.50.2-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Breton"
diff --git a/app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild b/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild
rename to app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild
index 7a90a6e0db3c..7521aee525c1 100644
--- a/app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild
+++ b/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Catalan"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild b/app-dicts/aspell-cs/aspell-cs-20040614.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild
rename to app-dicts/aspell-cs/aspell-cs-20040614.1-r1.ebuild
index 9e1f29f504fe..81f3aa17956e 100644
--- a/app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild
+++ b/app-dicts/aspell-cs/aspell-cs-20040614.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Czech"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild b/app-dicts/aspell-csb/aspell-csb-0.02.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild
rename to app-dicts/aspell-csb/aspell-csb-0.02.0-r1.ebuild
index 142be8bfd73a..9865a20f4266 100644
--- a/app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild
+++ b/app-dicts/aspell-csb/aspell-csb-0.02.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Kashubian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild b/app-dicts/aspell-cy/aspell-cy-0.50.3-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
rename to app-dicts/aspell-cy/aspell-cy-0.50.3-r1.ebuild
index 8237b47e0679..3c8271fa6793 100644
--- a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
+++ b/app-dicts/aspell-cy/aspell-cy-0.50.3-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Welsh"
diff --git a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild b/app-dicts/aspell-da/aspell-da-1.7.42-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-da/aspell-da-1.7.42.ebuild
rename to app-dicts/aspell-da/aspell-da-1.7.42-r1.ebuild
index ef0d29179ac3..1c8beac7d1ec 100644
--- a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
+++ b/app-dicts/aspell-da/aspell-da-1.7.42-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Danish"
diff --git a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r2.ebuild
similarity index 98%
rename from app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
rename to app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r2.ebuild
index 9c69a1f906ff..c657291e1682 100644
--- a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
+++ b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="German (traditional orthography)"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild b/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild
rename to app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
index 76d8d3fcfcd2..908e9ae55fff 100644
--- a/app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild
+++ b/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="German, Austria-German and Swiss-German"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-el/aspell-el-0.08.0.ebuild b/app-dicts/aspell-el/aspell-el-0.08.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-el/aspell-el-0.08.0.ebuild
rename to app-dicts/aspell-el/aspell-el-0.08.0-r1.ebuild
index 95cc39f59dd5..a0071d0082c2 100644
--- a/app-dicts/aspell-el/aspell-el-0.08.0.ebuild
+++ b/app-dicts/aspell-el/aspell-el-0.08.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Greek"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild b/app-dicts/aspell-en/aspell-en-2020.12.07.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild
rename to app-dicts/aspell-en/aspell-en-2020.12.07.0-r1.ebuild
index c2a896a8ce9e..c1a80c28eca0 100644
--- a/app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-2020.12.07.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="English (British, Canadian, US)"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
rename to app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild
index 34850a815381..a388ee81de6e 100644
--- a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
+++ b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Esperanto"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-es/aspell-es-1.11.2.ebuild b/app-dicts/aspell-es/aspell-es-1.11.2-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-es/aspell-es-1.11.2.ebuild
rename to app-dicts/aspell-es/aspell-es-1.11.2-r1.ebuild
index 022ae7d2d562..7ae068ec24df 100644
--- a/app-dicts/aspell-es/aspell-es-1.11.2.ebuild
+++ b/app-dicts/aspell-es/aspell-es-1.11.2-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Spanish"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild b/app-dicts/aspell-et/aspell-et-0.1.21.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
rename to app-dicts/aspell-et/aspell-et-0.1.21.1-r1.ebuild
index 500ebfb47ea4..31bc3617ce73 100644
--- a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
+++ b/app-dicts/aspell-et/aspell-et-0.1.21.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Estonian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild b/app-dicts/aspell-fa/aspell-fa-0.11.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild
rename to app-dicts/aspell-fa/aspell-fa-0.11.0-r1.ebuild
index 81c859234d97..39f8963febe3 100644
--- a/app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild
+++ b/app-dicts/aspell-fa/aspell-fa-0.11.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Persian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild b/app-dicts/aspell-fi/aspell-fi-0.7.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
rename to app-dicts/aspell-fi/aspell-fi-0.7.0-r1.ebuild
index bc2a935d2bd3..2c3e4173775f 100644
--- a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
+++ b/app-dicts/aspell-fi/aspell-fi-0.7.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Finnish"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild b/app-dicts/aspell-fo/aspell-fo-0.2.16.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild
rename to app-dicts/aspell-fo/aspell-fo-0.2.16.1-r1.ebuild
index 294f8203b234..14fd9e469f53 100644
--- a/app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild
+++ b/app-dicts/aspell-fo/aspell-fo-0.2.16.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Faroese"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild b/app-dicts/aspell-fr/aspell-fr-0.50.3-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild
rename to app-dicts/aspell-fr/aspell-fr-0.50.3-r1.ebuild
index 313b671b9d5d..09423601c31f 100644
--- a/app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild
+++ b/app-dicts/aspell-fr/aspell-fr-0.50.3-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="French"
diff --git a/app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild b/app-dicts/aspell-fy/aspell-fy-0.12.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild
rename to app-dicts/aspell-fy/aspell-fy-0.12.0-r1.ebuild
index 268be2952bee..f13b7315cd6f 100644
--- a/app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild
+++ b/app-dicts/aspell-fy/aspell-fy-0.12.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Frisian Frysk"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild b/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild
rename to app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild
index a567c231d52a..c069788eed98 100644
--- a/app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild
+++ b/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Irish"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild b/app-dicts/aspell-gd/aspell-gd-0.1.1.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild
rename to app-dicts/aspell-gd/aspell-gd-0.1.1.1-r1.ebuild
index 095bae137e83..aaf11cb2cd91 100644
--- a/app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild
+++ b/app-dicts/aspell-gd/aspell-gd-0.1.1.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Scottish Gaelic"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild b/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
rename to app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild
index 8d51194f31cd..0a011f7ac891 100644
--- a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
+++ b/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Galician"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild b/app-dicts/aspell-grc/aspell-grc-0.02.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild
rename to app-dicts/aspell-grc/aspell-grc-0.02.0-r1.ebuild
index a8ee911b2fb5..6eb8b6fbf2f7 100644
--- a/app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild
+++ b/app-dicts/aspell-grc/aspell-grc-0.02.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Ancient Greek"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild b/app-dicts/aspell-gu/aspell-gu-0.03.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild
rename to app-dicts/aspell-gu/aspell-gu-0.03.0-r1.ebuild
index 2b1598e70088..775c3e2faea0 100644
--- a/app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild
+++ b/app-dicts/aspell-gu/aspell-gu-0.03.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Gujarati"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild b/app-dicts/aspell-gv/aspell-gv-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild
rename to app-dicts/aspell-gv/aspell-gv-0.50.0-r1.ebuild
index 196356bfa56e..df11d210405e 100644
--- a/app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild
+++ b/app-dicts/aspell-gv/aspell-gv-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Manx Gaelic"
diff --git a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild b/app-dicts/aspell-he/aspell-he-1.0.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-he/aspell-he-1.0.0.ebuild
rename to app-dicts/aspell-he/aspell-he-1.0.0-r1.ebuild
index ac4e5096e25d..615103290bfd 100644
--- a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
+++ b/app-dicts/aspell-he/aspell-he-1.0.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Hebrew"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild b/app-dicts/aspell-hi/aspell-hi-0.02.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild
rename to app-dicts/aspell-hi/aspell-hi-0.02.0-r1.ebuild
index cf452e0e8c58..7c3b98b15c69 100644
--- a/app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild
+++ b/app-dicts/aspell-hi/aspell-hi-0.02.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Hindi"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild b/app-dicts/aspell-hil/aspell-hil-0.11.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild
rename to app-dicts/aspell-hil/aspell-hil-0.11.0-r1.ebuild
index 283bed87c9d3..1d7046b8c97a 100644
--- a/app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild
+++ b/app-dicts/aspell-hil/aspell-hil-0.11.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Hiligaynon"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild b/app-dicts/aspell-hr/aspell-hr-0.51.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
rename to app-dicts/aspell-hr/aspell-hr-0.51.0-r1.ebuild
index 29fe1f0f3f8e..eab4ea1e3f29 100644
--- a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
+++ b/app-dicts/aspell-hr/aspell-hr-0.51.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Croatian"
diff --git a/app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild b/app-dicts/aspell-hsb/aspell-hsb-0.02.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild
rename to app-dicts/aspell-hsb/aspell-hsb-0.02.0-r1.ebuild
index e0e562ed7a78..5f2b4870c9a2 100644
--- a/app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild
+++ b/app-dicts/aspell-hsb/aspell-hsb-0.02.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Upper Sorbian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild
rename to app-dicts/aspell-hu/aspell-hu-0.99.4.2.0-r1.ebuild
index e3d7ca7fd7ec..3edcb5f769e2 100644
--- a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild
+++ b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Hungarian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild b/app-dicts/aspell-hus/aspell-hus-0.03.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild
rename to app-dicts/aspell-hus/aspell-hus-0.03.1-r1.ebuild
index eaf3bd4ad244..eeed59328c9c 100644
--- a/app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild
+++ b/app-dicts/aspell-hus/aspell-hus-0.03.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Huastec Tenek"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild b/app-dicts/aspell-hy/aspell-hy-0.10.0.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild
rename to app-dicts/aspell-hy/aspell-hy-0.10.0.0-r1.ebuild
index 1c91b7396000..760d22617737 100644
--- a/app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild
+++ b/app-dicts/aspell-hy/aspell-hy-0.10.0.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Armenian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild b/app-dicts/aspell-ia/aspell-ia-0.50.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild
rename to app-dicts/aspell-ia/aspell-ia-0.50.1-r1.ebuild
index bff79105989a..03e5a3f0c925 100644
--- a/app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild
+++ b/app-dicts/aspell-ia/aspell-ia-0.50.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Interlingua"
diff --git a/app-dicts/aspell-id/aspell-id-1.2.0.ebuild b/app-dicts/aspell-id/aspell-id-1.2.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-id/aspell-id-1.2.0.ebuild
rename to app-dicts/aspell-id/aspell-id-1.2.0-r1.ebuild
index 9e40dd536d93..dcd8b7ff87b8 100644
--- a/app-dicts/aspell-id/aspell-id-1.2.0.ebuild
+++ b/app-dicts/aspell-id/aspell-id-1.2.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Indonesian"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild b/app-dicts/aspell-is/aspell-is-0.51.1.0-r2.ebuild
similarity index 98%
rename from app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild
rename to app-dicts/aspell-is/aspell-is-0.51.1.0-r2.ebuild
index 4e415ab83aaa..9dbf22c6a4ac 100644
--- a/app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild
+++ b/app-dicts/aspell-is/aspell-is-0.51.1.0-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Icelandic"
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild
rename to app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild
index 58a6ce0f48b9..57497c434ed2 100644
--- a/app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild
+++ b/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Italian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild b/app-dicts/aspell-kn/aspell-kn-0.01.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild
rename to app-dicts/aspell-kn/aspell-kn-0.01.1-r1.ebuild
index c3ec260f6623..12a67893a084 100644
--- a/app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild
+++ b/app-dicts/aspell-kn/aspell-kn-0.01.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Kannada"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild b/app-dicts/aspell-ku/aspell-ku-0.20.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild
rename to app-dicts/aspell-ku/aspell-ku-0.20.1-r1.ebuild
index 7adc640f1b80..e54eae79c329 100644
--- a/app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild
+++ b/app-dicts/aspell-ku/aspell-ku-0.20.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Kurdi"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild b/app-dicts/aspell-ky/aspell-ky-0.01.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild
rename to app-dicts/aspell-ky/aspell-ky-0.01.0-r1.ebuild
index ab7e087cd595..56f3232f8d74 100644
--- a/app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild
+++ b/app-dicts/aspell-ky/aspell-ky-0.01.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Kirghiz"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-la/aspell-la-20020503.0.ebuild b/app-dicts/aspell-la/aspell-la-20020503.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-la/aspell-la-20020503.0.ebuild
rename to app-dicts/aspell-la/aspell-la-20020503.0-r1.ebuild
index a3290f9685a6..349e08cbac7b 100644
--- a/app-dicts/aspell-la/aspell-la-20020503.0.ebuild
+++ b/app-dicts/aspell-la/aspell-la-20020503.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Latin"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild b/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild
rename to app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild
index ea5e3d33a7de..ae93bea1460f 100644
--- a/app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild
+++ b/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Lithuanian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild b/app-dicts/aspell-lv/aspell-lv-0.5.5.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild
rename to app-dicts/aspell-lv/aspell-lv-0.5.5.1-r1.ebuild
index b8d470e02029..d03e22b8af19 100644
--- a/app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild
+++ b/app-dicts/aspell-lv/aspell-lv-0.5.5.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Latvian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild b/app-dicts/aspell-mg/aspell-mg-0.03.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild
rename to app-dicts/aspell-mg/aspell-mg-0.03.0-r1.ebuild
index 66f642121445..f2b48eda1060 100644
--- a/app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild
+++ b/app-dicts/aspell-mg/aspell-mg-0.03.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Malagasy"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild b/app-dicts/aspell-mi/aspell-mi-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild
rename to app-dicts/aspell-mi/aspell-mi-0.50.0-r1.ebuild
index cbade4cdd5b9..983bd86f00e2 100644
--- a/app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild
+++ b/app-dicts/aspell-mi/aspell-mi-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Maori"
diff --git a/app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild b/app-dicts/aspell-mk/aspell-mk-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild
rename to app-dicts/aspell-mk/aspell-mk-0.50.0-r1.ebuild
index c36b0bcb46fb..814b72a2ef2d 100644
--- a/app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild
+++ b/app-dicts/aspell-mk/aspell-mk-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Macedonian"
diff --git a/app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild b/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild
rename to app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild
index e1c4e5f1b6f5..220bc36d3a35 100644
--- a/app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild
+++ b/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Malayalam"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild b/app-dicts/aspell-mn/aspell-mn-0.06.2-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild
rename to app-dicts/aspell-mn/aspell-mn-0.06.2-r1.ebuild
index 2c9012d94d6a..7d4895480966 100644
--- a/app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild
+++ b/app-dicts/aspell-mn/aspell-mn-0.06.2-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Mongolian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild b/app-dicts/aspell-mr/aspell-mr-0.10.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild
rename to app-dicts/aspell-mr/aspell-mr-0.10.0-r1.ebuild
index e525620dfaef..47f6e9fba246 100644
--- a/app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild
+++ b/app-dicts/aspell-mr/aspell-mr-0.10.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Marathi"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild b/app-dicts/aspell-ms/aspell-ms-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild
rename to app-dicts/aspell-ms/aspell-ms-0.50.0-r1.ebuild
index f16c302e6c0b..8b63061e098b 100644
--- a/app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild
+++ b/app-dicts/aspell-ms/aspell-ms-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Malay"
diff --git a/app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild b/app-dicts/aspell-mt/aspell-mt-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild
rename to app-dicts/aspell-mt/aspell-mt-0.50.0-r1.ebuild
index 0bf6f0635d1d..da1deb542506 100644
--- a/app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild
+++ b/app-dicts/aspell-mt/aspell-mt-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Maltese"
diff --git a/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r2.ebuild b/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r3.ebuild
similarity index 98%
rename from app-dicts/aspell-nb/aspell-nb-0.50.1.0-r2.ebuild
rename to app-dicts/aspell-nb/aspell-nb-0.50.1.0-r3.ebuild
index 7a0db6a35602..59ed8250eb99 100644
--- a/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r2.ebuild
+++ b/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Norwegian Bokmal"
MY_P="${PN}-${PV%.*}-${PV##*.}"
diff --git a/app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild b/app-dicts/aspell-nds/aspell-nds-0.01.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild
rename to app-dicts/aspell-nds/aspell-nds-0.01.0-r1.ebuild
index 5011ebf9e28b..612c541e6970 100644
--- a/app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild
+++ b/app-dicts/aspell-nds/aspell-nds-0.01.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Lower Saxony Plattdüütsch"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild b/app-dicts/aspell-nl/aspell-nl-0.50.2-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
rename to app-dicts/aspell-nl/aspell-nl-0.50.2-r1.ebuild
index 8de9091be5c6..3b8a156be3c3 100644
--- a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
+++ b/app-dicts/aspell-nl/aspell-nl-0.50.2-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Dutch"
diff --git a/app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild b/app-dicts/aspell-nn/aspell-nn-0.50.1.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild
rename to app-dicts/aspell-nn/aspell-nn-0.50.1.1-r1.ebuild
index e7eaafbb8f40..b154ca7bc825 100644
--- a/app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild
+++ b/app-dicts/aspell-nn/aspell-nn-0.50.1.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Norwegian Nynorsk"
diff --git a/app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild b/app-dicts/aspell-no/aspell-no-0.50.2-r2.ebuild
similarity index 97%
rename from app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild
rename to app-dicts/aspell-no/aspell-no-0.50.2-r2.ebuild
index e9699114ac48..67618812667d 100644
--- a/app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild
+++ b/app-dicts/aspell-no/aspell-no-0.50.2-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Norwegian"
diff --git a/app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild b/app-dicts/aspell-ny/aspell-ny-0.01.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild
rename to app-dicts/aspell-ny/aspell-ny-0.01.0-r1.ebuild
index 5f988c5376f0..5931973d1af2 100644
--- a/app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild
+++ b/app-dicts/aspell-ny/aspell-ny-0.01.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Chichewa"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-or/aspell-or-0.03.1.ebuild b/app-dicts/aspell-or/aspell-or-0.03.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-or/aspell-or-0.03.1.ebuild
rename to app-dicts/aspell-or/aspell-or-0.03.1-r1.ebuild
index 3bec44d528eb..7ece6f7cf56d 100644
--- a/app-dicts/aspell-or/aspell-or-0.03.1.ebuild
+++ b/app-dicts/aspell-or/aspell-or-0.03.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Oriya"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild b/app-dicts/aspell-pa/aspell-pa-0.01.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild
rename to app-dicts/aspell-pa/aspell-pa-0.01.1-r1.ebuild
index 2c270984dc02..141573a25e72 100644
--- a/app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild
+++ b/app-dicts/aspell-pa/aspell-pa-0.01.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Punjabi"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20210731.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20210731.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-pl/aspell-pl-6.0.20210731.0.ebuild
rename to app-dicts/aspell-pl/aspell-pl-6.0.20210731.0-r1.ebuild
index cd5d5eccaae5..7e4732e80416 100644
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20210731.0.ebuild
+++ b/app-dicts/aspell-pl/aspell-pl-6.0.20210731.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Polish"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild
rename to app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0-r1.ebuild
index d0eab4b7bfbb..3ce52743fd3d 100644
--- a/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild
+++ b/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Brazilian Portuguese"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild b/app-dicts/aspell-pt/aspell-pt-20190329.1.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild
rename to app-dicts/aspell-pt/aspell-pt-20190329.1.0-r1.ebuild
index 2a4f828c8de1..53c4971a6ba5 100644
--- a/app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild
+++ b/app-dicts/aspell-pt/aspell-pt-20190329.1.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Portuguese"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild b/app-dicts/aspell-qu/aspell-qu-0.02.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild
rename to app-dicts/aspell-qu/aspell-qu-0.02.0-r1.ebuild
index 41b04c1c5fbd..31296dd541bd 100644
--- a/app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild
+++ b/app-dicts/aspell-qu/aspell-qu-0.02.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Quechua Runasimi"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild
rename to app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild
index 772e53c49c6e..72bf114f0415 100644
--- a/app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild
+++ b/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Romanian"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild b/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild
similarity index 98%
rename from app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
rename to app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild
index 47f9bc126826..012c39f22db5 100644
--- a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
+++ b/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Russian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild b/app-dicts/aspell-rw/aspell-rw-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild
rename to app-dicts/aspell-rw/aspell-rw-0.50.0-r1.ebuild
index 891b4a32bb60..74b8e14b1502 100644
--- a/app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild
+++ b/app-dicts/aspell-rw/aspell-rw-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Kinyarwanda"
diff --git a/app-dicts/aspell-sc/aspell-sc-1.0.ebuild b/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-sc/aspell-sc-1.0.ebuild
rename to app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild
index 2b3a051aac87..07a268184a5b 100644
--- a/app-dicts/aspell-sc/aspell-sc-1.0.ebuild
+++ b/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Sardinian"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild b/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild
rename to app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild
index 3aa3542e8609..a9de33a1b7c0 100644
--- a/app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild
+++ b/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Slovak"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild b/app-dicts/aspell-sl/aspell-sl-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
rename to app-dicts/aspell-sl/aspell-sl-0.50.0-r1.ebuild
index 77491a204464..367b1c440f59 100644
--- a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
+++ b/app-dicts/aspell-sl/aspell-sl-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Slovenian"
diff --git a/app-dicts/aspell-sr/aspell-sr-0.02.ebuild b/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-sr/aspell-sr-0.02.ebuild
rename to app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild
index a3ae3b96bc61..a2cfb81689ea 100644
--- a/app-dicts/aspell-sr/aspell-sr-0.02.ebuild
+++ b/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Serbian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild b/app-dicts/aspell-sv/aspell-sv-0.51.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
rename to app-dicts/aspell-sv/aspell-sv-0.51.0-r1.ebuild
index 96d6eba7a8ac..8b9ee0c5b816 100644
--- a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
+++ b/app-dicts/aspell-sv/aspell-sv-0.51.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Swedish"
diff --git a/app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild b/app-dicts/aspell-sw/aspell-sw-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild
rename to app-dicts/aspell-sw/aspell-sw-0.50.0-r1.ebuild
index 26db8c46d412..c42db605293d 100644
--- a/app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild
+++ b/app-dicts/aspell-sw/aspell-sw-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Swahili Kiswahili"
diff --git a/app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild b/app-dicts/aspell-ta/aspell-ta-20040424.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild
rename to app-dicts/aspell-ta/aspell-ta-20040424.1-r1.ebuild
index 889cf4e4ad1d..57cabbb77d7b 100644
--- a/app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild
+++ b/app-dicts/aspell-ta/aspell-ta-20040424.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Tamil"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-te/aspell-te-0.01.2.ebuild b/app-dicts/aspell-te/aspell-te-0.01.2-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-te/aspell-te-0.01.2.ebuild
rename to app-dicts/aspell-te/aspell-te-0.01.2-r1.ebuild
index ffdb3a7a8cd9..4edb7635190e 100644
--- a/app-dicts/aspell-te/aspell-te-0.01.2.ebuild
+++ b/app-dicts/aspell-te/aspell-te-0.01.2-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Telugu"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild b/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild
rename to app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild
index 75f829680eee..c5836e9e0874 100644
--- a/app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild
+++ b/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Tetum"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild b/app-dicts/aspell-tk/aspell-tk-0.01.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild
rename to app-dicts/aspell-tk/aspell-tk-0.01.0-r1.ebuild
index 0c9a0b74daab..239469d1f39a 100644
--- a/app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild
+++ b/app-dicts/aspell-tk/aspell-tk-0.01.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Turkmen"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild b/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild
similarity index 98%
rename from app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild
rename to app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild
index 8aef60274273..afbc8ac85cf2 100644
--- a/app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild
+++ b/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Tagalog"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild b/app-dicts/aspell-tn/aspell-tn-1.0.1.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild
rename to app-dicts/aspell-tn/aspell-tn-1.0.1.0-r1.ebuild
index 3b7cc4714662..3443aaed5afe 100644
--- a/app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild
+++ b/app-dicts/aspell-tn/aspell-tn-1.0.1.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Setswana"
ASPELL_VERSION=5
diff --git a/app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild b/app-dicts/aspell-tr/aspell-tr-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild
rename to app-dicts/aspell-tr/aspell-tr-0.50.0-r1.ebuild
index 217d7d208355..9ff2f43c3a4a 100644
--- a/app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild
+++ b/app-dicts/aspell-tr/aspell-tr-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Turkish"
diff --git a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild b/app-dicts/aspell-uk/aspell-uk-1.4.0.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
rename to app-dicts/aspell-uk/aspell-uk-1.4.0.0-r1.ebuild
index 0096bed59a1e..df623b055755 100644
--- a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
+++ b/app-dicts/aspell-uk/aspell-uk-1.4.0.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Ukrainian"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild b/app-dicts/aspell-uz/aspell-uz-0.6.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild
rename to app-dicts/aspell-uz/aspell-uz-0.6.0-r1.ebuild
index 1fd19dea4f31..e8e45b9972ea 100644
--- a/app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild
+++ b/app-dicts/aspell-uz/aspell-uz-0.6.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Uzbek"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild b/app-dicts/aspell-vi/aspell-vi-0.01.1.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
rename to app-dicts/aspell-vi/aspell-vi-0.01.1.1-r1.ebuild
index e4cc034ea6c5..7f6e21a9aac9 100644
--- a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
+++ b/app-dicts/aspell-vi/aspell-vi-0.01.1.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Vietnamese"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild b/app-dicts/aspell-wa/aspell-wa-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild
rename to app-dicts/aspell-wa/aspell-wa-0.50.0-r1.ebuild
index 3ffb7cd33d5a..061315a9e304 100644
--- a/app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild
+++ b/app-dicts/aspell-wa/aspell-wa-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Walloon"
diff --git a/app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild b/app-dicts/aspell-yi/aspell-yi-0.01.1.1-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild
rename to app-dicts/aspell-yi/aspell-yi-0.01.1.1-r1.ebuild
index a3b8b8a69fca..00c1bdb00cf2 100644
--- a/app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild
+++ b/app-dicts/aspell-yi/aspell-yi-0.01.1.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Yiddish"
ASPELL_VERSION=6
diff --git a/app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild b/app-dicts/aspell-zu/aspell-zu-0.50.0-r1.ebuild
similarity index 97%
rename from app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild
rename to app-dicts/aspell-zu/aspell-zu-0.50.0-r1.ebuild
index f4ca0bfaf716..d66c2e5b7efc 100644
--- a/app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild
+++ b/app-dicts/aspell-zu/aspell-zu-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ASPELL_LANG="Zulu"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index a0aaab3f2661..d640c2d041eb 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index fc7f6789c5c7..667cc80e1a7a 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -4,3 +4,4 @@ DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e
DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048 SHA512 f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6
DIST vim-8.2.3582.tar.gz 15778667 BLAKE2B c8eaa95fa4fde6514168a9f42a712a78442a7fe504b59158e2e7717b8025a59cb4d8948451d72418b29f2b7cf3619cd765ef43e1304d73f81a6cba405f9706e7 SHA512 f476f24390807b71a0e02729f1815b3743b6b42cdd28a414e9ceaf0aa3fd4cab91e3550a669b1c64b4cd83207515cfe2b4acf2358a6def60e216e101c979037e
DIST vim-8.2.3669.tar.gz 15810783 BLAKE2B edac6dabfbeb11057c7b15830b30ec555a10942494bc89d7d85b4c701b5ff8f7413887e4e33e7b812057177ffebd2cdc74e69e86080a86cfee529b1da45156bb SHA512 83d172f7e1a3c5a8ea6238f2766bf077463d32d429111c08e5b28b8aafb8aea584807023281abf3b1710d61820fec8d2b808b42b5c50058d5eb4eb917deb19ab
+DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df030c1334f989862b17b70d7859d751f79dcaf98eb5216c23df6ce63f3406cb5cb3c643f9e8170987f4f705a49833 SHA512 19ee7cc27642253ad989e6e32ab96faa46b5e1feebba00cadd018af2de186358d686cfa5efbc8e5da00a14ceb42c226acfc81cb11cd87f34ec7ca901c98df814
diff --git a/app-editors/gvim/gvim-8.2.3741.ebuild b/app-editors/gvim/gvim-8.2.3741.ebuild
new file mode 100644
index 000000000000..127345151971
--- /dev/null
+++ b/app-editors/gvim/gvim-8.2.3741.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="8.2"
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vim/vim.git"
+ EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+ SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+ https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+fi
+S="${WORKDIR}"/vim-${PV}
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+ ~app-editors/vim-core-${PV}
+ >=app-eselect/eselect-vi-1.1
+ >=sys-libs/ncurses-5.2-r2:0=
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ acl? ( kernel_linux? ( sys-apps/acl ) )
+ !aqua? (
+ gtk? (
+ x11-libs/gtk+:3
+ x11-libs/libXft
+ )
+ !gtk? (
+ gtk2? (
+ >=x11-libs/gtk+-2.6:2
+ x11-libs/libXft
+ )
+ !gtk2? (
+ motif? ( >=x11-libs/motif-2.3:0 )
+ !motif? (
+ neXt? ( x11-libs/neXtaw )
+ !neXt? ( x11-libs/libXaw )
+ )
+ )
+ )
+ )
+ crypt? ( dev-libs/libsodium:= )
+ cscope? ( dev-util/cscope )
+ lua? (
+ ${LUA_DEPS}
+ $(lua_gen_impl_dep 'deprecated' lua5-1)
+ )
+ nls? ( virtual/libintl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ racket? ( dev-scheme/racket )
+ ruby? ( ${RUBY_DEPS} )
+ selinux? ( sys-libs/libselinux )
+ session? ( x11-libs/libSM )
+ sound? ( media-libs/libcanberra )
+ tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+ sys-devel/autoconf
+ virtual/pkgconfig
+ lua? ( ${LUA_DEPS} )
+ nls? ( sys-devel/gettext )
+"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+pkg_setup() {
+ # people with broken alphabets run into trouble. bug 82186.
+ unset LANG LC_ALL
+ export LC_COLLATE="C"
+
+ # Gnome sandbox silliness. bug #114475.
+ mkdir -p "${T}"/home || die
+ export HOME="${T}"/home
+
+ use lua && lua-single_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${PV} != 9999* ]]; then
+ # Gentoo patches to fix runtime issues, cross-compile errors, etc
+ eapply "${WORKDIR}"/patches/
+ fi
+
+ # Fixup a script to use awk instead of nawk
+ sed -i -e \
+ '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+ "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+ # Read vimrc and gvimrc from /etc/vim
+ echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+ >> "${S}"/src/feature.h || die "echo failed"
+ echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+ >> "${S}"/src/feature.h || die "echo failed"
+
+ # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+ # Hopefully this pattern won't break for a while at least.
+ # This fixes bug 29398 (27 Sep 2003 agriffis)
+ sed -i -e \
+ 's/\> "$c" || die "echo failed"
+ done
+
+ # Try to avoid sandbox problems. Bug #114475.
+ if [[ -d "${S}"/src/po ]]; then
+ sed -i -e \
+ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+ "${S}"/src/po/Makefile || die
+ fi
+
+ cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+ # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+ sed -i -e \
+ "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+ eapply_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # Fix bug 37354: Disallow -funroll-all-loops on amd64
+ # Bug 57859 suggests that we want to do this for all archs
+ filter-flags -funroll-all-loops
+
+ # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+ # everyone since previous flag filtering bugs have turned out to affect
+ # multiple archs...
+ replace-flags -O3 -O2
+
+ # Fix bug 18245: Prevent "make" from the following chain:
+ # (1) Notice configure.ac is newer than auto/configure
+ # (2) Rebuild auto/configure
+ # (3) Notice auto/configure is newer than auto/config.mk
+ # (4) Run ./configure (with wrong args) to remake auto/config.mk
+ sed -i -e \
+ 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+ rm -v src/auto/configure || die "rm failed"
+ emake -j1 -C src autoconf
+
+ # This should fix a sandbox violation (see bug 24447). The hvc
+ # things are for ppc64, see bug 86433.
+ local file
+ for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+ if [[ -e ${file} ]]; then
+ addwrite $file
+ fi
+ done
+
+ use debug && append-flags "-DDEBUG"
+
+ myconf=(
+ --with-features=huge
+ --disable-gpm
+ --with-gnome=no
+ $(use_enable sound canberra)
+ $(use_enable acl)
+ $(use_enable crypt libsodium)
+ $(use_enable cscope)
+ $(use_enable netbeans)
+ $(use_enable nls)
+ $(use_enable perl perlinterp)
+ $(use_enable python python3interp)
+ $(use_with python python3-command "${PYTHON}")
+ $(use_enable racket mzschemeinterp)
+ $(use_enable ruby rubyinterp)
+ $(use_enable selinux)
+ $(use_enable session xsmp)
+ $(use_enable tcl tclinterp)
+ )
+
+ # --with-features=huge forces on cscope even if we --disable it. We need
+ # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+ if ! use cscope; then
+ sed -i -e \
+ '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+ fi
+
+ if use lua; then
+ myconf+=(
+ --enable-luainterp
+ $(use_with lua_single_target_luajit luajit)
+ --with-lua-prefix="${EPREFIX}/usr"
+ )
+ fi
+
+ # gvim's GUI preference order is as follows:
+ # aqua CARBON (not tested)
+ # -aqua gtk GTK3
+ # -aqua -gtk gtk2 GTK2
+ # -aqua -gtk -gtk motif MOTIF
+ # -aqua -gtk -gtk -motif neXt NEXTAW
+ # -aqua -gtk -gtk -motif -neXt ATHENA
+ echo ; echo
+ if use aqua; then
+ einfo "Building gvim with the Carbon GUI"
+ myconf+=(
+ --enable-darwin
+ --enable-gui=carbon
+ )
+ elif use gtk; then
+ myconf+=( --enable-gtk3-check )
+ einfo "Building gvim with the gtk+-3 GUI"
+ myconf+=( --enable-gui=gtk3 )
+ elif use gtk2; then
+ myconf+=( --enable-gtk2-check )
+ einfo "Building gvim with the gtk+-2 GUI"
+ myconf+=( --enable-gui=gtk2 )
+ elif use motif; then
+ einfo "Building gvim with the MOTIF GUI"
+ myconf+=( --enable-gui=motif )
+ elif use neXt; then
+ einfo "Building gvim with the neXtaw GUI"
+ myconf+=( --enable-gui=nextaw )
+ else
+ einfo "Building gvim with the Athena GUI"
+ myconf+=( --enable-gui=athena )
+ fi
+ echo ; echo
+
+ # let package manager strip binaries
+ export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+ # keep prefix env contained within the EPREFIX
+ use prefix && myconf+=( --without-local-dir )
+
+ if [[ ${CHOST} == *-interix* ]]; then
+ # avoid finding of this function, to avoid having to patch either
+ # configure or the source, which would be much more hackish.
+ # after all vim does it right, only interix is badly broken (again)
+ export ac_cv_func_sigaction=no
+ fi
+
+ econf \
+ --with-modified-by=Gentoo-${PVR} \
+ --with-vim-name=gvim \
+ --with-x \
+ "${myconf[@]}"
+}
+
+src_compile() {
+ # The following allows emake to be used
+ emake -j1 -C src auto/osdef.h objects
+
+ emake
+}
+
+src_test() {
+ einfo
+ einfo "Starting vim tests. Several error messages will be shown"
+ einfo "while the tests run. This is normal behaviour and does not"
+ einfo "indicate a fault."
+ einfo
+ ewarn "If the tests fail, your terminal may be left in a strange"
+ ewarn "state. Usually, running 'reset' will fix this."
+ einfo
+
+ # Don't let vim talk to X
+ unset DISPLAY
+
+ # Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+ # this evil trickery works.
+ ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+ # Make sure our VIMPROG is used.
+ sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+ # Don't do additional GUI tests.
+ emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+ einfo "Calling eselect vi update..."
+ eselect vi update --if-unset
+ eend $?
+}
+
+src_install() {
+ local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+ dobin src/gvim
+ dosym gvim /usr/bin/gvimdiff
+ dosym gvim /usr/bin/evim
+ dosym gvim /usr/bin/eview
+ dosym gvim /usr/bin/gview
+ dosym gvim /usr/bin/rgvim
+ dosym gvim /usr/bin/rgview
+
+ emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+ dodir /usr/share/man/man1
+ echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+ echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+ echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+ die "echo failed"
+
+ insinto /etc/vim
+ newins "${FILESDIR}"/gvimrc-r1 gvimrc
+ eprefixify "${ED}"/etc/vim/gvimrc
+
+ # bash completion script, bug #79018.
+ newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+ # don't install vim desktop file
+ rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+ # update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # update fdo mime stuff, bug #78394
+ xdg_desktop_database_update
+
+ # update icon cache
+ xdg_icon_cache_update
+
+ # call eselect vi update
+ eselect_vi_update
+}
+
+pkg_postrm() {
+ # update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # update fdo mime stuff, bug #78394
+ xdg_desktop_database_update
+
+ # update icon cache
+ xdg_icon_cache_update
+
+ # call eselect vi update
+ eselect_vi_update
+}
diff --git a/app-editors/joe/joe-4.6-r1.ebuild b/app-editors/joe/joe-4.6-r1.ebuild
index efcc6cef6153..fc4e787f9b25 100644
--- a/app-editors/joe/joe-4.6-r1.ebuild
+++ b/app-editors/joe/joe-4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
LICENSE="GPL-1+ CC-BY-3.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="xterm"
DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index fc7f6789c5c7..667cc80e1a7a 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -4,3 +4,4 @@ DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e
DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048 SHA512 f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6
DIST vim-8.2.3582.tar.gz 15778667 BLAKE2B c8eaa95fa4fde6514168a9f42a712a78442a7fe504b59158e2e7717b8025a59cb4d8948451d72418b29f2b7cf3619cd765ef43e1304d73f81a6cba405f9706e7 SHA512 f476f24390807b71a0e02729f1815b3743b6b42cdd28a414e9ceaf0aa3fd4cab91e3550a669b1c64b4cd83207515cfe2b4acf2358a6def60e216e101c979037e
DIST vim-8.2.3669.tar.gz 15810783 BLAKE2B edac6dabfbeb11057c7b15830b30ec555a10942494bc89d7d85b4c701b5ff8f7413887e4e33e7b812057177ffebd2cdc74e69e86080a86cfee529b1da45156bb SHA512 83d172f7e1a3c5a8ea6238f2766bf077463d32d429111c08e5b28b8aafb8aea584807023281abf3b1710d61820fec8d2b808b42b5c50058d5eb4eb917deb19ab
+DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df030c1334f989862b17b70d7859d751f79dcaf98eb5216c23df6ce63f3406cb5cb3c643f9e8170987f4f705a49833 SHA512 19ee7cc27642253ad989e6e32ab96faa46b5e1feebba00cadd018af2de186358d686cfa5efbc8e5da00a14ceb42c226acfc81cb11cd87f34ec7ca901c98df814
diff --git a/app-editors/vim-core/vim-core-8.2.3741.ebuild b/app-editors/vim-core/vim-core-8.2.3741.ebuild
new file mode 100644
index 000000000000..16f9b2d60a6d
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.2.3741.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-editors/vim and app-editors/gvim
+
+VIM_VERSION="8.2"
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vim/vim.git"
+ EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+ SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+ https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+S="${WORKDIR}"/vim-${PV}
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="nls acl minimal"
+
+BDEPEND="sys-devel/autoconf"
+# Avoid icon file collision, bug #673880
+RDEPEND="!!> "${S}"/src/feature.h
+ echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+ # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+ # Hopefully this pattern won't break for a while at least.
+ # This fixes bug #29398 (27 Sep 2003 agriffis)
+ sed -i 's/\> "$c" || die "echo failed"
+ done
+
+ # Try to avoid sandbox problems. Bug #114475.
+ if [[ -d "${S}"/src/po ]]; then
+ sed -i -e \
+ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+ "${S}"/src/po/Makefile || die "sed failed"
+ fi
+
+ cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+ # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+ sed -i -e \
+ "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+ eapply_user
+}
+
+src_configure() {
+ local myconf
+
+ # Fix bug #37354: Disallow -funroll-all-loops on amd64
+ # Bug 57859 suggests that we want to do this for all archs
+ filter-flags -funroll-all-loops
+
+ # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
+ # everyone since previous flag filtering bugs have turned out to affect
+ # multiple archs...
+ replace-flags -O3 -O2
+
+ # Fix bug #18245: Prevent "make" from the following chain:
+ # (1) Notice configure.ac is newer than auto/configure
+ # (2) Rebuild auto/configure
+ # (3) Notice auto/configure is newer than auto/config.mk
+ # (4) Run ./configure (with wrong args) to remake auto/config.mk
+ sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+ # Remove src/auto/configure file.
+ rm -v src/auto/configure || die "rm configure failed"
+
+ emake -j1 -C src autoconf
+
+ # This should fix a sandbox violation (see bug 24447). The hvc
+ # things are for ppc64, see bug 86433.
+ for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+ if [[ -e "${file}" ]]; then
+ addwrite ${file}
+ fi
+ done
+
+ # Let Portage do the stripping. Some people like that.
+ export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+ # Keep Gentoo Prefix env contained within the EPREFIX
+ use prefix && myconf+=" --without-local-dir"
+
+ econf \
+ --with-modified-by=Gentoo-${PVR} \
+ --enable-gui=no \
+ --without-x \
+ --disable-darwin \
+ --disable-perlinterp \
+ --disable-pythoninterp \
+ --disable-rubyinterp \
+ --disable-gpm \
+ --disable-selinux \
+ $(use_enable nls) \
+ $(use_enable acl) \
+ ${myconf}
+}
+
+src_compile() {
+ emake -j1 -C src auto/osdef.h objects
+ emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+ local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+ dodir /usr/{bin,share/{man/man1,vim}}
+ emake -C src \
+ installruntime \
+ installmanlinks \
+ installmacros \
+ installtutor \
+ installtutorbin \
+ installtools \
+ install-languages \
+ DESTDIR="${D}" \
+ BINDIR="${EPREFIX}"/usr/bin \
+ MANDIR="${EPREFIX}"/usr/share/man \
+ DATADIR="${EPREFIX}"/usr/share
+
+ keepdir ${vimfiles}/keymap
+
+ # default vimrc is installed by vim-core since it applies to
+ # both vim and gvim
+ insinto /etc/vim/
+ newins "${FILESDIR}"/vimrc-r5 vimrc
+ eprefixify "${ED}"/etc/vim/vimrc
+
+ if use minimal; then
+ # To save space, install only a subset of the files.
+ # Helps minimalize the livecd, bug 65144.
+ eshopts_push -s extglob
+
+ rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+ rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+ rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal]
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+
+ local keep_colors="default"
+ ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+ local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+ # tinkering with the next line might make bad things happen ...
+ keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+ ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+ # Delete skip_defaults_vim config not supported by vim[minimal]
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
+
+ eshopts_pop
+ fi
+
+ newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+ # install gvim icon since both vim/gvim desktop files reference it
+ doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+ # update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # update icon cache
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ # Update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # update icon cache
+ xdg_icon_cache_update
+}
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index fc7f6789c5c7..667cc80e1a7a 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -4,3 +4,4 @@ DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e
DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048 SHA512 f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6
DIST vim-8.2.3582.tar.gz 15778667 BLAKE2B c8eaa95fa4fde6514168a9f42a712a78442a7fe504b59158e2e7717b8025a59cb4d8948451d72418b29f2b7cf3619cd765ef43e1304d73f81a6cba405f9706e7 SHA512 f476f24390807b71a0e02729f1815b3743b6b42cdd28a414e9ceaf0aa3fd4cab91e3550a669b1c64b4cd83207515cfe2b4acf2358a6def60e216e101c979037e
DIST vim-8.2.3669.tar.gz 15810783 BLAKE2B edac6dabfbeb11057c7b15830b30ec555a10942494bc89d7d85b4c701b5ff8f7413887e4e33e7b812057177ffebd2cdc74e69e86080a86cfee529b1da45156bb SHA512 83d172f7e1a3c5a8ea6238f2766bf077463d32d429111c08e5b28b8aafb8aea584807023281abf3b1710d61820fec8d2b808b42b5c50058d5eb4eb917deb19ab
+DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df030c1334f989862b17b70d7859d751f79dcaf98eb5216c23df6ce63f3406cb5cb3c643f9e8170987f4f705a49833 SHA512 19ee7cc27642253ad989e6e32ab96faa46b5e1feebba00cadd018af2de186358d686cfa5efbc8e5da00a14ceb42c226acfc81cb11cd87f34ec7ca901c98df814
diff --git a/app-editors/vim/vim-8.2.3741.ebuild b/app-editors/vim/vim-8.2.3741.ebuild
new file mode 100644
index 000000000000..622a6efe756e
--- /dev/null
+++ b/app-editors/vim/vim-8.2.3741.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="8.2"
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+ SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ vim-pager? ( !minimal )
+"
+
+RDEPEND="
+ >=app-eselect/eselect-vi-1.1
+ >=sys-libs/ncurses-5.2-r2:0=
+ nls? ( virtual/libintl )
+ acl? ( kernel_linux? ( sys-apps/acl ) )
+ crypt? ( dev-libs/libsodium:= )
+ cscope? ( dev-util/cscope )
+ gpm? ( >=sys-libs/gpm-1.19.3 )
+ lua? ( ${LUA_DEPS}
+ $(lua_gen_impl_dep 'deprecated' lua5-1)
+ )
+ !minimal? ( ~app-editors/vim-core-${PV} )
+ vim-pager? ( app-editors/vim-core[-minimal] )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ racket? ( dev-scheme/racket )
+ ruby? ( ${RUBY_DEPS} )
+ selinux? ( sys-libs/libselinux )
+ sound? ( media-libs/libcanberra )
+ tcl? ( dev-lang/tcl:0= )
+ X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+ sys-devel/autoconf
+ lua? ( ${LUA_DEPS} )
+ nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+ # people with broken alphabets run into trouble. bug #82186.
+ unset LANG LC_ALL
+ export LC_COLLATE="C"
+
+ # Gnome sandbox silliness. bug #114475.
+ mkdir -p "${T}"/home || die "mkdir failed"
+ export HOME="${T}"/home
+
+ use lua && lua-single_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${PV} != 9999* ]] ; then
+ # Gentoo patches to fix runtime issues, cross-compile errors, etc
+ eapply "${WORKDIR}"/patches/
+ fi
+
+ # Fixup a script to use awk instead of nawk
+ sed -i -e \
+ '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+ "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+ # Read vimrc and gvimrc from /etc/vim
+ echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+ >> "${S}"/src/feature.h || die "echo failed"
+ echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+ >> "${S}"/src/feature.h || die "echo failed"
+
+ # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+ # Hopefully this pattern won't break for a while at least.
+ # This fixes bug #29398 (27 Sep 2003 agriffis)
+ sed -i -e \
+ 's/\> "$c" || die "echo failed"
+ done
+
+ # conditionally make the manpager.sh script
+ if use vim-pager; then
+ cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+ #!/bin/sh
+ sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+ vim \\
+ -c 'let no_plugin_maps = 1' \\
+ -c 'set nolist nomod ft=man ts=8' \\
+ -c 'let g:showmarks_enable=0' \\
+ -c 'runtime! macros/less.vim' -
+ _EOF_
+ fi
+
+ # Try to avoid sandbox problems. Bug #114475.
+ if [[ -d "${S}"/src/po ]]; then
+ sed -i -e \
+ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+ "${S}"/src/po/Makefile || die "sed failed"
+ fi
+
+ cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+ sed -i -e \
+ "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+ eapply_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # Fix bug #37354: Disallow -funroll-all-loops on amd64
+ # Bug #57859 suggests that we want to do this for all archs
+ filter-flags -funroll-all-loops
+
+ # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+ # everyone since previous flag filtering bugs have turned out to affect
+ # multiple archs...
+ replace-flags -O3 -O2
+
+ # Fix bug 18245: Prevent "make" from the following chain:
+ # (1) Notice configure.ac is newer than auto/configure
+ # (2) Rebuild auto/configure
+ # (3) Notice auto/configure is newer than auto/config.mk
+ # (4) Run ./configure (with wrong args) to remake auto/config.mk
+ sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+ rm src/auto/configure || die "rm failed"
+ emake -j1 -C src autoconf
+
+ # This should fix a sandbox violation (see bug #24447). The hvc
+ # things are for ppc64, see bug #86433.
+ for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+ if [[ -e "${file}" ]]; then
+ addwrite ${file}
+ fi
+ done
+
+ if use minimal; then
+ myconf=(
+ --with-features=tiny
+ --disable-nls
+ --disable-canberra
+ --disable-acl
+ --enable-gui=no
+ --without-x
+ --disable-darwin
+ --disable-luainterp
+ --disable-perlinterp
+ --disable-pythoninterp
+ --disable-mzschemeinterp
+ --disable-rubyinterp
+ --disable-selinux
+ --disable-tclinterp
+ --disable-gpm
+ )
+ else
+ use debug && append-flags "-DDEBUG"
+
+ myconf=(
+ --with-features=huge
+ $(use_enable sound canberra)
+ $(use_enable acl)
+ $(use_enable crypt libsodium)
+ $(use_enable cscope)
+ $(use_enable gpm)
+ $(use_enable nls)
+ $(use_enable perl perlinterp)
+ $(use_enable python python3interp)
+ $(use_with python python3-command "${PYTHON}")
+ $(use_enable racket mzschemeinterp)
+ $(use_enable ruby rubyinterp)
+ $(use_enable selinux)
+ $(use_enable tcl tclinterp)
+ $(use_enable terminal)
+ )
+
+ # --with-features=huge forces on cscope even if we --disable it. We need
+ # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+ if ! use cscope; then
+ sed -i -e \
+ '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+ fi
+
+ if use lua; then
+ myconf+=(
+ --enable-luainterp
+ $(use_with lua_single_target_luajit luajit)
+ --with-lua-prefix="${EPREFIX}/usr"
+ )
+ fi
+
+ # don't test USE=X here ... see bug #19115
+ # but need to provide a way to link against X ... see bug #20093
+ myconf+=(
+ --enable-gui=no
+ --disable-darwin
+ $(use_with X x)
+ )
+ fi
+
+ # let package manager strip binaries
+ export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+ # keep prefix env contained within the EPREFIX
+ use prefix && myconf+=( --without-local-dir )
+
+ econf \
+ --with-modified-by=Gentoo-${PVR} \
+ "${myconf[@]}"
+}
+
+src_compile() {
+ # The following allows emake to be used
+ emake -j1 -C src auto/osdef.h objects
+
+ emake
+}
+
+src_test() {
+ einfo
+ einfo "Starting vim tests. Several error messages will be shown"
+ einfo "while the tests run. This is normal behaviour and does not"
+ einfo "indicate a fault."
+ einfo
+ ewarn "If the tests fail, your terminal may be left in a strange"
+ ewarn "state. Usually, running 'reset' will fix this."
+ einfo
+
+ # Don't let vim talk to X
+ unset DISPLAY
+
+ # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
+ # for more information on test variables we can use.
+ # Note that certain variables need vim-compatible regex (not PCRE), see e.g.
+ # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
+ #
+ # Skipped tests:
+ # - Test_expand_star_star
+ # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
+ # - Test_exrc
+ # Looks in wrong location? (bug #742710)
+ # - Test_job_tty_in_out
+ # Fragile and depends on TERM(?)
+ # - Test_spelldump_bang
+ # Hangs.
+ export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
+
+ emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug #187449)
+eselect_vi_update() {
+ einfo "Calling eselect vi update..."
+ eselect vi update --if-unset
+ eend $?
+}
+
+src_install() {
+ local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+ # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+ # managed by eselect-vi
+ dobin src/vim
+ if ! use minimal ; then
+ dosym vim /usr/bin/vimdiff
+ fi
+ dosym vim /usr/bin/rvim
+ dosym vim /usr/bin/rview
+ if use vim-pager ; then
+ dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+ dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+ insinto ${vimfiles}/macros
+ doins runtime/macros/manpager.sh
+ fperms a+x ${vimfiles}/macros/manpager.sh
+ fi
+
+ # Fix an issue of missing defaults.vim when USE=minimal.
+ if use minimal ; then
+ insinto ${vimfiles}
+ doins runtime/defaults.vim
+ fi
+
+ domenu runtime/vim.desktop
+
+ newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+ # keep in sync with 'complete ... -F' list
+ bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+ # Update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # Call eselect vi update
+ eselect_vi_update
+
+ # update desktop file mime cache
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ # Update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # Call eselect vi update
+ eselect_vi_update
+
+ # update desktop file mime cache
+ xdg_desktop_database_update
+}
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 5b1c26371cb8..43ee37d95da4 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -1,9 +1,9 @@
-DIST vscode-1.60.2-amd64.tar.gz 105537736 BLAKE2B 395cbea3c7522749423d8b79d7461189dbb04b1d751bb4a70b6ce7782e971c1dac0e51cda91e961cab0fceeef16e073803d2f54bd6d8840596a2ea45f9f34369 SHA512 caf8acea129533a6cb5824d5ed97f9e9f740dcdc67c3a0c3cf778d58a8fddebe870892d25ad74116c5311a53497db933ff70e5e250480c3a0d76e5fc62733b02
-DIST vscode-1.60.2-arm.tar.gz 94232609 BLAKE2B eb896cc316dfc96d6d523d15da735b18eb6e6011d7ec92b5f9fa8732f574097579c8af4601312c831a9f4aa752087188e203b761e86df31b688838b45354deb1 SHA512 8261b71740344f927091dadd28bcb06d17b70551da0fd0b3c20378ec744cc31660ae32aadedd87a8942c410da381dbf7e023c27af913a62a1bba774d6de241ea
-DIST vscode-1.60.2-arm64.tar.gz 107827801 BLAKE2B aff930e81534972f2dc3d7d0d5cc489ec77818c0304859d64838317fbaf9225f4325a8b237268569f88eca7c76ea7a73275d90747b4485eff30d5f59a9cdd977 SHA512 cc50c7ec44d546b227c271f621be87120a1c36c2ed8236421e9c7227c1cb83bf970d5673191afc1383c4479393b5fae873fd6829179d1d9139b6c3ec32c5c1fd
DIST vscode-1.61.2-amd64.tar.gz 112814371 BLAKE2B c297d27f12dbbf5bb752076881ae28100d1b051d14528425f8227c5c70ce779ab8db93b960bd4d4ff9788fa2e63167c4253324ba4413b0975d41608c541c6303 SHA512 52c3b89612f2d2f72ea9de9449d191130a23a3dbae1f2876e1716773abe9b6c7064a8eb6053d6bc94438b6e3753df2f00ccc4452b2404fcb2c052ea6090d83cc
DIST vscode-1.61.2-arm.tar.gz 94477034 BLAKE2B cecb63ed58a36fbbef13cf7de086f0f7f77efea03fc605801b3064c273736ea999b91ef84e0c900ca415955cd7a508d20c33e92a5acab0dcca388d9624743902 SHA512 9cfd10c4cc6d2e3eaa1323afc1b493448632f57681b1e7d595d7f52a7e7d4c4a2ce48d2e6b21b2380fb7be8d98d33d5848a91af178eed974f952bcd7cfbbcb3d
DIST vscode-1.61.2-arm64.tar.gz 108043274 BLAKE2B f512c85102b3e3858a5ba8f2a63ec9fc7fdee77ffbe768287cd72e89103880002fd2ca77bc72f0210f2f4c0e4cec2b7708404e7db874d7c87d97b17361a26d4e SHA512 dcac0d56bde8b1fd855d386da77e164354f8c819e994d395cfd6b9cf50d5ac96421745c6efc20ec89448e6020b61b0d4ed482e74ecb39422a6acf3662f905dfa
DIST vscode-1.62.3-amd64.tar.gz 113702793 BLAKE2B 0d5b79c0379bfc39f8ab356d6ae760d2b3bb32c41b308e5f78d824a8198201f1ea1c61034e2207bd674d00b1d5b52e75dbab07d2d7053adb17e9b64a4a47fd0c SHA512 5d69e7fda01c381b3a068a73f5506aee78f299b2a9a48fce46100d5f6d1f4558c4c0abbe17c8507e85711409052fdf9d590b12c0534e6e5cfe002f766df69c50
DIST vscode-1.62.3-arm.tar.gz 94730175 BLAKE2B 176d2f39b1b8bc945b7fb03e4db834846a35afafe024a774326b15a1e083c06d08e4a7ac8c38233299869f7c02eed16e89335012202acb888cb0034042ec12ca SHA512 130471b46794e1fd202fb83b891577e1f6bd29b72637e4efb5822e33a5578a848b236fc6c8a4652841e7b28f29cc9ffca718a3ddfda3d78cceef9b04087861a5
DIST vscode-1.62.3-arm64.tar.gz 108316120 BLAKE2B def07c01b4371b6e3ea1c47a45eb5763922fee650b83c3c9d9527d1323c602494b0e200543cbf527dbddb040ff786d88df5fac3d678d200d2a8768c7c3e0d135 SHA512 f1c91bdcef8f249bd4c81ec36ed5e0222eb1e6848206e33c3c7533a9805d594c8d64515317646f78a4d4b7cd7d89f05d499c5c82789c9b8ac3fbdb4451519ecd
+DIST vscode-1.63.1-amd64.tar.gz 113723133 BLAKE2B 98d5e8376e1926dea3e289243685f881497926f8bc413d0fd312684fb6d0f692890bc8212a62086c9b0178c436e8cbc0179657387753b4f30490c88805525a80 SHA512 be18f648db935497c2ce8f43fa54aeb775fcaa4348e0d561071d380a7fd373c4ad5a05f53ba4b33a44facf90e37b256818388c6ec8dfb6142658aaacb98fc1c7
+DIST vscode-1.63.1-arm.tar.gz 94749732 BLAKE2B 65942830c0b66c25a104cbf3e758b7074a06e6995a59ed30fd3d944ac74f5ffd2cb1075fb17977aeb85196e292e646920912c804ae426916bd8a3431c5b6d788 SHA512 30a539f31c3e4d5598151533ad5e53e25c142a392a5ded51c5b386244a19b149eed03d28f772cdd4bce7366c25d3131f5c1db168589cdecf0e059ebd5c88493d
+DIST vscode-1.63.1-arm64.tar.gz 108342012 BLAKE2B b1c0bb6f3034f6fa1c662048e2ed55e2cd59b251c034133e80f0b7cb2e8418287f8fdac2f52f9e2cad469cc604128e82de44a3eb8a580372c0c31c8d48ed1471 SHA512 f0c71e17f2258919de1e7d9ec782df38fd5245276b0b5f2d79f71e6041d6f0939edee5efc04fcb120f9ca25165750a454b450cf083ae9ed296bc17a107564401
diff --git a/app-editors/vscode/vscode-1.60.2.ebuild b/app-editors/vscode/vscode-1.63.1.ebuild
similarity index 99%
rename from app-editors/vscode/vscode-1.60.2.ebuild
rename to app-editors/vscode/vscode-1.63.1.ebuild
index dbed711c205a..45c99d4302b6 100644
--- a/app-editors/vscode/vscode-1.60.2.ebuild
+++ b/app-editors/vscode/vscode-1.63.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop pax-utils xdg
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 8d1d6eb99fc2..893a99be5dde 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,9 +1,9 @@
-DIST vscodium-1.60.2-amd64.tar.gz 106735938 BLAKE2B e1441fb95829f23adcab06e4ed9b4baefca6ae377570e0759d7327533818ffbf2cc08c8d94b832d6de2e29564e5e26a0f59bb991c6b4ee40007807f2fffb2df7 SHA512 a4c7434cfc0db6dc3f866f8acf2c3f3265dc353d1592582bc3cb9acca76961a3bebf76f7e3487a9a98545b43f800c241a4f51e8cbd7512183450008656ba0f1b
-DIST vscodium-1.60.2-arm.tar.gz 97317796 BLAKE2B eb0baee908ed059f16a4e3093e59b6823208fe0e627b1dfd1c9489a655c53735a1bd3d67970e50feef907dec3cc76252eff5e6509fcf5ab8c5255b52182f2cf8 SHA512 b5ed07a61ca468e32a08b27238c8b50b4b76a004dee7a47ca8c98051871c44ba2d9f29296d959f13b80edeeb1a88ec3624c61dee356b8d8727071098f500aea3
-DIST vscodium-1.60.2-arm64.tar.gz 111897534 BLAKE2B cf5ae8cd8e98342b0eccbf2fb1385c844f2f1d2fb27b964d455ddcf873ac0f545e5da55530bac11a99ee5e5d962e467a3c61f8848d8312142c6051da0b29db86 SHA512 b07554b8f5eb9865ee2086d68d65494368d2906634055d02e6fe843c8042ef093cd79eed31b5da87fd36a7a26324f37f79daafcbcd463c175a251b3345d9c1f1
DIST vscodium-1.61.2-amd64.tar.gz 114016604 BLAKE2B b9006b0a58adc08df31bbae08a46c233cd69ee80f89493e4564f8f3dbe595481582cb605ff472984f013e364bdafbdd2f587ea3d0065d8ca775eb723f0cd4cb0 SHA512 4a1016bc8e9fea5c76a0c87180ad641f4ec981dbde0b395267580d5207cf181a090d87e984a96c40f46298cbf8185c1afe4af6a8791bc47126f50f1ba95edacc
DIST vscodium-1.61.2-arm.tar.gz 97521784 BLAKE2B c81f5b607905d3be0aa27ee63a49c0ba2225724686d1afc25f7c15289c69fd10022d1ae83390183bd50c1db9c0b74e3c9144e622e81f2895eb891d6800d1bfd2 SHA512 f4f329155282e951273580247e3262b887164f2bedf409700f3a8326e9dd2e20ab95ab4b5fe8dbf2a177487e518c9fe98078a485c08b020b4d73cc7cb9a90431
DIST vscodium-1.61.2-arm64.tar.gz 112085871 BLAKE2B 47c58659d6e4e9a468b014c9d0a8f6ca9739d722a21ec0b3add0a69849b18022dafdcadc759070e054492d6cf2db1bf07e11454fee5623647a54e367f5d94325 SHA512 cf893f6e04a0e657fb889b40069e042ad1b2a287a349c3f05e441ada00504f9ec693f20dfe17a01f6a7d2d298dbecfe94d62f12b8b26769e373f61ae9ffda8f7
DIST vscodium-1.62.3-amd64.tar.gz 114303440 BLAKE2B d2c1c1a3a1a2dfe211db339adae44fd81c20747812a204d8c4d805ebe7ab3267d2041dc50c40b5e548a5ae003d830e841549ae71c688c107e57689fd7f773519 SHA512 f672dd4296a1ed9f0505e93ee5735663effc0fb51746d3ff70e90894fc0806ab2eec13e191190a9bf2c19464aa420f6c9d8d664e685df145b18faebb8870d2b2
DIST vscodium-1.62.3-arm.tar.gz 97823307 BLAKE2B bcbf8c696eb959962cd66e1d02222585e945b4eff2ed4fccf781bd0d3da23810dfe9e30f68be7baacd7f495c3ef8d1f43ee58aee7cb4f8817228c14b01423e7a SHA512 8d69e0046b0b9a1c268bdeeda051ef2ef5e09106eadeb96735cd7c09af069ef4652b06dab2b549817f539607f286a79a679ec46cd1cdd28e778cee3b85b7e89c
DIST vscodium-1.62.3-arm64.tar.gz 112387259 BLAKE2B cc063392c4531269c0fbcbbda2896d23d2a781f8d56c9462885b1cbc5f81005bd22d94616853c29298105f46a517cb76520e2677d6599ca948c0018b32c1e2aa SHA512 e1a9183377a1e16ddbb7a14e70fa5b97b27a31fa52da6f142bf2e37af2a316d1e08d05270d7e77b672cda97bacdacf893264718e46f231eefeb367c16c8f5b3f
+DIST vscodium-1.63.1-amd64.tar.gz 114321651 BLAKE2B 8196a69fdc2fc1185f057a2bb373cc4ecdc41c267cc1bf19442c03b45a2ed1997a5836075655673f05a5962840babd2cae968556f2ca79f3dedba90b760f7dd5 SHA512 5bf87e6cbeeeffcc14c9935cd2c55830395d2edcce7541fdf4d0bbd1b167e95efd4679fcec65422bacbeb9f0548c76a4fe4130251cc0666fd1cd75740222f97e
+DIST vscodium-1.63.1-arm.tar.gz 97849537 BLAKE2B f011fb9eddbc6750dc971f8885c3c5501afd74793b11e0330c2efb7693bf9914a4da06fe595d7c87a69dbdbb91a38e32f7e48b6dd8a89e79300eaa0ff5121b98 SHA512 d0aa3a0e0b8e3a42d27b487d2d8cde85118527cf39a78733a8eda4caf0bc67a8ed97bc736add6ab38ae77c81335a21261f8db7fe89311b50bbe52bfe5a4db60d
+DIST vscodium-1.63.1-arm64.tar.gz 112411313 BLAKE2B ddb2fdfdb82b164287f51fd26c4feef9f69e363419bfc234f330a12c85bb82283d347452ad2336040be8c02c32419ce71d497f7f20b1e27a5a1a80a3b95a972f SHA512 32c1714536ecb9952f9441f73d08614d4b38431bcba50116d2c0dd3b952ec23df123f4de91808f03a03f2de932322da941b3e1f24ff896bbc48a44caa06dd89f
diff --git a/app-editors/vscodium/vscodium-1.60.2.ebuild b/app-editors/vscodium/vscodium-1.63.1.ebuild
similarity index 99%
rename from app-editors/vscodium/vscodium-1.60.2.ebuild
rename to app-editors/vscodium/vscodium-1.63.1.ebuild
index 1f66143c0bf3..b604e95ff9b6 100644
--- a/app-editors/vscodium/vscodium-1.60.2.ebuild
+++ b/app-editors/vscodium/vscodium-1.63.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop pax-utils xdg
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f70394032d93..cb0f9b08c5b4 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index bbe03a12e013..e2af36e0fe7a 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,4 +1,2 @@
-DIST lxc-4.0.10.tar.gz 1515002 BLAKE2B 2a5b94ad767c8a11a5c34d19f12d812bd284337045ad5021c80a5f69be608085ac465edde8c385cc558e45638c9f061793c0c9db616ccbe0614554b4fbf62005 SHA512 ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318
-DIST lxc-4.0.10.tar.gz.asc 833 BLAKE2B 3dd6e8793d1b725ab9eb73d4fa78ce2767bf830fb70d6cc7052e70d2adbc46e4fcf6d986595322b64cb9c71417b801ef6ee3c7612c46dbeb10acba01a5bd69e0 SHA512 dd2d3ac4e066eca4e0358c9a2c371a227d3a0b5cf6e452fe34fa5c8cff46e25fa0555c9f707511a8603348fa969c1e7abf85ad7d27fdcaff613b733066861608
DIST lxc-4.0.11.tar.gz 1543031 BLAKE2B 0309bbb96938e60e4cbe145fa0cc3c0a85d9154282a889d74167128b6166a280bb4d53df266990a529a98935ef2c12e8d2214e9a8f6cb293d47aa5808ebad82f SHA512 23287e468da8939334f4261bfcbb52eadcbe5806bd97896db38c84eb42f32143dc17bb8b9bb7f7f88584b72056553c9edc33ddb693a345ecf88f3177573fa9c0
DIST lxc-4.0.11.tar.gz.asc 833 BLAKE2B 68804d1d5ad09e388541b3a95a98ca14202c513ea3544a7389a49f4e13ecffc17715bb023675134fd99047c727cffe09cbd0a89883054b82650ebd23366823a7 SHA512 49a54aaf018772db40e1dadc0a10e7d727a2b14b34c0a3c704fd3f7a12e60082abf4628cc0a489ee620ef2210c7542abbdb6d1432e4297ceef52cdd6b158a5f8
diff --git a/app-emulation/lxc/lxc-4.0.10.ebuild b/app-emulation/lxc/lxc-4.0.10.ebuild
deleted file mode 100644
index f9e67a8c76f9..000000000000
--- a/app-emulation/lxc/lxc-4.0.10.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
- verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc man pam seccomp selinux +ssl +tools verify-sig"
-
-RDEPEND="acct-group/lxc
- acct-user/lxc
- app-misc/pax-utils
- sys-apps/util-linux
- sys-libs/libcap
- virtual/awk
- caps? ( sys-libs/libcap )
- pam? ( sys-libs/pam )
- seccomp? ( sys-libs/libseccomp )
- selinux? ( sys-libs/libselinux )
- ssl? (
- dev-libs/openssl:0=
- )"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4
- apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )
- man? ( app-text/docbook-sgml-utils )
- verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
- ~CGROUPS
- ~CGROUP_CPUACCT
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
-
- ~CGROUP_SCHED
- ~CPUSETS
- ~IPC_NS
- ~MACVLAN
-
- ~MEMCG
- ~NAMESPACES
- ~NET_NS
- ~PID_NS
-
- ~POSIX_MQUEUE
- ~USER_NS
- ~UTS_NS
- ~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
- linux-info_pkg_setup
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
- "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- local myeconfargs=(
- --bindir=/usr/bin
- --localstatedir=/var
- --sbindir=/usr/bin
-
- --with-config-path=/var/lib/lxc
- --with-distro=gentoo
- --with-init-script=systemd
- --with-rootfs-path=/var/lib/lxc/rootfs
- --with-runtime-path=/run
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
- --disable-coverity-build
- --disable-dlog
- --disable-fuzzers
- --disable-mutex-debugging
- --disable-no-undefined
- --disable-rpath
- --disable-sanitizers
- --disable-tests
- --disable-werror
-
- --enable-bash
- --enable-commands
- --enable-memfd-rexec
- --enable-thread-safety
-
- $(use_enable apparmor)
- $(use_enable caps capabilities)
- $(use_enable doc api-docs)
- $(use_enable doc examples)
- $(use_enable man doc)
- $(use_enable pam)
- $(use_enable seccomp)
- $(use_enable selinux)
- $(use_enable ssl openssl)
- $(use_enable tools)
-
- $(use_with pam pamdir $(getpam_mod_dir))
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
- bashcomp_alias ${PN}-start \
- ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
-
- keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
- rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
-
- find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
-
- # Gentoo-specific additions!
- newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
-
- # Remember to compare our systemd unit file with the upstream one
- # config/init/systemd/lxc.service.in
- systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service"
-
- DOC_CONTENTS="
- For openrc, there is an init script provided with the package.
- You should only need to symlink /etc/init.d/lxc to
- /etc/init.d/lxc.configname to start the container defined in
- /etc/lxc/configname.conf.
-
- Correspondingly, for systemd a service file lxc@.service is installed.
- Enable and start lxc@configname in order to start the container defined
- in /etc/lxc/configname.conf."
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- elog "Please run 'lxc-checkconfig' to see optional kernel features."
- elog
- optfeature "automatic template scripts" app-emulation/lxc-templates
- optfeature "Debian-based distribution container image support" dev-util/debootstrap
- optfeature "snapshot & restore functionality" sys-process/criu
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e45e3660a4b3..79241749804c 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index b1006644bcef..bd6615898440 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -1 +1,2 @@
DIST fhem-6.0.tar.gz 28562819 BLAKE2B 4bc4f232caf0adc35ded72f380c1d4c816a22304af357f9b204fb856c2053038e3db2d834b7448d3cf43e84d3f435a36d047e48606b9e1083ab4963b38a75301 SHA512 a8e9d74b1d68ad7c9aea0a4d463aa877cb607458cb6ecf76203c96ff2156fd8b8a3b9cb5687ac0a5cd1eca5f94552433de55f3696b7be54a3cfa8df9cf74fbe1
+DIST fhem-6.1.tar.gz 32437246 BLAKE2B 0c7afce70d7fa4afe01b4dd46847cfb406a267c30ba6490b4ded75c365e745c0e84aa4872e6ca9c59f11b3082655e23295c59d69c5f91b272cc576df2e9e4978 SHA512 93767f6e8fa2b35b24192c1dd5de29bc9ac09f8690982870d1479350acc0954d6a635fcb2abfdac96f2f9b4f8217288486b35fa385f3388efd1407b4f14ebe8f
diff --git a/app-misc/fhem/fhem-6.1.ebuild b/app-misc/fhem/fhem-6.1.ebuild
new file mode 100644
index 000000000000..ff54d3f73199
--- /dev/null
+++ b/app-misc/fhem/fhem-6.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="A GPL'd perl server for house automation"
+HOMEPAGE="https://www.fhem.de/"
+SRC_URI="https://www.fhem.de/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+ acct-group/fhem
+ acct-user/fhem
+ dev-perl/Crypt-CBC
+ dev-perl/Device-SerialPort
+ dev-perl/Digest-CRC
+ dev-perl/JSON
+"
+
+DEPEND="media-gfx/pngcrush"
+
+src_prepare() {
+ default
+
+ # Allow install path to be set by DESTDIR in Makefile
+ sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
+
+ # Remove docs in Makefile, as they will be installed manually
+ sed -i -e 's/docs//g' Makefile || die
+ sed -i -e '/README_DEMO.txt/d' Makefile || die
+
+ # Remove manpage in Makefile, as it will be installed manually
+ sed -i -e '/fhem.pl.1/d' Makefile || die
+
+ # Remove lcd4linux binaries, as they are provied by app-misc/lcd4linux
+ rm -r contrib/lcd4linux || die
+
+ # Remove log dir, as it will be replaced with a symlink
+ rm -r log || die
+
+ # Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
+ # Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
+ pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
+
+ cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ local DOCS=(
+ "CHANGED"
+ "HISTORY"
+ "MAINTAINER.txt"
+ "README.SVN"
+ "README_DEMO.txt"
+ "docs"/*.txt
+ "docs"/*.patch
+ "docs"/*.pdf
+ "docs/changelog"
+ "docs/copyright"
+ "docs/dotconfig"
+ "docs/fhem.odg.readme"
+ "docs/LIESMICH.update-thirdparty"
+ "docs"/README*
+ "docs/X10"
+ )
+
+ if use doc; then
+ local DOCS+=( "docs/X10" )
+ local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
+ fi
+
+ diropts -o fhem -g fhem
+ keepdir "/var/lib/fhem"
+ keepdir "/var/log/fhem"
+ diropts
+
+ dosym ../../var/lib/fhem /opt/fhem/data
+ dosym ../../var/log/fhem /opt/fhem/log
+
+ default
+
+ newinitd "${FILESDIR}"/fhem.initd fhem
+
+ systemd_newunit "${FILESDIR}"/fhem.service-r1 fhem.service
+ newtmpfiles "${FILESDIR}"/fhem.tmpfiles fhem.conf
+
+ newman docs/fhem.man fhem.pl.1
+
+ echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
+ doenvd "${T}"/99fhem
+
+ fowners fhem:fhem /opt/fhem/fhem.cfg
+}
+
+pkg_postinst() {
+ tmpfiles_process fhem.conf
+}
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index eb98b74238a0..a5bc8993565a 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,2 +1 @@
-DIST pdfpc-4.4.1.tar.gz 7733986 BLAKE2B 4232dedbda6423e95259169348a36196a539ed966e50a230390a6f99dbff6c9710d0c41be11436005454858a213ff5f07d1b1f26fd67973f20812111eea81d79 SHA512 61db48eae75f0e55f7d7b728bc107827b9f141826c3c55be4fb90faf95eaac2dbef1858eb1b7a3e5980130ee09c4096812a3403451f2a52052c29e4fb7be458f
DIST pdfpc-4.5.0.tar.gz 7754665 BLAKE2B 952a1694811ff80ab6b2e46b440182407ce16a727ebc1f1492cf1f86c25fe1827e926eb5baf59376f46b8e7bea6e00e4f1343930cd043445f7d2966a958b4a6c SHA512 142a276dc410bd1aac90b27d1b10d165de225d5cec73ab39d7f7061e5d8ac7526e3f537b61f15e904bba8d135a72c5567dfa350e454006435ad3647d22c58221
diff --git a/app-misc/pdfpc/pdfpc-4.4.1.ebuild b/app-misc/pdfpc/pdfpc-4.4.1.ebuild
deleted file mode 100644
index 6776b1461374..000000000000
--- a/app-misc/pdfpc/pdfpc-4.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.50" # append versions in sed line if increased
-
-inherit cmake vala
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="https://pdfpc.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# Note: Relicensing to GPL-3+ for >pdfpc-4.4.1, see
-# https://github.com/pdfpc/pdfpc/commit/2a2c9b71467db801a3a0c6e5aabc8794004216bb
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gstreamer"
-
-RDEPEND="
- app-text/poppler:=[cairo]
- dev-libs/glib:2
- dev-libs/libgee:0.8=
- gnome-base/librsvg
- sys-apps/dbus
- x11-libs/gtk+:3
- gstreamer? (
- media-libs/gstreamer:1.0=
- media-libs/gst-plugins-base:1.0=
- media-plugins/gst-plugins-gtk:1.0=
- media-plugins/gst-plugins-cairo:1.0=
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(vala_depend)"
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i -e "s/valac/valac valac-0.50 valac-0.48 valac-0.46 valac-0.44 valac-0.40 valac-0.36/" cmake/vala/FindVala.cmake || die
- vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DMOVIES=$(usex gstreamer on off)
- )
- cmake_src_configure
-}
diff --git a/app-misc/pdfpc/pdfpc-4.5.0.ebuild b/app-misc/pdfpc/pdfpc-4.5.0.ebuild
index b3d9dd3294bc..b4a0c4eeed3a 100644
--- a/app-misc/pdfpc/pdfpc-4.5.0.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.5.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc"
LICENSE="GPL-3+"
SLOT="0"
IUSE="+gstreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}/.git"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 309281d878ba..bb97307dd36f 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/grisbi/grisbi-2.0.5.ebuild b/app-office/grisbi/grisbi-2.0.5.ebuild
index 4af337a5e9fa..30f05505a9a9 100644
--- a/app-office/grisbi/grisbi-2.0.5.ebuild
+++ b/app-office/grisbi/grisbi-2.0.5.ebuild
@@ -12,7 +12,7 @@ IUSE="goffice nls ofx ssl"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
RDEPEND="
dev-libs/glib:2
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index fdd8277b73e1..8625f73c66d8 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index 95d5f0cde54a..9fb2cafc7780 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit python-single-r1
DESCRIPTION="gentoo.git signature verification tool"
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 7de8a6be0ec8..40a89f90271d 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,2 +1 @@
-DIST iwdevtools-0.8.0.tar.gz 57529 BLAKE2B b8068c7781b8b164b9b5d191f8a33a4a89854edb7c78c56d4f1312dd0d051d0b033f21611066303acb7efdf8403d6869458db98e7b1b2a293c779cca2bdcdd36 SHA512 df39fa02d7f4f72334286305bfa9c2db6d5db90bddc47194e3383a99492366796c7ae2e751bcf8af01d14cfa0bac88ea8d9c8678b7891f85aaa1b20e4a9e91cb
DIST iwdevtools-0.8.1.tar.gz 58058 BLAKE2B b9f17f68bb073ecf2d8a94fc8b97d95f7188e7526dd6a32cf33aa3b01fe82bf25c696cc2be9cbdc0aaa3a8279532e506ab287d3e25da5d5fb55789064d47aec6 SHA512 cb365e7010d620f2a255db0244ee1a38fd5714a17093b2e2a71627155764165853f99a4477b281b92061f7fe184297a222a8c79c2c62beb8e0656761feee859b
diff --git a/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
deleted file mode 100644
index 5d03e033a003..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
-HOMEPAGE="https://github.com/ionenwks/iwdevtools"
-SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-misc/pax-utils
- app-portage/portage-utils
- sys-apps/diffutils
- sys-apps/file
- sys-apps/portage
- sys-apps/util-linux"
-BDEPEND="
- sys-apps/help2man
- test? ( ${RDEPEND} )"
-
-src_configure() {
- local emesonargs=(
- -Ddocdir=${PF}
- -Deprefix="${EPREFIX}"
- -Dshellcheck=false
- $(meson_use test)
- )
-
- meson_src_configure
-}
-
-pkg_postinst() {
- optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
-
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "Optional portage integration relies on using /etc/portage/bashrc."
- elog "The example bashrc can be used as-is if not already using one:"
- elog
- elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
- elog
- elog "Otherwise, inspect the tools' --help output and the example to integrate"
- elog "(if not defining the same phase functions, the example can be sourced)."
- elog
- elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
- elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
- elog
- elog ' PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
- elog
- elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
- fi
-
- if ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
- elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
- elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
- fi
-}
diff --git a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
index 5add38623491..e71c5f2f2b37 100644
--- a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 1c66b4b332fc..34e46b76e0b5 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild
index 1975fc029304..edd609c996e2 100644
--- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild
+++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
PATCHES=(
"${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
@@ -67,8 +67,8 @@ src_install() {
local myhost="$(sh bin/package host)"
cd "arch/${myhost}" || die
- dodir /bin
- mv bin/ksh "${ED}"/bin/ || die
+ into /
+ dobin bin/ksh
dosym ksh /bin/rksh
newman man/man1/sh.1 ksh.1
diff --git a/app-shells/ksh/ksh-9999.ebuild b/app-shells/ksh/ksh-9999.ebuild
index 15fbc5bb62c7..8e02335af1d6 100644
--- a/app-shells/ksh/ksh-9999.ebuild
+++ b/app-shells/ksh/ksh-9999.ebuild
@@ -66,8 +66,8 @@ src_install() {
local myhost="$(sh bin/package host)"
cd "arch/${myhost}" || die
- dodir /bin
- mv bin/ksh "${ED}"/bin/ || die
+ into /
+ dobin bin/ksh
dosym ksh /bin/rksh
newman man/man1/sh.1 ksh.1
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 047ace530925..099540c9a8b4 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
new file mode 100644
index 000000000000..57faecc3da70
--- /dev/null
+++ b/dev-ada/libadalang-tools/Manifest
@@ -0,0 +1 @@
+DIST libadalang-tools-22.0.0.tar.gz 892619 BLAKE2B 5ba3cc91c0cd251ade396eda1d8de4244712905ef33ec9bb68a76ab20908d4034b78989dc051b2e47a2fd37e41ae49bf46b1459a74742205750c8a60697e27cc SHA512 c9028428379e68644dee140b76c6806b15561484bdc77a8c85c88c1ae4de512b6252f41b415fe767c5c7ae533fba1583e075620bd222a7be240d6cd1130d25bd
diff --git a/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild b/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
new file mode 100644
index 000000000000..6562088f4a50
--- /dev/null
+++ b/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0,1} )
+inherit ada multiprocessing
+
+DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+ dev-ada/libadalang[${ADA_USEDEP},static-libs]"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+ gprbuild -v -k -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \
+ -XBUILD_MODE=dev -XLALTOOLS_SET=all -P src/build.gpr -p \
+ -j$(makeopts_jobs) || die
+}
+
+src_install() {
+ dobin bin/gnat{metric,pp,stub,test}
+ einstalldocs
+}
diff --git a/dev-ada/libadalang-tools/metadata.xml b/dev-ada/libadalang-tools/metadata.xml
new file mode 100644
index 000000000000..d2615c1b0e0a
--- /dev/null
+++ b/dev-ada/libadalang-tools/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ ada@gentoo.org
+
+
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
new file mode 100644
index 000000000000..694152577400
--- /dev/null
+++ b/dev-ada/libadalang/Manifest
@@ -0,0 +1 @@
+DIST libadalang-22.0.0.tar.gz 2364531 BLAKE2B 3992baa7180dce696b2c8aa0d451117a12b90072e83274d96a8d971b627c82bc66c5c21fa1eb6dbdd7ce95e0264852c5702b3d7c90f7bdf093915178e0a4a659 SHA512 b874feb102fe221595ad4b9b95b3ea4c6593686f96097ace17ad3c57534dc801000819de0cf898489e3407fd201eb003dd75f4f743a53dfb76cadfa6c727d789
diff --git a/dev-ada/libadalang/libadalang-22.0.0.ebuild b/dev-ada/libadalang/libadalang-22.0.0.ebuild
new file mode 100644
index 000000000000..ea1c91a57864
--- /dev/null
+++ b/dev-ada/libadalang/libadalang-22.0.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+ADA_COMPAT=( gnat_202{0,1} )
+
+inherit ada python-single-r1
+
+DESCRIPTION="high performance semantic engine for the Ada programming language"
+HOMEPAGE="https://libre.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test shared static-libs static-pic"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ${ADA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pyyaml
+ dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
+ ${ADA_DEPS}
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ dev-ada/gprbuild[${ADA_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-ada/langkit[${PYTHON_USEDEP}]
+ ')
+"
+BDEPEND="test? (
+ dev-ml/dune
+ dev-ml/zarith
+ dev-ml/camomile
+ dev-ml/ocaml-ctypes
+ )"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ ada_pkg_setup
+ libType=''
+ if use static-libs; then
+ libType+=',static'
+ fi
+ if use static-pic; then
+ libType+=',static-pic'
+ fi
+ if use shared; then
+ libType+=',relocatable'
+ fi
+ libType=${libType:1}
+}
+
+src_configure() {
+ ${EPYTHON} manage.py generate -v debug || die
+}
+
+src_compile() {
+ ${EPYTHON} manage.py build -v \
+ --gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}" \
+ --library-types=${libType} || die
+}
+
+src_test() {
+ #eval $(${EPYTHON} ./manage.py setenv)
+ ${EPYTHON} manage.py test --restricted-env -j 1 |& > /dev/null
+ ${EPYTHON} manage.py test --restricted-env -j 1 |& tee libadalang.testOut
+ grep -qw FAIL libadalang.testOut && die
+}
+
+src_install() {
+ ${EPYTHON} manage.py \
+ install "${D}"/usr \
+ --library-types=${libType} || die
+ rm -r "${D}"/usr/python || die
+ python_domodule build/python/libadalang
+ rm -r "${D}"/usr/ocaml || die
+}
diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml
new file mode 100644
index 000000000000..217288dff7b1
--- /dev/null
+++ b/dev-ada/libadalang/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ ada@gentoo.org
+
+
+
+ Libadalang is a project to build a high performance semantic engine for
+ the Ada programming language. It is meant to provide a basis to write
+ Ada tooling, including tools working on potentially changing and
+ incorrect code, such as IDEs.
+
+
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index e3cf49fb6ae8..19007b7f0d85 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index d6069d9926d7..c696a730c0d1 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,2 @@
-DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
DIST eigen-3.4.0.tar.gz 2705005 BLAKE2B ae5f774a6ed36f52cf9fc3206e50796abacbba69fd0f67cd5759b4e04d847aa656861d5e06e6cd0d798a17f2b06abdb70b16f795a626bdd29edcc872c33821f8 SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
diff --git a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild b/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
deleted file mode 100644
index 68821a80607c..000000000000
--- a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED="test"
-inherit cmake cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="https://eigen.tuxfamily.org/index.php?title=Main_Page"
-SRC_URI="https://gitlab.com/libeigen/eigen/-/archive/${PV}/${P}.tar.bz2 -> ${P}-gitlab.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? (
- app-doc/doxygen[dot]
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( virtual/pkgconfig )
-"
-DEPEND="
- cuda? ( dev-util/nvidia-cuda-toolkit )
- test? (
- dev-libs/gmp:0
- dev-libs/mpfr:0
- media-libs/freeglut
- media-libs/glew
- sci-libs/adolc[sparse]
- sci-libs/cholmod
- sci-libs/fftw:3.0
- sci-libs/pastix
- sci-libs/scotch
- sci-libs/spqr
- sci-libs/superlu
- sci-libs/umfpack
- virtual/opengl
- )
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo-cmake.patch )
-
-src_prepare() {
- cmake_src_prepare
-
- cmake_comment_add_subdirectory demos
-
- if ! use test; then
- sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
- -e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
- -e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
- -i CMakeLists.txt || die
- fi
-
- use cuda && cuda_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKEPACKAGE_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)/cmake/${PN}${SLOT}
- )
- use test && mycmakeargs+=(
- -DEIGEN_TEST_CXX11=ON
- -DEIGEN_TEST_NOQT=ON
- -DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
- -DEIGEN_TEST_CUDA=$(usex cuda)
- -DEIGEN_TEST_OPENMP=$(usex openmp)
- -DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
- -DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_src_compile doc
- if use test; then
- cmake_src_compile blas
- cmake_src_compile buildtests
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- cmake_src_install
-}
diff --git a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
index a787eecd0008..9a95a42c7c74 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
# Tests failing again because of compiler issues
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 736e41a1be97..de8ab90f8dad 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/cpp-driver/metadata.xml b/dev-db/cpp-driver/metadata.xml
index 27af27740ba4..c66f9b3de0ce 100644
--- a/dev-db/cpp-driver/metadata.xml
+++ b/dev-db/cpp-driver/metadata.xml
@@ -6,14 +6,7 @@
This driver works exclusively with the Cassandra Query Language v3
(CQL3) and Cassandra's native protocol.
-
- geaaru@gmail.com
- Daniele Rondina
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
datastax/cpp-driver
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index e9fa8d69aa57..a42f9febba9e 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild b/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild
index 29ec00776400..0930f2f0c48a 100644
--- a/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
IUSE="tcmalloc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2fd32adf4005..cb6b9beef16c 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 1e5eed6cb248..79e79b181e52 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,4 +1,4 @@
DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564
DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320cc6214fe1a139f390b73d9aa656ebfaf90c21816d57964f37e9cad51faed21f82f55b7e24fcf0f5a3ffd861c990ad SHA512 95cc2de9b7c3d6019d7780b17238ff8f0db14c9a1e494b391c84d75619eb3064322bb2c56fa9127b0a5681c94b32283090a15b06fefeccdb95a1f8fb9e58c75c
DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
-DIST gradle-bin-7.3.1.zip 158871851 BLAKE2B 45a7d94cb38e999c7e496d248325fceabcf0a4670e58d173207a80d86323e5be57837abd2bc6fc7b26fa5cb1aa06ac4f25fd4516080d62e144263150cb53084c SHA512 f9fe4d7cef90076d8fe877d4710196cf5198a35baf5aad415762cd98b58408ce2798675f4fd3ca1a72d415070f0118bd0e4c83feac5809245798da58ee0b7a4a
+DIST gradle-bin-7.3.2.zip 158875135 BLAKE2B 52ae669eb4bea61aa13ac734f8e660db63d0beb865bdb07250cfc14e4a2e8a7fea9613629ec8a1949042463d0a3056949f7bd7c9944e663eee64d900bd92bec4 SHA512 86ca78148bf1df1642ee8a89fb2d560522dd01666de8dd4002f5425ac17b178d108cca99a3311700a84b7dc1d962a2392ab5da6b446177702dfea52c29b6fa40
diff --git a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
index dfbd1549205b..1e7b593a8227 100644
--- a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
LICENSE="Apache-2.0"
SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-7.3.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.3.2.ebuild
similarity index 100%
rename from dev-java/gradle-bin/gradle-bin-7.3.1.ebuild
rename to dev-java/gradle-bin/gradle-bin-7.3.2.ebuild
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
index 4eb58241e3af..bdeb4a67273d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptium.net"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups +gentoo-vm headless-awt selinux source"
RDEPEND="
diff --git a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
index 359e7c0710f1..9491e94edeca 100644
--- a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://openjdk.java.net"
SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild
index 22a609e19717..687d31892300 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x64-macos"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
index ef4a91e9b8c8..2acf963a0925 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild
index fb739b89bf7a..e360880764ab 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild
index eaffc40f4037..bc802223a5b6 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild
index 4a8d22d12869..2ef1eafac6cf 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9321902a9f16..f2f4244cd618 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index db4ed12e206c..b10c290c5f79 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -1,7 +1 @@
-DIST execline-2.1.1.0.tar.gz 75967 BLAKE2B 196edcfce385a2a3ef8bc3b16f94401430e06649c1ef9157da603904c296e3601433248046393d0c5ef9805107d09caf21f185b0c3ea3cabfde88508280bd5bd SHA512 250fe449b39a198193f1431b249b342f3c6c499fea12779a55d0e27aec2095285bbf9dc2a48d84eebdf9f540ecf5e67ef39393243ca0fadfc764d2cc95ac0b6b
-DIST execline-2.3.0.3.tar.gz 82476 BLAKE2B e54bf40037d988848a31b90ca477fb1a297bfc91a6ceb51289944cccc7af36a26b8323c63e8178bd9a252b482a703329c04c9f08a25c2cfe94f5baf60983d04c SHA512 2858ce62853f00f59e0cea8b886cd042f7ad04c6a86208266654d3d2e820b5d440e41cc4efb96fccdcc653d19957d343115a8e8c394b68f23addf941294fb172
-DIST execline-2.3.0.4.tar.gz 82774 BLAKE2B a658b538d0a17f15876fe9a822bb7c7e4edba48d2fce1d3c0fe0fd06fd8a414e062a962ca3935992903a4abccf920bf6ee957743609905a6ce498e6fd3deded8 SHA512 ce73b69394ec061ad85cf6f69211180bffe69f1b9716217dadca5894a261f77343d54d5f0339b3822c472720e60c4aa100a0e05dc83f2ad6b926bb53b5141c15
-DIST execline-2.5.0.1.tar.gz 81854 BLAKE2B a70e8c9c3a739fb32573937c9b5c1fb65c730bea7e7760d81b62ea7666727a29ae9902139f78660891e65ed3e6769fc5d6afcb2fb3e030e0c75d3acb6392fd39 SHA512 9e013a83844fc3f5b28c6aea44b446f550dafe52131facf0d7c0648c9ae62c4a62d895f72cedb010754319c0e298fb4c8396d2c6be019cd6218558934bffaea3
-DIST execline-2.5.1.0.tar.gz 83681 BLAKE2B c07b9b6d1c328bc3a96480e59b67676dde82df9112de6c1bd150509f0e062d289390fa935cebe48bc38a769be53ce7b3ef122bc0bd0172c997a56d28a6a11018 SHA512 461a91d0e790e96233179c89c783bb29d89592def451643265c97259db83056556cd5f231d668e8c460396c35a8792f56b30193171e85488e60e3cb4feb7379c
-DIST execline-2.5.3.0.tar.gz 86575 BLAKE2B fa61ef88a3e2db7e7a051d45e270f40891d46bd2e4349e1569539f964e49f6814c00dcbb496f0185bdd08d43dbf2c038caf5c088ecb54f82a239a85c30a500c6 SHA512 75b584e2365288bb1d05fd67e390fab1b6ccf48cb0a2ccbfb84a7d22ddf6957c9c591ab165542ed180b2ff1ef9ceb2a16cbae569e69c5dd5f20e52be092cff15
DIST execline-2.6.1.1.tar.gz 92495 BLAKE2B 6b901819e49c424d52ce2d87b6b42aec1595fb97fef7905e93eca2f3ac029a35f826e37e519e2c6ab9e2638f625a446db363f5fbfd5530a93b52c831660b7a11 SHA512 5826abb407742ad8a2cd48c09b966827d129dda420db07c893cd7a27e806441d7b117a0c61fdc0222e527aada976da26e4779a4896fc084cdf6efa8294ffac5b
diff --git a/dev-lang/execline/execline-2.1.1.0.ebuild b/dev-lang/execline/execline-2.1.1.0.ebuild
deleted file mode 100644
index 52269f38919d..000000000000
--- a/dev-lang/execline/execline-2.1.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2013-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="a non-interactive scripting language similar to SH"
-HOMEPAGE="http://www.skarnet.org/software/execline/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-4.0
- static? ( >=dev-libs/skalibs-2.3.1.0[static-libs] )
- !static? ( >=dev-libs/skalibs-2.3.1.0 )
-"
-RDEPEND="!static? ( >=dev-libs/skalibs-2.3.1.0 )"
-
-src_prepare() {
- # Remove QA warning about LDFLAGS addition
- sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable static allstatic) \
- $(use_enable !static shared) \
- --bindir=/bin \
- --sbindir=/sbin \
- --dynlibdir=/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --datadir=/etc \
- --sysdepdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs
-}
-
-src_compile() {
- emake DESTDIR="${D}"
-}
-
-src_install() {
- default
- dohtml -r doc/*
-}
diff --git a/dev-lang/execline/execline-2.3.0.3.ebuild b/dev-lang/execline/execline-2.3.0.3.ebuild
deleted file mode 100644
index 19fe49f212fe..000000000000
--- a/dev-lang/execline/execline-2.3.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="a non-interactive scripting language"
-HOMEPAGE="https://www.skarnet.org/software/execline/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
- static? (
- >=dev-libs/skalibs-2.6.0.1[static-libs]
- )
- !static? (
- >=dev-libs/skalibs-2.6.0.1
- )
-"
-RDEPEND="
- !static? (
- >=dev-libs/skalibs-2.6.0.1:=
- )
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
- default
-
- # Remove QA warning about LDFLAGS addition
- sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
- # configure overrides gentoo's -fstack-protector default
- sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
- econf \
- --bindir=/bin \
- --dynlibdir=/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- $(use_enable !static shared) \
- $(use_enable static allstatic) \
- $(use_enable static static-libc) \
- $(use_enable static-libs static)
-}
diff --git a/dev-lang/execline/execline-2.3.0.4.ebuild b/dev-lang/execline/execline-2.3.0.4.ebuild
deleted file mode 100644
index 83c57271fbbf..000000000000
--- a/dev-lang/execline/execline-2.3.0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="a non-interactive scripting language"
-HOMEPAGE="https://www.skarnet.org/software/execline/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
- static? (
- >=dev-libs/skalibs-2.6.2.0[static-libs]
- )
- !static? (
- >=dev-libs/skalibs-2.6.2.0
- )
-"
-RDEPEND="
- !static? (
- >=dev-libs/skalibs-2.6.2.0:=
- )
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
- default
-
- # Remove QA warning about LDFLAGS addition
- sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
- # configure overrides gentoo's -fstack-protector default
- sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
- econf \
- --bindir=/bin \
- --dynlibdir=/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- $(use_enable !static shared) \
- $(use_enable static allstatic) \
- $(use_enable static static-libc) \
- $(use_enable static-libs static)
-}
diff --git a/dev-lang/execline/execline-2.5.0.1.ebuild b/dev-lang/execline/execline-2.5.0.1.ebuild
deleted file mode 100644
index e3d5fb4aabe0..000000000000
--- a/dev-lang/execline/execline-2.5.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="a non-interactive scripting language"
-HOMEPAGE="https://www.skarnet.org/software/execline/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-DEPEND=">=dev-libs/skalibs-2.7.0.0[static-libs?]"
-RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
- default
-
- # Remove QA warning about LDFLAGS addition
- sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
- # configure overrides gentoo's -fstack-protector default
- sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
- econf \
- --bindir=/bin \
- --dynlibdir=/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- --enable-shared \
- $(use_enable static allstatic) \
- $(use_enable static static-libc) \
- $(use_enable static-libs static)
-}
diff --git a/dev-lang/execline/execline-2.5.1.0.ebuild b/dev-lang/execline/execline-2.5.1.0.ebuild
deleted file mode 100644
index 70c3c769f1be..000000000000
--- a/dev-lang/execline/execline-2.5.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A non-interactive scripting language"
-HOMEPAGE="https://www.skarnet.org/software/execline/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-libs/skalibs-2.8.0.0:=[static-libs?]"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
- configure || die
-}
-
-src_configure() {
- econf \
- --bindir=/bin \
- --dynlibdir=/usr/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/usr/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- --enable-shared \
- $(use_enable static allstatic) \
- $(use_enable static static-libc) \
- $(use_enable static-libs static)
-}
diff --git a/dev-lang/execline/execline-2.5.3.0.ebuild b/dev-lang/execline/execline-2.5.3.0.ebuild
deleted file mode 100644
index e1b054e6a45f..000000000000
--- a/dev-lang/execline/execline-2.5.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A non-interactive scripting language"
-HOMEPAGE="https://www.skarnet.org/software/execline/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-libs/skalibs-2.9.1.0:=[static-libs?]"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
- configure || die
-}
-
-src_configure() {
- econf \
- --bindir=/bin \
- --dynlibdir=/usr/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/usr/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- --enable-shared \
- $(use_enable static allstatic) \
- $(use_enable static static-libc) \
- $(use_enable static-libs static)
-}
diff --git a/dev-lang/execline/execline-2.6.1.1.ebuild b/dev-lang/execline/execline-2.6.1.1.ebuild
index 56df74d7c553..e932435f75ec 100644
--- a/dev-lang/execline/execline-2.6.1.1.ebuild
+++ b/dev-lang/execline/execline-2.6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="static static-libs"
REQUIRED_USE="static? ( static-libs )"
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 18a587dc5165..c35059edbdd6 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,3 +1 @@
-DIST go1.17.2.src.tar.gz 22182111 BLAKE2B 83b665af212f3e20dc9c9f4bd80ac0e1e4acb8ba6653835f6a8b990a5d6074a25ba78b783f7a4f9402b3f1916a65ddba4ad9780e4eae871719cff13f7bb9c980 SHA512 167220293e02d6994b5cdee5909cbdbe66f692619baeb6ff9ee0d56660eb39cfd9eac2ac510f113d5222dadd5858fd6276bd961365ca42b42c07af5d24d48107
-DIST go1.17.3.src.tar.gz 22183309 BLAKE2B 1cb2960f67335f0022900cdab5dd70bcb52f15c2d311ea2dd99a0205af518741d9642741ea1bb5fea870239d6c971e6c69053a195e6a72e7440c8bdd3a0c085c SHA512 a2793efefe3f7e89054453cada03c25a900a4a6b71b2dfa0f5f33c1d8946711c983067dd54021faa5605074708db8e4225d104be703d307f3dbcc6035410acbd
DIST go1.17.5.src.tar.gz 22186577 BLAKE2B fe6cbfce1a8e7556e7f690f34eb1cdf761f0f74b2ff3781bdc3c6ce2efa4fd00229268ee704d6c4a84f4b37b3deae7c65bd12628bf60ec32c2d8c32b13d99de1 SHA512 6c833455fe79476c29a0565ae3b5ede452abb75689d52cbaa524743549f6f12681b6b5035dc4048387bd738c15b7cd8bdc4c875d54232ca2343c7404a4326884
diff --git a/dev-lang/go/go-1.17.2.ebuild b/dev-lang/go/go-1.17.2.ebuild
deleted file mode 100644
index 4b20d98f17e7..000000000000
--- a/dev-lang/go/go-1.17.2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV} in
-*9999*)
- EGIT_REPO_URI="https://github.com/golang/go.git"
- inherit git-r3
- ;;
-*)
- SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
- S="${WORKDIR}"/go
- case ${PV} in
- *_beta*|*_rc*) ;;
- *)
- KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
- ;;
- esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="|| (
- dev-lang/go
- dev-lang/go-bootstrap )"
-RDEPEND="!
-
- sam@gentoo.org
- Sam James
+
+ rndxelement@protonmail.com
+ Philipp Rösner
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
MuJS is a lightweight Javascript interpreter designed for embedding in
diff --git a/dev-lang/mujs/mujs-1.2.0.ebuild b/dev-lang/mujs/mujs-1.2.0.ebuild
new file mode 100644
index 000000000000..e25bff9dec49
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="An embeddable JavaScript interpreter written in C"
+HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
+SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
+
+LICENSE="ISC"
+# The subslot matches the SONAME
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="sys-libs/readline:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.1-flags.patch
+)
+
+src_prepare() {
+ default
+
+ tc-export AR CC
+
+ append-cflags -fPIC
+
+ # The library's ABI (and API) might change in new releases
+ # Diff 'usr/include/mujs.h' across releases to validate
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ append-cflags -Wl,-install_name,"${EPREFIX}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib
+ else
+ append-cflags -Wl,-soname=lib${PN}.so.${PV}
+ fi
+}
+
+src_compile() {
+ # We need to use ${PV} for the pkgconfig file, see: #784461
+ emake \
+ VERSION=${PV} \
+ XCFLAGS="${CFLAGS}" \
+ XCPPFLAGS="${CPPFLAGS}" \
+ prefix=/usr \
+ shell shared
+}
+
+src_install() {
+ emake \
+ DESTDIR="${ED}" \
+ VERSION=${PV} \
+ libdir="/usr/$(get_libdir)" \
+ prefix=/usr \
+ install-shared
+
+ # TODO: Tidy up this logic, improve readability
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so "${ED}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib || die
+ dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.dylib
+ dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.${PV:0:1}.dylib
+ else
+ mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
+ dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+ dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+ fi
+}
diff --git a/dev-lang/python/metadata.xml b/dev-lang/python/metadata.xml
index c72b41d56afb..54c2aa9734b5 100644
--- a/dev-lang/python/metadata.xml
+++ b/dev-lang/python/metadata.xml
@@ -7,6 +7,7 @@
diff --git a/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
index 0c64508591fc..861886b03dfd 100644
--- a/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
@@ -36,7 +36,6 @@ BDEPEND="${CDEPEND}
>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- dev-python/hacking[${PYTHON_USEDEP}]
>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
@@ -67,6 +66,9 @@ src_prepare() {
sed -e 's:test_repr:_&:' \
-i openstack/tests/unit/test_resource.py || die
+ # requires hacking
+ rm openstack/tests/unit/test_hacking.py || die
+
distutils-r1_src_prepare
}
diff --git a/dev-python/openstacksdk/openstacksdk-0.60.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.60.0.ebuild
index 00e5891929b7..78a6dbf0d0c6 100644
--- a/dev-python/openstacksdk/openstacksdk-0.60.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.60.0.ebuild
@@ -36,7 +36,6 @@ BDEPEND="${CDEPEND}
>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- dev-python/hacking[${PYTHON_USEDEP}]
>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
@@ -67,6 +66,9 @@ src_prepare() {
sed -e 's:test_repr:_&:' \
-i openstack/tests/unit/test_resource.py || die
+ # requires hacking
+ rm openstack/tests/unit/test_hacking.py || die
+
distutils-r1_src_prepare
}
diff --git a/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
index 00e5891929b7..2aeee8621440 100644
--- a/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
-HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+HOMEPAGE="https://github.com/openstack/openstacksdk/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
@@ -36,7 +36,6 @@ BDEPEND="${CDEPEND}
>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- dev-python/hacking[${PYTHON_USEDEP}]
>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
@@ -67,6 +66,9 @@ src_prepare() {
sed -e 's:test_repr:_&:' \
-i openstack/tests/unit/test_resource.py || die
+ # requires hacking
+ rm openstack/tests/unit/test_hacking.py || die
+
distutils-r1_src_prepare
}
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
index 7880771bfaad..549a242c5982 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
@@ -23,7 +23,6 @@ BDEPEND="
test? (
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- dev-python/hacking[${PYTHON_USEDEP}]
>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
dev-python/python-glanceclient[${PYTHON_USEDEP}]
>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 2522b4c3e7d9..7e52edad9def 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,2 +1 @@
-DIST prometheus_client-0.11.0.tar.gz 72272 BLAKE2B 2526a65acf928ce5f492c6a43276ecb951d8b600eeb5050b92db091919862eb0ec4f41ca41347b4dd70a612f70e8f4a49796572de80b197d21c3a8cf8e303201 SHA512 5e644d781b7fcc3e0e386a2244f524ccaf978f1eab87b1d6d8009ac3f10fe2ca4adf2c76c2a2ffa47b4b54237cd906807d55bd99530a92d82cd3825de93280dc
DIST prometheus_client-0.12.0.tar.gz 73521 BLAKE2B eb90c7f3991519fe132f01612d6aadd10193947069b79e67c9e37faa4e174d739ca78b12de028dfc922cb368c7405baeb4fa929b378a91db12e67190ca3561ff SHA512 ebcbbed706a96a9402eb985f5da15ee8fae09de952144a89a3323e147c0d16615ccd9be58b50b5b8ede37d4f66de1e2ce93ed53c4da939ca2e44c7aac687a1f7
diff --git a/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
deleted file mode 100644
index d0fa21391332..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus-client/
- https://github.com/prometheus/client_python/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/prometheus_client-0.12.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.12.0.ebuild
index 035fac3f6100..833fba36cb47 100644
--- a/dev-python/prometheus_client/prometheus_client-0.12.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.12.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
diff --git a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
index 7836e8b0d710..5071aec0dc52 100644
--- a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/pro
LICENSE="BSD"
SLOT="0/30"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
BDEPEND="${PYTHON_DEPS}
~dev-libs/protobuf-${PV}
diff --git a/dev-python/pyflakes/pyflakes-2.4.0.ebuild b/dev-python/pyflakes/pyflakes-2.4.0.ebuild
index 7b6137350409..850b36c38aeb 100644
--- a/dev-python/pyflakes/pyflakes-2.4.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.4.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_tests unittest
diff --git a/dev-python/pyglet/pyglet-1.5.21.ebuild b/dev-python/pyglet/pyglet-1.5.21.ebuild
index 724c64bd720d..ca7bceba3674 100644
--- a/dev-python/pyglet/pyglet-1.5.21.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.21.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 virtualx xdg-utils
DESCRIPTION="Cross-platform windowing and multimedia library for Python"
@@ -18,7 +18,7 @@ IUSE="examples image +sound"
BDEPEND="
test? (
dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/gst-python[${PYTHON_USEDEP}]
+ media-libs/fontconfig
)
"
RDEPEND="
@@ -39,16 +39,17 @@ DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
distutils_enable_tests pytest
-src_test() {
- virtx distutils-r1_src_test
-}
-
python_test() {
xdg_environment_reset
+ # Deselect openal test, can't open device in sandbox
+ local deselect=(
+ tests/unit/media/test_listener.py::test_openal_listener
+ )
+
# Specify path to avoid running interactive tests
# We could add in integration tests, but they're slow
- epytest tests/unit
+ virtx epytest tests/unit ${deselect[@]/#/--deselect }
}
python_install_all() {
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 111b62048ac5..273a7f03f942 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -3,3 +3,4 @@ DIST pylama-8.0.4.tar.gz 34064 BLAKE2B e6ec937b7716d8a64c19e71b370e557a30d04d908
DIST pylama-8.0.6.tar.gz 34223 BLAKE2B 690a0a1197f6512e9511083aa079843f2ca99c9bdb5d74756531db79f7d39e8e0f60a0955b24bc7739edce0376eb79821a796978fb2365789a97628f03f240f8 SHA512 5bc75e5b2a0b141dbe2ca993d13833914980c735b84f3df766bf750909af1eeaba0d554845d8c09f0d8186ff48c8330d9ffa5b565a577ef6506f32672a2c9209
DIST pylama-8.3.3.tar.gz 36292 BLAKE2B e9ed2156c90af1ef33b8a3875dffbe6ee939e70b3a35e0bd9c6f29d5de6ef929e73cf7eda773f6693fdce96e763e81f336fc983a32f9cfa8d124441d5d34b060 SHA512 57db11480752a650dc2871bd8be139492cd5273c3770aefab160855d601e524a24754cf3b4e60973ce00072c1025749c7f9d9d39a5447ca27ab60979e743a72d
DIST pylama-8.3.5.tar.gz 36117 BLAKE2B 6ae876b7e1e0dbfba08c9b7460cbab129b1b43f79a274c191fb7710966fac4b100b1e1c81ac3a440c33b9ed076fb3a60eb5d732f484fc7150c096a7207c3b4d4 SHA512 8be5aa0490ad7e08e6def974c9b8c83c457679dfbdb2b7c161c71fc3f5f68b7e40c96ee41a57d1a1b8689356e22a028aa22400c747c17aa520b5be3e219569e7
+DIST pylama-8.3.6.tar.gz 36190 BLAKE2B f0c9944d3aa205c9f52fdfab6b47ad5ad08f1865db22eef20add0652fcb4355f878026aad9f1babbfcb4f98c13bc5cbaa069d9d7b5c7a775d994a8952f8a8cc5 SHA512 c279f3005e354be448f42addcfeae6025e1dd4acf84e5de0c3ae707ceac4f98e43a07f43be347b26bfb8db4167945db1db547ed7bd9eb73ca78bbc92d26fdfff
diff --git a/dev-python/pylama/pylama-8.3.6.ebuild b/dev-python/pylama/pylama-8.3.6.ebuild
new file mode 100644
index 000000000000..fab10b0885f6
--- /dev/null
+++ b/dev-python/pylama/pylama-8.3.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Code audit tool for python"
+HOMEPAGE="https://github.com/klen/pylama"
+SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+
+RDEPEND="
+ >=dev-python/mccabe-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+ >=dev-python/pydocstyle-6.1.1[${PYTHON_USEDEP}]
+ >=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/eradicate[${PYTHON_USEDEP}]
+ dev-python/mypy[${PYTHON_USEDEP}]
+ dev-python/pylint[${PYTHON_USEDEP}]
+ dev-python/radon[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+ # not packaged
+ tests/test_linters.py::test_quotes
+ tests/test_linters.py::test_vulture
+)
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 95abb68c7aaa..aa7675bf19dc 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,2 +1 @@
-DIST pymdown-extensions-9.0.tar.gz 978665 BLAKE2B 328b36bf34b362ed20b8f52576fb8ea1bbf818e99815c15e0779e38dc560134096bb35ac9a5a4ad11c713921052b0ac0041b0fd2491fc76fcd7cfcbba0760f0a SHA512 813d81900b19e8235e67da362951e3e72f9948751cbe3ee9547e043d535fb8b480f0b65aa811a8b8a67c25509fefef01d3f46b4a1a6af9f00c8be244ad6fb6a9
DIST pymdown-extensions-9.1.tar.gz 1004051 BLAKE2B e6b1ebfbacce8c78c00cffc314244ed4a65a2e63d8270196e1acdd72adc75956e57b00b89ad0e4089cb186d23df390eb00a08b47a0418f4a41147803bed079ce SHA512 ab5b9703096dc95d33469d79eb042e845f1337ac65d951e65e44224190f7feb832049854163dfcb73ee238254e10b831640a1813cafd981368df96b96d3f6752
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild
deleted file mode 100644
index 04d76ca159dd..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
- dev-python/mkdocs-git-revision-date-localized-plugin
- dev-python/mkdocs-minify-plugin
- dev-python/mkdocs-material
- dev-python/pymdown-lexers
- dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
- https://github.com/facelessuser/pymdown-extensions/
- https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
-
-BDEPEND="
- test? (
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # mkdocs-git-revision-date-localized-plugin needs git repo
- if use doc; then
- git init || die
- git config --global user.email "you@example.com" || die
- git config --global user.name "Your Name" || die
- git add . || die
- git commit -m 'init' || die
- fi
-
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild
index 8ed924a3f6a8..04d76ca159dd 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index d732e1280386..6e8c0c9e746e 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,2 +1 @@
-DIST pyproject2setuppy-20.tar.gz 12795 BLAKE2B 14f1862c546d9850f0e523b79c44d49dceab76752c4a0b5527d33b36bbb459735b29ca9fad9d8c72f1be189004014b2ce6b2b6858842263fe913532800398064 SHA512 1d75b908611f121c6723037d0132c890d9d00f3f7b1b237fa658dc8c217a1f60e7141a99a7d744e9b8ff67b5fdef1fd11b38f4a3bda0858a55836ad49211a068
DIST pyproject2setuppy-21.tar.gz 12938 BLAKE2B 09b030e882e7ec66c3d8ad76d486c08b991c7ba725d628101c07475348890a55bc6d6f4ef96f3a9b0f8d40382c026f075aac6dd2fa970fa409c4824b625ba3f1 SHA512 d899bc81f01283dd854fa2c0c5d15e5b77bd273f4269e2dea8612dd41bb4d5404e63e0fc6db5cbefe2a65a69848a3a5c9eae56e93face1736b2e8a0aa39f2193
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
deleted file mode 100644
index d6dcc5868fe8..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
- https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild
index 4428d6f94a11..d6dcc5868fe8 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
index 20a12f123941..4df42d0b5f62 100644
--- a/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
RDEPEND="
dev-python/random2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index ea964ebbd4a0..06e4322f13c3 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,2 +1 @@
-DIST pytest-describe-2.0.0.tar.gz 9711 BLAKE2B d9a799afebf77166c81a9d2477a378d7664e9aa586460043c9a9448838eafebcb0679768d10d2439ab350b48ad7263ebe17eea6fdaef96ef14aceb6aa9ff943c SHA512 28edd2b10607424aff7b95dd834716fc1888a09c23d810e0b9870a5a93de3ca745d3506a6327ece6f92b3afcdcee0fb56f6f163e2868abcf2022175708ff58af
DIST pytest-describe-2.0.1.tar.gz 9793 BLAKE2B e7816cbc68e1ed1e2686ce3437cd0f59a52191d5413dbc9e0d6f9530a57728ad0917d86680b91228aa55ce689bc16c4da83595f87d82f9be9c4ce222c46fefea SHA512 c74362d5f1b0f3ff6d35d9049e82b7dc54be6755f1daa13366c47dee1ab9f1b1085d8c9719952d75c3c6c58b76a2c5f6b0162c78e53da71fe09bd91ed27f6bf2
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
deleted file mode 100644
index 1d2df2e46f29..000000000000
--- a/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Describe-style plugin for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
- https://pypi.org/project/pytest-describe/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
- # We need to disable some plugins because tests don't like unexpected
- # output
- PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
-}
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
index b0f2ea97b6db..1d2df2e46f29 100644
--- a/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index bd151d7bb157..4c8c4f127e9a 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,2 +1,3 @@
DIST python-socks-1.2.4.gh.tar.gz 32192 BLAKE2B fa06f9158348292bef874c81623c11a54556db9c36cd7428d7a835428d152f3a4925d59e14d87518dfaae9e6937324e35db99bb5e1000f29fe9caf11fa2f8318 SHA512 6e70d8d98b2901e97250d30b350002944d979356bb6cd7dd4022af420e166076259a7b1aa4845d771243b18ab3f06ee955f07482c527835bb0135f0622d804be
DIST python-socks-2.0.0.gh.tar.gz 38176 BLAKE2B 84711bd6747dd9ef8d7f47d90e7e1beeb99db7c51a370c01a272789e7d5356cdf3d0e3b1e822e1beb88a29ebbe23acac8f68206cf7a3f8b924f79d3783426f93 SHA512 088a606ca6e13de79cfa8b180d76e91cca129b3e1ffad2243e5924dc10530340924ea815eb9af0e53b5369daa9cf3e66b2f623da6913ed32916b91d24a47c1e4
+DIST python-socks-2.0.1.gh.tar.gz 40710 BLAKE2B 185131be6e2ef85e3d1cb41ff03e57c1d3e8921c04d11df4d3e1d3c7ed6f3cd10459730d0cc5ad63981dcfe0f8cd987f0f287a70f6727727550d63c0ff6040bc SHA512 08afe55b9a5e8d1c0aa5150511e7d3918fd8c6da10bb80037baa4f3c8004fa9e50b30ce7bda26e73f77208b64cb85544029ffd2edf197f6a23614b3c7f56114b
diff --git a/dev-python/python-socks/python-socks-2.0.1.ebuild b/dev-python/python-socks/python-socks-2.0.1.ebuild
new file mode 100644
index 000000000000..94d2cb6ce6da
--- /dev/null
+++ b/dev-python/python-socks/python-socks-2.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
+HOMEPAGE="
+ https://pypi.org/project/python-socks/
+ https://github.com/romis2012/python-socks/"
+SRC_URI="
+ https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# curio is not packaged
+# asyncio is the only backend we have, so dep on its deps unconditionally
+# TODO: revisit
+RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+ ' 'python*')
+ dev-python/async_timeout[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/yarl[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index e379fe32efa5..d583977eaf8c 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1 +1,2 @@
DIST python-utils-2.5.6.tar.gz 14057 BLAKE2B 2f66ab26cd6cda25f73c9f40081048404cde819e3e3c2fd11d134244ab2b80a05ab2b943e56a45bd8656bf3ba231853e3bfa9efbab9cb70515daaec70f6e0715 SHA512 35299880afdecd4a44144b95e6b2073e51680dfd2b00f31fb333d578cfa2c2f8bf5f58128cab88a7b81e658e6d5dca303f1c9f5be3870160679e1defbf94859e
+DIST python-utils-2.6.0.tar.gz 14885 BLAKE2B 089d7a57a8469968bed147a01907f35d1430349130e0f7152bbd38dd65053cf3d6424942eee8cc9006baaec5f13bffcbef81bd8723cad7ee03b1358a5c2d3d27 SHA512 a582558e38342f54f7c1eda1f9038728dd5904729aaec4e5719e56bb447bc6fcb93bf5ea3af134ce245eda059b9be81d15b268165cbc10799ba112fc157f939b
diff --git a/dev-python/python-utils/python-utils-2.6.0.ebuild b/dev-python/python-utils/python-utils-2.6.0.ebuild
new file mode 100644
index 000000000000..ae6983ffe562
--- /dev/null
+++ b/dev-python/python-utils/python-utils-2.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="https://pypi.org/project/python-utils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ sed -i -e '/--cov/d' -e '/--flake8/d' pytest.ini || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 6b22a3992ef2..65f819485dab 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1 +1,2 @@
DIST pythran-0.10.0.gh.tar.gz 3614984 BLAKE2B 82686479d475c6814392eb6c34e2d765ba36c88f9de3119f38c81b3f09d07acce8f5ab11b31114c13a1aa3bebd3699c540edcc6203401a007caf02c960a4733b SHA512 3d48d6f12fcd0317cb756eee18ad359057e4daee1a496023253b26febd2acf0fd22c3b4976bc8552a137d25052e4feaacf1917c5dc84414e9fbed66dff5c1614
+DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1
diff --git a/dev-python/pythran/pythran-0.11.0.ebuild b/dev-python/pythran/pythran-0.11.0.ebuild
new file mode 100644
index 000000000000..2e5c661cd0ed
--- /dev/null
+++ b/dev-python/pythran/pythran-0.11.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Ahead of Time compiler for numeric kernels"
+HOMEPAGE="
+ https://pypi.org/project/pythran/
+ https://github.com/serge-sans-paille/pythran/"
+SRC_URI="
+ https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
+ -> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+ =dev-python/beniget-0.4*[${PYTHON_USEDEP}]
+ =dev-python/gast-0.5*[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ >=dev-python/ply-3.4[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/ipython[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ virtual/cblas
+ )"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.10.0-tests-werror.patch
+)
+
+src_prepare() {
+ sed -i -e '/pytest-runner/d' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local -x COLUMNS=80
+ epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index bb9efa444564..9bcbe1a2a8e8 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -5,3 +5,4 @@ DIST rich-10.15.0.tar.gz 16279650 BLAKE2B c169ca3d9144349770a0baf56d6267d5ac2e85
DIST rich-10.15.1.tar.gz 16279572 BLAKE2B e91a9d168d88c1d8db4b0901809c4da29d32b2dd582b0a7584a2f20cc60ff4418a95e593c9085babb948c0ffb4568da3b752e60d36adfc85ee704d7dd4dfc7e7 SHA512 9544f00eaddbb69cb95a16a0cd780acff38a49cdc6e35217e88ed462333e17b295dc5fdd3bf1ae25ab5e9100804e1d055b0d81bd0bca805e7b433238313f2edd
DIST rich-10.15.2.tar.gz 16282858 BLAKE2B 7fe05eb357e5137319764b0d751c3bc68f8545e391575a9a360b252c395714ecb8ad7b944e7c77e74990413cb6bfb2a6c6db0fb8e72eb098f91c8d5d86bc9f8a SHA512 02e851cc9a72cb62d1826f82a5b8919a8911cf3dbdfe5f5443a89b2b7bc48c575dcf5ba63c17da60cf2ef9de3d036c7b68a845610be72af63d082d487c3b61c2
DIST rich-10.16.0.tar.gz 16280103 BLAKE2B af66398a4bc6e3e5503418721906679dc6f964b6dcbb56195f64d0ef4f504d9e0002f8b727c4fba7b42dda8790a03bb12a85150b99d5294712e38dea2800f841 SHA512 48c9e4d0b733cf79e9bceac284ca3cf37c14f52c0f3590f08acd9b0ea791da0200753f3cbae13a619b9c42fdb1167d55724c80123e2935bf2ed7133a15639ac8
+DIST rich-10.16.1.tar.gz 16280385 BLAKE2B dda2e6a64f9ecfe99fdda3a2e24c6a859e25eca48ebc2af63dbea3c8b90f977e10253721e85b876165c9f51c52ceed057e77b08cf2c77c28de67b8a2c49c4617 SHA512 341aa3fdb7fe608d15c867eb50f36fcc250e041a256e4bee86f0c69e7e0f9239c84be88833dad56f05edeb09a734d64f423b9080bd13b88c3a59d958e8ff1f4c
diff --git a/dev-python/rich/rich-10.16.1.ebuild b/dev-python/rich/rich-10.16.1.ebuild
new file mode 100644
index 000000000000..1b1b101a6a98
--- /dev/null
+++ b/dev-python/rich/rich-10.16.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/commonmark[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+ epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+ optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index f6f3ddbd3664..13064b3ad091 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Sniff out which async library your code is running under"
@@ -20,11 +20,7 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
distutils_enable_tests pytest
-python_test() {
- local deselect=(
- # curio is not packaged
- sniffio/_tests/test_sniffio.py::test_curio
- )
-
- epytest ${deselect[@]/#/--deselect }
-}
+EPYTEST_DESELECT=(
+ # curio is not packaged
+ sniffio/_tests/test_sniffio.py::test_curio
+)
diff --git a/dev-python/spyder/spyder-5.2.1.ebuild b/dev-python/spyder/spyder-5.2.1.ebuild
index a6e35973e667..bb081ed861d5 100644
--- a/dev-python/spyder/spyder-5.2.1.ebuild
+++ b/dev-python/spyder/spyder-5.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit optfeature xdg distutils-r1
diff --git a/dev-python/symengine/symengine-0.8.1.ebuild b/dev-python/symengine/symengine-0.8.1.ebuild
index 0d794b6c2980..faff40aea83c 100644
--- a/dev-python/symengine/symengine-0.8.1.ebuild
+++ b/dev-python/symengine/symengine-0.8.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/sympy/sympy-1.9.ebuild b/dev-python/sympy/sympy-1.9.ebuild
index 2c359581f8c4..4524a6f67278 100644
--- a/dev-python/sympy/sympy-1.9.ebuild
+++ b/dev-python/sympy/sympy-1.9.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 virtualx
diff --git a/dev-python/tempest/tempest-29.2.0.ebuild b/dev-python/tempest/tempest-29.2.0.ebuild
index bf5bd503d06a..3f46371369ef 100644
--- a/dev-python/tempest/tempest-29.2.0.ebuild
+++ b/dev-python/tempest/tempest-29.2.0.ebuild
@@ -36,7 +36,6 @@ RDEPEND="
BDEPEND="
>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
test? (
- dev-python/hacking[${PYTHON_USEDEP}]
>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
dev-python/stestr[${PYTHON_USEDEP}]
)
@@ -51,6 +50,9 @@ src_prepare() {
rm tempest/tests/test_list_tests.py || die
rm tempest/tests/lib/cmd/test_check_uuid.py || die
+ # remove dep on hacking
+ rm tempest/tests/test_hacking.py || die
+
distutils-r1_src_prepare
}
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 46cf9697e0e8..cf8b89888acb 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,2 +1 @@
-DIST toolz-0.11.1.tar.gz 64428 BLAKE2B 934f122bbf9e762e72f502f8b9ba8b5aa946b6e2b758e9501c2bc58fefa3443cda4b3e2c423be221643f51b2a12de0961be835ae3a23e97525fa203c969edff4 SHA512 8bea2b75b74d9da988c777577f3ad574192659dcc4bea54ac6d1400a81bef07818c49c8da40028a8c42905f9ab5b5111c50c239fb56f34c315865f90413af68b
DIST toolz-0.11.2.tar.gz 65928 BLAKE2B 3a2baddae437272e8f3efb665b63df127b3ec6bc2a68f3381651a1a3a3b45e4de6e575a328306fac95e9261228ee91193effd4aeca8d115f1608cb2561d50f13 SHA512 67e8aaea3f9fb8811027f19aa9cf56ab980e4f9cea43978ed9515662c78a7bea12314054b2c26da483b055382d4b080125c011fc43bc48b0965a6ff8415f7168
diff --git a/dev-python/toolz/files/toolz-0.11.1-py310.patch b/dev-python/toolz/files/toolz-0.11.1-py310.patch
deleted file mode 100644
index d926f3457ab1..000000000000
--- a/dev-python/toolz/files/toolz-0.11.1-py310.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From da81b1e8ab96b22ed81e6414099aba066633f3ff Mon Sep 17 00:00:00 2001
-From: Erik Welch
-Date: Thu, 22 Apr 2021 00:20:24 -0500
-Subject: [PATCH] Support Python 3.10 by adding `anext` signature.
-
-Fixes #512
----
- .travis.yml | 3 ++-
- toolz/_signatures.py | 3 +++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/toolz/_signatures.py b/toolz/_signatures.py
-index 328cea91..3ce1616a 100644
---- a/toolz/_signatures.py
-+++ b/toolz/_signatures.py
-@@ -45,6 +45,9 @@
- lambda x: None],
- all=[
- lambda iterable: None],
-+ anext=[
-+ lambda aiterator: None,
-+ lambda aiterator, default: None],
- any=[
- lambda iterable: None],
- apply=[
diff --git a/dev-python/toolz/toolz-0.11.1.ebuild b/dev-python/toolz/toolz-0.11.1.ebuild
deleted file mode 100644
index b2c60d01340c..000000000000
--- a/dev-python/toolz/toolz-0.11.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-python/versioneer[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-py310.patch
-)
diff --git a/dev-python/toolz/toolz-0.11.2.ebuild b/dev-python/toolz/toolz-0.11.2.ebuild
index 64aecfa1bc2d..7adf7182a608 100644
--- a/dev-python/toolz/toolz-0.11.2.ebuild
+++ b/dev-python/toolz/toolz-0.11.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-python/versioneer[${PYTHON_USEDEP}]"
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 2b3bf5f8d207..a76656936b96 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,2 +1 @@
DIST typing-extensions-4.0.0.gh.tar.gz 64263 BLAKE2B c4fe05f5ad32b471d9aff6c792870ce315e52184d4e8c0850fdc1b6e7421bc80566ca2d364764583c3bce76f53018e3ec284ca1866da4fa3f09438c852c89d80 SHA512 eda25164d40c642949c92140678d1ab9ec73fa988c0b9233852207ac2dad05b0390fda8da420c8817bf3816ab33e4540b41766ccd8b9a0b16c857650bc2e3f73
-DIST typing_extensions-3.10.0.2.tar.gz 46048 BLAKE2B a8f7ecacd553ed469cf090f4b8f52e15039fbcf1ae6879f5899fb99e7bbf5b7289cf5d7e5409314a110b2a626b59bd5e6a52f893e4322244c9e7e80ab393d334 SHA512 171ada56758fb04328a2cafefe80b70fbf166f2d799406883df642927964925ca73f04d0646661cd4fd016dfb5e1856b84f362e3b404c27b368ca06a09cf87db
diff --git a/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild b/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
deleted file mode 100644
index ee7910b5b541..000000000000
--- a/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Type Hint extensions from Python 3.8 backported"
-HOMEPAGE="
- https://pypi.org/project/typing-extensions/
- https://github.com/python/typing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_P%-*}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-python_test() {
- cd "${S}"/src_py3 || die
- "${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.0.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.0.0.ebuild
index 9f8f7ab5dcaf..5f5c9eb15f8e 100644
--- a/dev-python/typing-extensions/typing-extensions-4.0.0.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.0.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}/typing_extensions
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
BDEPEND="
>=dev-python/pyproject2setuppy-21[${PYTHON_USEDEP}]"
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 41526044101d..0703cd3d1288 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,2 +1,3 @@
DIST ujson-4.2.0.tar.gz 7129419 BLAKE2B 478ff6a3de9603478e9b747935ebc966f980dc832252974dda444b2ccb53878b3565ebdf7e8c223c687304d5f95607027d0652956d1f804cf2d80df6ce19be1a SHA512 894316eeeafe80eb3328958f4336c1989c9591caf84de5a9442f9d028c85f67d08e7c295e74f5828abc93ad56ffa2d12b98ebe0ecf4bca27ae37642fbffe47e4
DIST ujson-4.3.0.tar.gz 7129405 BLAKE2B 434a686d319415391910c2d8358b97b27221fe8ec725394c066126e9f0b05f8624db6fd2b372add7d3629733f108e8a0d4b840328499aadf43dda3397e07aef9 SHA512 62a84562a95dbbd0825c9c961f8b769c908201c56a1981bb22809f11e7330f68a1c5fa86c182a6c7823a4d780b1afba186b6203be88eb0ec30a4e2f99e51062e
+DIST ujson-5.0.0.tar.gz 7128113 BLAKE2B 9ce58a57d85203f2e20690494ae627b87caf8524781eb07e63b97ecd40dbd7e25bc2e5a217fca738e4b8b2fe5bc9a9e7a7ad032a089bf8e5b5104d1e107671b7 SHA512 cda9b29baf77e5aa0f3adb8ba09445753fc6730eab95a7f483b0c0b0c8bb389d12e438324f63808e5c36815330ce6508a460700882a7661bc3640721a7cc906f
diff --git a/dev-python/ujson/ujson-5.0.0.ebuild b/dev-python/ujson/ujson-5.0.0.ebuild
new file mode 100644
index 000000000000..69e572622f5a
--- /dev/null
+++ b/dev-python/ujson/ujson-5.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.org/project/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/websockets/websockets-10.1.ebuild b/dev-python/websockets/websockets-10.1.ebuild
index 3cecfefe466e..56fdcc373e66 100644
--- a/dev-python/websockets/websockets-10.1.ebuild
+++ b/dev-python/websockets/websockets-10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 hppa ppc ppc64 ~riscv sparc x86"
distutils_enable_tests unittest
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 20a23f2cfde8..6b5886ce9f03 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 9f47af6eeaab..191ec8cebd13 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,2 +1 @@
-DIST qt3d-5.15.2-7edec6e0.tar.gz 86196121 BLAKE2B c6009fa8b94da1a498e14f61680be40cbc5e32e390d89911b5a7b7d19bae7c66e048101e6f3b6c1f7e5cc4e64da7ea801f4bf95c346b35d28a49866d9541e146 SHA512 73941c2052aeb9611cf24bbb7b3ba317e53207c080070bb5d602c9f2725d2ab305674e0f29b737ea62ff7a285b362ec53b3588b31c18635e250bc90081d9b5e7
DIST qt3d-5.15.2-dba14d48.tar.gz 86196833 BLAKE2B b5a2333d890dab3b28d0cd1e47b217ff1bc2f772b3477650263e1754ad4e06a63d026350c5daf07e171bd64e097c847c65a8f5f6a538a8ddc9db20a8df2f7b20 SHA512 eb61c94c5438c9e68253958c0fcc60ec7592916e7fc08f723a4218bc24ce5536b25df5f46c97fd86ed19de2b0851a31779fbfdb7c23c70323338a98bbc77a650
diff --git a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild
deleted file mode 100644
index b621640f9277..000000000000
--- a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=7edec6e014de27b9dd03f63875c471aac606a918
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm64 x86"
-fi
-
-# TODO: tools
-IUSE="gamepad gles2-only qml vulkan"
-
-RDEPEND="
- =dev-qt/qtconcurrent-${QT5_PV}*
- =dev-qt/qtcore-${QT5_PV}*
- =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=]
- =dev-qt/qtnetwork-${QT5_PV}*
- >=media-libs/assimp-4.0.0
- gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* )
- qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
-"
-DEPEND="${RDEPEND}
- vulkan? ( dev-util/vulkan-headers )
-"
-
-src_configure() {
- local myqmakeargs=(
- --
- -system-assimp
- )
- qt5-build_src_configure
-}
-
-src_prepare() {
- rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
- qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
- qt_use_disable_mod qml quick src/src.pro
-
- qt5-build_src_prepare
-}
diff --git a/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild b/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild
index 6332be009912..66f894bf8925 100644
--- a/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="3D rendering module for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 x86"
fi
# TODO: tools
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 6b292bfec0c4..8f45ea5ec73a 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,2 +1 @@
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
new file mode 100644
index 000000000000..cfc187251ccb
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
@@ -0,0 +1,105 @@
+From 463c338b09710609e0dc82f67e03c829a7b83788 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen
+Date: Fri, 14 May 2021 10:43:11 +0200
+Subject: [PATCH] Avoid mixing atomic futex changes and QAtomic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Either the mix of futex and atomic, or the mix of 32-bit futex and
+64-bit atomic doesn't work. In any case, the existing code leads to
+bad behavior.
+
+* asturm 2021-11-19: Also threw the typo fix from 587e3bb0 into the mix.
+
+Pick-to: 6.1 5.15
+Fixes: QTBUG-92188
+Change-Id: Icc6ba28d6e2465c373d00e84f4da2b92c037e797
+Reviewed-by: Qt CI Bot
+Reviewed-by: Mårten Nordheim
+(cherry picked from commit 2d9cc639a4a7a5e97979a6034364bd67dfa10c23)
+---
+ src/corelib/thread/qsemaphore.cpp | 46 ++++++++++++-------------------
+ 1 file changed, 17 insertions(+), 29 deletions(-)
+
+diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
+index d4fb756b94..1d01fc1b28 100644
+--- a/src/corelib/thread/qsemaphore.cpp
++++ b/src/corelib/thread/qsemaphore.cpp
+@@ -357,47 +357,31 @@ void QSemaphore::release(int n)
+ quintptr prevValue = u.fetchAndAddRelease(nn);
+ if (futexNeedsWake(prevValue)) {
+ #ifdef FUTEX_OP
+- if (!futexHasWaiterCount) {
+- /*
+- On 32-bit systems, all waiters are waiting on the same address,
+- so we'll wake them all and ask the kernel to clear the high bit.
+-
+- atomic {
+- int oldval = u;
+- u = oldval & ~(1 << 31);
+- futexWake(u, INT_MAX);
+- if (oldval == 0) // impossible condition
+- futexWake(u, INT_MAX);
+- }
+- */
+- quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
+- quint32 oparg = 31;
+- quint32 cmp = FUTEX_OP_CMP_EQ;
+- quint32 cmparg = 0;
+- futexWakeOp(u, INT_MAX, INT_MAX, u, FUTEX_OP(op, oparg, cmp, cmparg));
+- } else {
++ if (futexHasWaiterCount) {
+ /*
+ On 64-bit systems, the single-token waiters wait on the low half
+ and the multi-token waiters wait on the upper half. So we ask
+ the kernel to wake up n single-token waiters and all multi-token
+- waiters (if any), then clear the multi-token wait bit.
++ waiters (if any), and clear the multi-token wait bit.
+
+ atomic {
+ int oldval = *upper;
+- *upper = oldval & ~(1 << 31);
++ *upper = oldval | 0;
+ futexWake(lower, n);
+- if (oldval < 0) // sign bit set
++ if (oldval != 0) // always true
+ futexWake(upper, INT_MAX);
+ }
+ */
+- quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
+- quint32 oparg = 31;
+- quint32 cmp = FUTEX_OP_CMP_LT;
++ quint32 op = FUTEX_OP_OR;
++ quint32 oparg = 0;
++ quint32 cmp = FUTEX_OP_CMP_NE;
+ quint32 cmparg = 0;
++ u.fetchAndAndRelease(futexNeedsWakeAllBit - 1);
+ futexWakeOp(*futexLow32(&u), n, INT_MAX, *futexHigh32(&u), FUTEX_OP(op, oparg, cmp, cmparg));
++ return;
+ }
+-#else
+- // Unset the bit and wake everyone. There are two possibibilies
++#endif
++ // Unset the bit and wake everyone. There are two possibilities
+ // under which a thread can set the bit between the AND and the
+ // futexWake:
+ // 1) it did see the new counter value, but it wasn't enough for
+@@ -405,8 +389,12 @@ void QSemaphore::release(int n)
+ // 2) it did not see the new counter value, in which case its
+ // futexWait will fail.
+ u.fetchAndAndRelease(futexNeedsWakeAllBit - 1);
+- futexWakeAll(u);
+-#endif
++ if (futexHasWaiterCount) {
++ futexWakeAll(*futexLow32(&u));
++ futexWakeAll(*futexHigh32(&u));
++ } else {
++ futexWakeAll(u);
++ }
+ }
+ return;
+ }
+--
+2.34.0
+
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
index 23c3a8a4ba45..4fa3eccb6511 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r12.ebuild
similarity index 89%
rename from dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
rename to dev-qt/qtcore/qtcore-5.15.2-r12.ebuild
index ee99b42e8112..005fd2c6c0fd 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r12.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
+KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
QT5_MODULE="qtbase"
inherit linux-info qt5-build
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
@@ -48,6 +48,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=(
"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
+ # See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/81
+ "${FILESDIR}"/${P}-fix-stack-smashing.patch # bug 824286, KDE-bug 445719
)
pkg_pretend() {
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index cbcb51747272..f573e7b4954d 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,2 +1 @@
-DIST qtdeclarative-5.15.2-1c33a9d0.tar.gz 24342460 BLAKE2B f83d01c9bd28842f53b5bf9e95d1b83738792ae6969309ef702fef2e943a4e886313445c7332a2a5cb72cd99aa5db7520a04a054b16d8065bc03b95cbe14026d SHA512 a1b6ae66c83cc7385c51845f1cbafb55cadd69c121196cd138abc92e964d0bb594ce20267244e4202a9108d92b9bf0f107536774f2a76da71b434692559c1fb4
DIST qtdeclarative-5.15.2-7024ac83.tar.gz 24346858 BLAKE2B 75a6a36fcf39bdf38292af1fe10b0f5bf3e72b39c8403fdbfed9c0c0a739919d93592157cf8d8f33523e8db52662f1f7d63209d173730b4c06045e9c1f0a4563 SHA512 8be70e68abd035a43ecfab7a1e23969428abf9425558875b8ee5e24a45a563afbef30d0852b495ab918b22118fa88877bb6d390cf90a928b02c96ee1e77f2331
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
deleted file mode 100644
index 7987361ecfdd..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=1c33a9d045897ce755a818ebff7ddecae97885d3
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
- =dev-qt/qtcore-${QT5_PV}*
- =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
- =dev-qt/qtnetwork-${QT5_PV}*
- =dev-qt/qttest-${QT5_PV}*
- media-libs/libglvnd
- localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
- widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
- "${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
-)
-
-src_prepare() {
- use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" )
-
- qt_use_disable_mod localstorage sql \
- src/imports/imports.pro
-
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- src/qmltest/qmltest.pro \
- tests/auto/auto.pro \
- tools/tools.pro \
- tools/qmlscene/qmlscene.pro \
- tools/qml/qml.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myqmakeargs=(
- --
- -qml-debug
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r14.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r14.ebuild
index 6be68e14bab7..788b279ea93b 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r14.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r14.ebuild
@@ -10,7 +10,7 @@ inherit python-any-r1 qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="gles2-only +jit localstorage vulkan +widgets"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 6b292bfec0c4..8f45ea5ec73a 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,2 +1 @@
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
deleted file mode 100644
index f7f9b5e7c58a..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
- +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
- || ( eglfs X )
- accessibility? ( dbus X )
- eglfs? ( egl )
- ibus? ( dbus )
- libinput? ( udev )
- X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
- dev-libs/glib:2
- =dev-qt/qtcore-${QT5_PV}*:5=
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- >=media-libs/freetype-2.6.1:2
- >=media-libs/harfbuzz-1.6.0:=
- media-libs/libglvnd
- sys-libs/zlib:=
- dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
- eglfs? (
- media-libs/mesa[gbm]
- x11-libs/libdrm
- )
- evdev? ( sys-libs/mtdev )
- jpeg? ( virtual/jpeg:0 )
- libinput? (
- dev-libs/libinput:=
- >=x11-libs/libxkbcommon-0.5.0
- )
- png? ( media-libs/libpng:0= )
- tslib? ( >=x11-libs/tslib-1.21 )
- tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
- udev? ( virtual/libudev:= )
- vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libxcb-1.12:=[xkb]
- >=x11-libs/libxkbcommon-0.5.0[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
-"
-DEPEND="${RDEPEND}
- evdev? ( sys-kernel/linux-headers )
- udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
- ibus? ( app-i18n/ibus )
- wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/tools/qvkgen
- src/gui
- src/openglextensions
- src/platformheaders
- src/platformsupport
- src/plugins/generic
- src/plugins/imageformats
- src/plugins/platforms
- src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
- accessibility:accessibility-atspi-bridge
- egl:egl:
- eglfs:eglfs:
- eglfs:eglfs_egldevice:
- eglfs:eglfs_gbm:
- evdev:evdev:
- evdev:mtdev:
- :fontconfig:
- :system-freetype:FREETYPE
- !:no-freetype:
- !gif:no-gif:
- gles2-only::OPENGL_ES
- gles2-only:opengles2:OPENGL_ES_2
- !:no-gui:
- :system-harfbuzz:
- !:no-harfbuzz:
- jpeg:system-jpeg:IMAGEFORMAT_JPEG
- !jpeg:no-jpeg:
- libinput
- libinput:xkbcommon:
- :opengl
- png:png:
- png:system-png:IMAGEFORMAT_PNG
- !png:no-png:
- tslib:tslib:
- udev:libudev:
- vulkan:vulkan:
- X:xcb:
- X:xcb-glx:
- X:xcb-plugin:
- X:xcb-render:
- X:xcb-sm:
- X:xcb-xlib:
- X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :gui
-)
-
-PATCHES=(
- "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
- "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-)
-
-src_prepare() {
- # don't add -O3 to CXXFLAGS, bug 549140
- sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
- # egl_x11 is activated when both egl and X are enabled
- use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
- qt_use_disable_config dbus dbus \
- src/platformsupport/themes/genericunix/genericunix.pri
-
- qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
- qt_use_disable_mod ibus dbus \
- src/plugins/platforminputcontexts/platforminputcontexts.pro
-
- use vnc || sed -i -e '/SUBDIRS += vnc/d' \
- src/plugins/platforms/platforms.pro || die
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myconf=(
- $(usev dbus -dbus-linked)
- $(qt_use egl)
- $(qt_use eglfs)
- $(usev eglfs '-gbm -kms')
- $(qt_use evdev)
- $(qt_use evdev mtdev)
- -fontconfig
- -system-freetype
- $(usev !gif -no-gif)
- -gui
- -system-harfbuzz
- $(qt_use jpeg libjpeg system)
- $(qt_use libinput)
- $(qt_use linuxfb)
- -opengl $(usex gles2-only es2 desktop)
- $(qt_use png libpng system)
- $(qt_use tslib)
- $(qt_use udev libudev)
- $(qt_use vulkan)
- $(qt_use X xcb)
- $(usev X '-xcb-xlib')
- )
- if use libinput || use X; then
- myconf+=( -xkbcommon )
- fi
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
index 55ee933198ba..5b9c23c319a7 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
SLOT=5/${QT5_PV} # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index a1529a4a4793..6b292bfec0c4 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,3 +1,2 @@
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-c9fde86b.tar.gz 67960262 BLAKE2B d1a6a7dac78abce189a753c0a00185fbe03f9de97b226790535af73a9bc009b353fe1edeb754d2098a7beeb7cd1c6e7efb949797658269ef0d0f200f11909820 SHA512 99026537dd4da678bcb04214ebb717907422e373b44fd3b3716798565c330f8d492ec1fc67d936c5125292b30e44f23abe4bf6434b58b9fa76bada3680dfc9f8
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r12.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r12.ebuild
deleted file mode 100644
index 0577a30d5535..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r12.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
- =dev-qt/qtcore-${QT5_PV}*:5=
- sys-libs/zlib:=
- connman? ( =dev-qt/qtdbus-${QT5_PV}* )
- gssapi? ( virtual/krb5 )
- libproxy? ( net-libs/libproxy )
- networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] )
-"
-RDEPEND="${DEPEND}
- connman? ( net-misc/connman )
- networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/network
- src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
- libproxy:libproxy:
- ssl::SSL
- ssl::OPENSSL
- ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :network
-)
-
-pkg_setup() {
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
- use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
- local myconf=(
- $(usev connman -dbus-linked)
- $(qt_use gssapi feature-gssapi)
- $(qt_use libproxy)
- $(usev networkmanager -dbus-linked)
- $(qt_use sctp)
- $(usev ssl -openssl-linked)
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- # workaround for bug 652650
- if use ssl; then
- sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
- -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
- fi
-}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild
index 07543eea5ce1..575e3e914b94 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
DESCRIPTION="Network abstraction library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 6b292bfec0c4..8f45ea5ec73a 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,2 +1 @@
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
deleted file mode 100644
index 39e464926b22..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
- =dev-qt/qtcore-${QT5_PV}*:5=
- =dev-qt/qtgui-${QT5_PV}*[gles2-only=]
- =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
- cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
- test? ( =dev-qt/qtnetwork-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/printsupport
- src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
- cups
-)
-
-src_configure() {
- local myconf=(
- $(qt_use cups)
- -opengl $(usex gles2-only es2 desktop)
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.ebuild
index f51b01f30fc8..e121579bf860 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Printing support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="cups gles2-only"
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 6b292bfec0c4..8f45ea5ec73a 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,2 +1 @@
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
deleted file mode 100644
index 7d2229ef0738..000000000000
--- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
- || ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
- =dev-qt/qtcore-${QT5_PV}*:5=
- freetds? ( dev-db/freetds )
- mysql? ( dev-db/mysql-connector-c:= )
- oci8? ( dev-db/oracle-instantclient:=[sdk] )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/sql
- src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :sql
-)
-
-src_configure() {
- local myconf=(
- $(qt_use freetds sql-tds plugin)
- $(qt_use mysql sql-mysql plugin)
- $(qt_use oci8 sql-oci plugin)
- $(qt_use odbc sql-odbc plugin)
- $(qt_use postgres sql-psql plugin)
- $(qt_use sqlite sql-sqlite plugin)
- $(usev sqlite -system-sqlite)
- )
-
- use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild
index 6292bfceb63e..c20f4081db7e 100644
--- a/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
SLOT=5/${QT5_PV} # bug 639140
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index a5b8f503a5b2..07572d3e1deb 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,2 +1 @@
DIST qtsvg-5.15.2-24128cdf.tar.gz 2779708 BLAKE2B 5e52a0b1c7b3e21ab58b2e6e091c8fc85d5432e247313f74bd8c4d8899cd2634e3242d5d328174d3702544d050504dd3870c1c075a2b7a87c268c371c95b0c76 SHA512 c0840608ff66b0f335f8e5d883a5f8c113de91608ea8b613743c4881a103ff1c9981337c29a0e272ca2bccd4077df9cd8fde320e09eec1e8f6a3eead5cb75198
-DIST qtsvg-5.15.2-cfc61697.tar.gz 2779382 BLAKE2B cd75575741b05cb1ec1b206d1d338c011c718923339d1cb169f0f537f21931e32042f10574e70b5c64d4fc352dfa56adc8b852dafa5131198630afe6bb806580 SHA512 1f8b52c713b4c6d4974af46ebe6519ea597f72ac0c4b80e061f714ff30449e6fdae94eb9705f3c1b857c5ad0647e5875260ee40051cec78321caf7b944fd3d70
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
deleted file mode 100644
index 63798ecf7608..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=cfc616978b52a396b2ef6900546f7fc086d7cab3
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
- =dev-qt/qtcore-${QT5_PV}*
- =dev-qt/qtgui-${QT5_PV}*
- =dev-qt/qtwidgets-${QT5_PV}*
- sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
- test? ( =dev-qt/qtxml-${QT5_PV}* )
-"
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild
index 720674fb4922..289b1f29f642 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="SVG rendering library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE=""
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index afef59a02c36..18076e21b623 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,2 +1 @@
DIST qtwayland-5.15.2-eb422ab5.tar.gz 829140 BLAKE2B e913e481741b23873a88db32896c7f3445a2ddee2dc9cfdf8e132fdd79021de369506e32ce9ed50977fb1c42d624169b7d67c9247f7609276e699e5ab3a9462e SHA512 b5094b00feab5909b4de6382a3633fc321d5f5fbc34e4cbde1f364123b24990df95cef5c34a90f73dca67b0578e0da71b894f771ebbd8d152dcdc71b114d9773
-DIST qtwayland-5.15.2-efe6edca.tar.gz 829293 BLAKE2B 6ccc5a4e111818cc65855eb4570727f30932bec9a749069550d07332df719eaeec0baf472c025150a32c9c380294f5e9496ad3babd181887a02fc37d1bfd5f2a SHA512 87190cd1ade57c98da972a2f5d48aa0376ccc4bfa589f5832b8a62a63b3eafa6acf88d812ae98c484d4b02878ae2c1986c3759c0ba3f46894c76af713d7b8346
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild
deleted file mode 100644
index 3fa36666cf6f..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=efe6edcaf8eba601dff99ec6ad4457c8a4442f86
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-SLOT=5/${QT5_PV} # bug 815646
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
- dev-libs/wayland
- =dev-qt/qtcore-${QT5_PV}*:5=
- =dev-qt/qtdeclarative-${QT5_PV}*:5=
- =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
- media-libs/libglvnd
- >=x11-libs/libxkbcommon-0.2.0
- vulkan? ( dev-util/vulkan-headers )
- X? (
- =dev-qt/qtgui-${QT5_PV}*[-gles2-only]
- x11-libs/libX11
- x11-libs/libXcomposite
- )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local myqmakeargs=(
- --
- $(qt_use vulkan feature-wayland-vulkan-server-buffer)
- $(qt_use X feature-xcomposite-egl)
- $(qt_use X feature-xcomposite-glx)
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild
index 60bd8391f0d6..cb1a79288c53 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wayland platform plugin for Qt"
SLOT=5/${QT5_PV} # bug 815646
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="vulkan X"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 6b292bfec0c4..8f45ea5ec73a 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,2 +1 @@
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
deleted file mode 100644
index 90eb44f61245..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="dbus gles2-only gtk +png +X"
-
-REQUIRED_USE="gtk? ( dbus )"
-
-DEPEND="
- =dev-qt/qtcore-${QT5_PV}*:5=
- =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
- dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
- gtk? (
- dev-libs/glib:2
- =dev-qt/qtgui-${QT5_PV}*:5=[dbus]
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/tools/uic
- src/widgets
- src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
- dbus:xdgdesktopportal:
- gtk:gtk3:
- ::widgets
- !:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :widgets
-)
-
-src_configure() {
- local myconf=(
- -opengl $(usex gles2-only es2 desktop)
- $(qt_use dbus)
- $(qt_use gtk)
- -gui
- $(qt_use png libpng system)
- -widgets
- $(qt_use X xcb)
- $(usev X '-xcb-xlib -xkbcommon')
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
index ff4c50d0bd43..f2855eb3220b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
# keep IUSE defaults in sync with qtgui
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index dc4b3f430093..fbc1c4502d54 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 680066a88799..da694f6ceab9 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.4.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.4.ebuild
new file mode 100644
index 000000000000..ce35cc0e8d46
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.0.4.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}:*
+ dev-ruby/nio4r:2
+ >=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/railties-4.2.0
+ dev-ruby/test-unit:2
+ >=dev-ruby/mocha-0.14.0:0.14
+ )"
diff --git a/dev-ruby/actioncable/actioncable-6.1.4.4.ebuild b/dev-ruby/actioncable/actioncable-6.1.4.4.ebuild
new file mode 100644
index 000000000000..619cfd216a8b
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.1.4.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}:*
+ ~dev-ruby/activesupport-${PV}:*
+ dev-ruby/nio4r:2
+ >=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/railties-4.2.0
+ dev-ruby/test-unit:2
+ >=dev-ruby/mocha-0.14.0:0.14
+ )"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index e69ae3f3fb9f..7806cbd4abf7 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,4 +1,6 @@
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild
new file mode 100644
index 000000000000..c4b746bc96a1
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activejob-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+ sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.4.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.4.4.ebuild
new file mode 100644
index 000000000000..71c67a36d450
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.4.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activejob-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/mocha
+ dev-ruby/sqlite3
+ dev-ruby/webmock
+)"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|rexml\)/ s:^:#:" \
+ -e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+ -i ../Gemfile || die
+ rm ../Gemfile.lock || die
+ sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 680066a88799..da694f6ceab9 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild
new file mode 100644
index 000000000000..5c5d6a444fcc
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/actionview-${PV}
+ ~dev-ruby/activejob-${PV}
+ >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+ dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+ dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+ sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+ sed -i -e '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
+
+ # Avoid a test failing only on attachment ordering, since this is a
+ # security release.
+ sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.4.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.4.4.ebuild
new file mode 100644
index 000000000000..847ea3753e4b
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.1.4.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/actionview-${PV}
+ ~dev-ruby/activejob-${PV}
+ >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+ dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+ dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+ sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+ # Avoid a test failing only on attachment ordering, since this is a
+ # security release.
+ sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 680066a88799..da694f6ceab9 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.4.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.4.ebuild
new file mode 100644
index 000000000000..ac4da8e160c5
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.0.4.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/rack:2.2
+ >=dev-ruby/rack-test-0.6.3:*
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha:0.14
+ dev-ruby/bundler
+ >=dev-ruby/capybara-3.35.0
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/rack-cache-1.2:1.2
+ www-servers/puma
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Use different timezone notation, this changed at some point due to an external dependency changing.
+ sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+ # Avoid tests that depend on an old dependency
+ rm -f test/dispatch/system_testing/driver_test.rb
+
+ sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-6.1.4.4.ebuild b/dev-ruby/actionpack/actionpack-6.1.4.4.ebuild
new file mode 100644
index 000000000000..e5771567378e
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.1.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/rack:2.2
+ >=dev-ruby/rack-test-0.6.3:*
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha:0.14
+ dev-ruby/bundler
+ >=dev-ruby/capybara-2.15
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/rack-cache-1.2:1.2
+ www-servers/puma
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Use different timezone notation, this changed at some point due to an external dependency changing.
+ sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+ # Avoid tests depending on an unreleased version of selenium-webdriver
+ sed -i -e '/define extra capabilities/,/^ end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index e69ae3f3fb9f..7806cbd4abf7 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,4 +1,6 @@
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.4.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.4.ebuild
new file mode 100644
index 000000000000..6578fa8e6b1a
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.0.4.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actiontext/actiontext-6.1.4.4.ebuild b/dev-ruby/actiontext/actiontext-6.1.4.4.ebuild
new file mode 100644
index 000000000000..2f8569204837
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.1.4.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+ -i ../Gemfile || die
+ rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+ sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 680066a88799..da694f6ceab9 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/actionview/actionview-6.0.4.4.ebuild b/dev-ruby/actionview/actionview-6.0.4.4.ebuild
new file mode 100644
index 000000000000..8e0441011e0a
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.0.4.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+ >=dev-ruby/erubi-1.4:0
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/railties-${PV}
+ dev-ruby/sqlite3
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Avoid tests failing due to missing logger setup in activerecord,
+ # most likely related to test environment setup.
+ #rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+ # Fix loading of activerecord integration tests. This avoids loading
+ # activerecord twice and thus redefining constants leading to
+ # failures. Bug #719342
+ sed -e '/abstract_unit/arequire "active_record/fixtures"' \
+ -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+ -i test/active_record_unit.rb || die
+
+ sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-6.1.4.4.ebuild b/dev-ruby/actionview/actionview-6.1.4.4.ebuild
new file mode 100644
index 000000000000..bdb512619eb3
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.1.4.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+ >=dev-ruby/erubi-1.4:0
+ >=dev-ruby/rails-html-sanitizer-1.2.0:1
+ dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/railties-${PV}
+ dev-ruby/sqlite3
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Avoid tests failing due to missing logger setup in activerecord,
+ # most likely related to test environment setup.
+ #rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+ # Fix loading of activerecord integration tests. This avoids loading
+ # activerecord twice and thus redefining constants leading to
+ # failures. Bug #719342
+ sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
+ -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+ -i test/active_record_unit.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 680066a88799..da694f6ceab9 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/activejob/activejob-6.0.4.4.ebuild b/dev-ruby/activejob/activejob-6.0.4.4.ebuild
new file mode 100644
index 000000000000..095ae13c2e50
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.0.4.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+ sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
+
+ # Remove all currently unpackaged queues.
+ sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+ -e 's/delayed_job//' Rakefile || die
+ sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}
diff --git a/dev-ruby/activejob/activejob-6.1.4.4.ebuild b/dev-ruby/activejob/activejob-6.1.4.4.ebuild
new file mode 100644
index 000000000000..ba8c187622d6
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.1.4.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ >=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+ # Remove all currently unpackaged queues.
+ sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+ -e 's/delayed_job//' Rakefile || die
+ sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 680066a88799..da694f6ceab9 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.4.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.4.ebuild
new file mode 100644
index 000000000000..922d14dbfa67
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.0.4.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ dev-ruby/test-unit:2
+ dev-ruby/mocha
+ >=dev-ruby/bcrypt-ruby-3.1.7
+ )"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild b/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild
new file mode 100644
index 000000000000..f41ffdd4078a
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ dev-ruby/test-unit:2
+ dev-ruby/mocha
+ >=dev-ruby/bcrypt-ruby-3.1.7
+ )"
+
+all_ruby_prepare() {
+ # Set test environment to our hand.
+ sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 680066a88799..da694f6ceab9 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.4.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.4.ebuild
new file mode 100644
index 000000000000..8c20ff15ef51
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.0.4.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+ ~dev-ruby/activemodel-${PV}
+ sqlite? ( >=dev-ruby/sqlite3-1.4 )
+ mysql? ( dev-ruby/mysql2:0.5 )
+ postgres? ( dev-ruby/pg:1 )"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/bundler
+ ~dev-ruby/actionpack-${PV}
+ >=dev-ruby/sqlite3-1.4.0
+ dev-ruby/mocha
+ dev-ruby/minitest:5
+ )"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ rm ../Gemfile.lock || die
+ sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+ sed -e '/bcrypt/ s/3.0.0/3.0/' \
+ -i ../Gemfile || die
+
+ # Add back json in the Gemfile because we dropped some dependencies
+ # earlier that implicitly required it.
+ sed -i -e '$agem "json"' ../Gemfile || die
+
+ sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"' test/cases/helper.rb || die
+
+ # Avoid test depending on mysql adapter which we don't support for
+ # this Rails version to simplify our dependencies.
+ rm test/cases/connection_specification/resolver_test.rb || die
+
+ # Avoid single tests using mysql or postgres dependencies.
+ rm test/cases/invalid_connection_test.rb || die
+ sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+ -i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+ # Avoid failing test that makes bad assumptions on database state.
+ sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
+ test/cases/associations/has_many_associations_test.rb
+
+ # Avoid test failing to bind limit length in favor of security release
+ sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+ # Avoid test failing related to rubygems
+ sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+ if use sqlite; then
+ ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+ fi
+}
diff --git a/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild b/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild
new file mode 100644
index 000000000000..ba0d4e0cb302
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+ ~dev-ruby/activemodel-${PV}
+ sqlite? ( >=dev-ruby/sqlite3-1.4 )
+ mysql? ( dev-ruby/mysql2:0.5 )
+ postgres? ( >=dev-ruby/pg-1.1:1 )"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/bundler
+ ~dev-ruby/actionpack-${PV}
+ >=dev-ruby/sqlite3-1.4.0
+ dev-ruby/mocha
+ dev-ruby/minitest:5
+ )"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ rm ../Gemfile.lock || die
+ sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+ sed -e '/bcrypt/ s/3.0.0/3.0/' \
+ -i ../Gemfile || die
+ sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
+
+ # Add back json in the Gemfile because we dropped some dependencies
+ # earlier that implicitly required it.
+ sed -i -e '$agem "json"' ../Gemfile || die
+
+ # Avoid single tests using mysql or postgres dependencies.
+ rm test/cases/invalid_connection_test.rb || die
+ sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+ -i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
+
+ # Avoid failing test that makes bad assumptions on database state.
+ sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
+ test/cases/associations/has_many_associations_test.rb
+
+ # Avoid test failing to bind limit length in favor of security release
+ sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+ # Avoid test failing related to rubygems
+ sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+ if use sqlite; then
+ ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+ fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 680066a88799..da694f6ceab9 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.4.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.4.ebuild
new file mode 100644
index 000000000000..4f45ca8b516b
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.0.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}:*
+ ~dev-ruby/activerecord-${PV}:*
+ dev-ruby/marcel:1.0
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/image_processing-1.2:0
+ dev-ruby/test-unit:2
+ dev-ruby/mini_magick
+ dev-ruby/mocha
+ dev-ruby/rake
+ dev-ruby/sqlite3
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+ -e '/dalli/ s/2.7.7/2.7.9/' \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/:test/,/^end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Skip test that has already been updated in later versions upstream
+ sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
+}
diff --git a/dev-ruby/activestorage/activestorage-6.1.4.4.ebuild b/dev-ruby/activestorage/activestorage-6.1.4.4.ebuild
new file mode 100644
index 000000000000..97d4734e1c15
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.1.4.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+ ~dev-ruby/actionpack-${PV}:*
+ ~dev-ruby/activejob-${PV}:*
+ ~dev-ruby/activerecord-${PV}:*
+ ~dev-ruby/activesupport-${PV}:*
+ dev-ruby/marcel:1.0
+ >=dev-ruby/mini_mime-1.1.0
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/image_processing-1.2:0
+ dev-ruby/test-unit:2
+ dev-ruby/mini_magick
+ dev-ruby/mocha
+ dev-ruby/rake
+ dev-ruby/sqlite3
+ )"
+
+all_ruby_prepare() {
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+ -e '/dalli/ s/2.7.7/2.7.9/' \
+ -e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+ -i ../Gemfile || die
+ rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 680066a88799..fa69c7d46972 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,5 +1,8 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
+DIST rails-7.0.0.tgz 11055620 BLAKE2B 5e85d60d45582aa4ff59f417a92611999c27115a2b568bf9baad089e983d96b7721e38123f85715b872b98074139b4a7ef0a6f74024b439792d70a5f40a4cd98 SHA512 dbe84e88abb577797c4f18d8062a8b3a4ecb8c6d8deaf29b50ccee9304e5852161b1628cf5e3d22ef69595791b791ab03536757aed7832a68615874047df86fd
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.4.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.4.ebuild
new file mode 100644
index 000000000000..2172557e84f9
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.0.4.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ >=dev-ruby/concurrent-ruby-1.0.2:1
+ dev-ruby/i18n:1
+ >=dev-ruby/tzinfo-1.1:1
+ >=dev-ruby/minitest-5.1:5
+ >=dev-ruby/zeitwerk-2.2:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+ >=dev-ruby/dalli-2.2.1
+ >=dev-ruby/nokogiri-1.4.5
+ >=dev-ruby/builder-3.1.0
+ >=dev-ruby/listen-3.0.5:3
+ dev-ruby/rack
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set the secure permissions that tests expect.
+ chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+ -e '/:job/,/end/ s:^:#:' \
+ -e '/group :doc/,/^end/ s:^:#:' \
+ -e 's/gemspec/gemspec path: "activesupport"/' \
+ -e '5igem "builder"; gem "rack"' ../Gemfile || die
+ rm ../Gemfile.lock || die
+ sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+ # Avoid test that depends on timezone
+ sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+ # Avoid tests that seem to trigger race conditions.
+ rm -f test/evented_file_update_checker_test.rb || die
+
+ # Avoid test that generates filename that is too long
+ sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+ # Avoid tests requiring a live redis running
+ rm -f test/cache/stores/redis_cache_store_test.rb || die
+ sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+ sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-6.1.4.4.ebuild b/dev-ruby/activesupport/activesupport-6.1.4.4.ebuild
new file mode 100644
index 000000000000..c6f8f6598edb
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.1.4.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ >=dev-ruby/concurrent-ruby-1.0.2:1
+ >=dev-ruby/i18n-1.6:1
+ dev-ruby/tzinfo:2
+ >=dev-ruby/minitest-5.1:5
+ >=dev-ruby/zeitwerk-2.3:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+ >=dev-ruby/dalli-2.2.1
+ dev-ruby/connection_pool
+ >=dev-ruby/nokogiri-1.8.1
+ >=dev-ruby/builder-3.1.0
+ >=dev-ruby/listen-3.3:3
+ dev-ruby/rack
+ dev-ruby/rexml
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set the secure permissions that tests expect.
+ chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
+ -e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
+ -e 's/gemspec/gemspec path: "activesupport"/' \
+ -e '5igem "builder"; gem "rack"' ../Gemfile || die
+ rm ../Gemfile.lock || die
+# sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+ # Avoid test that depends on timezone
+ sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+ # Avoid tests that seem to trigger race conditions.
+ rm -f test/evented_file_update_checker_test.rb || die
+
+ # Avoid test that generates filename that is too long
+ sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+ # Avoid tests requiring a live redis running
+ rm -f test/cache/stores/redis_cache_store_test.rb || die
+ sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+ sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-7.0.0.ebuild b/dev-ruby/activesupport/activesupport-7.0.0.ebuild
new file mode 100644
index 000000000000..2aa0024044f4
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+ >=dev-ruby/concurrent-ruby-1.0.2:1
+ >=dev-ruby/i18n-1.6:1
+ dev-ruby/tzinfo:2
+ >=dev-ruby/minitest-5.1:5
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+ >=dev-ruby/dalli-3.0.1
+ dev-ruby/connection_pool
+ >=dev-ruby/nokogiri-1.8.1
+ >=dev-ruby/builder-3.1.0
+ >=dev-ruby/listen-3.3:3
+ dev-ruby/rack
+ dev-ruby/rexml
+ dev-ruby/mocha
+ )"
+
+all_ruby_prepare() {
+ # Set the secure permissions that tests expect.
+ chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+ # Remove items from the common Gemfile that we don't need for this
+ # test run. This also requires handling some gemspecs.
+ sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
+ -e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+ -e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
+ -e 's/gemspec/gemspec path: "activesupport"/' \
+ -e '5igem "builder"; gem "rack"' ../Gemfile || die
+ rm ../Gemfile.lock || die
+
+ # Avoid test that depends on timezone
+ sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+ # Avoid tests that seem to trigger race conditions.
+ rm -f test/evented_file_update_checker_test.rb || die
+
+ # Avoid test that generates filename that is too long
+ sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+ # Avoid tests requiring a live redis running
+ rm -f test/cache/stores/redis_cache_store_test.rb || die
+ sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+ sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
deleted file mode 100644
index 9b5790032cb5..000000000000
--- a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_GEMSPEC="duktape.gemspec"
-RUBY_FAKEGEM_NAME="duktape"
-
-inherit ruby-fakegem
-
-MY_PN=${PN/-/\.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Ruby bindings to the Duktape JavaScript interpeter"
-HOMEPAGE="https://github.com/judofyr/duktape.rb"
-SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~riscv"
-
-COMMON_DEPEND="dev-lang/duktape:="
-DEPEND+="${COMMON_DEPEND}"
-RDEPEND+="${COMMON_DEPEND}"
-
-ruby_add_bdepend "
- dev-ruby/pkg-config
- dev-ruby/rake-compiler
- dev-ruby/sdoc
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.0.0_duktape-2.5.0-tests.patch
- "${FILESDIR}"/${PN}-2.3.0.0_use-system-duktape.patch
-)
-
-RUBY_S=${MY_P}
-
-all_ruby_prepare() {
- rm ext/duktape/duktape.{c,h} ext/duktape/duk_config.h || die "Failed to remove bundled duktape"
-}
-
-each_ruby_configure() {
- ${RUBY} -C ext/duktape extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
- ${RUBY} -S rake compile
-}
diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild
index e3a343028a31..a9b26614da2f 100644
--- a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild
+++ b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv"
+KEYWORDS="~amd64 ppc ~riscv"
COMMON_DEPEND="dev-lang/duktape:="
DEPEND+="${COMMON_DEPEND}"
diff --git a/dev-ruby/localhost/localhost-1.1.9.ebuild b/dev-ruby/localhost/localhost-1.1.9.ebuild
index 0a5bb4c4d68e..695b905c17df 100644
--- a/dev-ruby/localhost/localhost-1.1.9.ebuild
+++ b/dev-ruby/localhost/localhost-1.1.9.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/socketry/localhost"
SRC_URI="https://github.com/socketry/localhost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
SLOT="$(ver_cut 1)"
IUSE=""
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index baef24bf0412..5355c5a6ce4b 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.gem 6656 BLAKE2B 95052fd231c0e390b5194af01f7e80d7e8dd34b155b40b95046625f060f89d799a641e5a79fd06efb606a4f5527d556c10a86da9d972ce36c526dcdc639623b6 SHA512 9c6965dd1ad4d5a12f7116e372f7b38bd95a93d24d93b66860086922aedf30aa1ad5cc27578f87d72228d893c1d73b431c195b0d1f8b1bc5a645b00fead05f9d
DIST rails-6.0.4.1.gem 6656 BLAKE2B f3ab76fa7ce5e3a668a98b7d1292516f34d36c466b8eea45de136791375d480ae016bfd824d6397af4e44280ff5567ce215e5df3d90867adeb0bc02bdedb1a66 SHA512 ae71bf509339b5c802dd9586caa10a3639fe73225ee4afe59a2bce2de9c58fe0f3e6faf6ed8b0e364ca579a9ec78d012c2f7a842745c6c81c5a4e9d0fa66efd1
DIST rails-6.0.4.3.gem 6656 BLAKE2B cbe3062a6d7042955757fd58686d2de4d26a1b1023dbd48606247bb2ba189d50808c43f84e2dc198c06e6a5b5fe1c93ec8d9c13bb90ca157d55f2b4c97cc4a16 SHA512 8e0168b1b86a4884130d55f592b88a52c0644b607533f1e5b46f4713132b5f72618aa1f1f0107cd5e22fa9dd2ed0a6cd3f36cb9a947790548e8e4025f507e475
+DIST rails-6.0.4.4.gem 6656 BLAKE2B 5a86f542a1030653fdb8d9ac994199b32ce4ab19e62c04e6c11bf66ecdf870654a31b312a3b75b8ac1df7b5f6dea7e423873f8f79030dbc7777d369c3c88eb86 SHA512 369a49d6c8371f7216f030ef9a69679bb3676267b4ecb524f8bf06e89f03a28dd0ab981c4cc9498f002bb95874b3661aa3ec923c64c30cc521a77d33352b57a9
DIST rails-6.1.4.1.gem 6656 BLAKE2B b41eb0898d3038f5412cf44b4f7d42ba5603bc5533915ff1a6e4937f2368323efc992b859c1ee7876f16c46ab3a945a6f29861d259dafa1788472af2c7597ea8 SHA512 789f44bc43d84ada313592a2dde046d853cdffa4c79f4b98669285647290cf2166b68c1b286902e87bfddf6e3b8f31b4bd1ca5f386fb598332adb64a05ce0f26
DIST rails-6.1.4.3.gem 6656 BLAKE2B 2ac02a031229f2d54f31d308a13d45375f5a8b6a750f4b7f9b273b665d0a0c770ce93a70587773c79ee00177822745dac18fcf14b49732f099dd8f07c8bc8ed1 SHA512 52903983c615c9d12ac8fe53c2f8cf3003f7af264df02d146ca51f42f343667478f1e7a3f3f5f435f3f951ffd205794a09f71852380e657234c75bc8afce7e8b
+DIST rails-6.1.4.4.gem 6656 BLAKE2B 13e90724226d4e125c1dba361ff31fa15e1d268417266e5f843c81fab91634a036140b5e45c1925c6f2b1cba63f06fffb8069dc9457eacb05cd5a932ae983fb9 SHA512 4c7086277c9882c6797a877c37d1e920035d772008413ecfa1b2570bd5b7f62081347bbadca10dbac747a6b1380463ac72d16b09698e7217064c39ca84683741
diff --git a/dev-ruby/rails/rails-6.0.4.4.ebuild b/dev-ruby/rails/rails-6.0.4.4.ebuild
new file mode 100644
index 000000000000..045971c6e442
--- /dev/null
+++ b/dev-ruby/rails/rails-6.0.4.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+ ~dev-ruby/actioncable-${PV}
+ ~dev-ruby/actionmailbox-${PV}
+ ~dev-ruby/actionmailer-${PV}
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/actiontext-${PV}
+ ~dev-ruby/actionview-${PV}
+ ~dev-ruby/activejob-${PV}
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/bundler-1.3:*
+ >=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/rails/rails-6.1.4.4.ebuild b/dev-ruby/rails/rails-6.1.4.4.ebuild
new file mode 100644
index 000000000000..7cd0e97185ec
--- /dev/null
+++ b/dev-ruby/rails/rails-6.1.4.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+ ~dev-ruby/actioncable-${PV}
+ ~dev-ruby/actionmailbox-${PV}
+ ~dev-ruby/actionmailer-${PV}
+ ~dev-ruby/actionpack-${PV}
+ ~dev-ruby/actiontext-${PV}
+ ~dev-ruby/actionview-${PV}
+ ~dev-ruby/activejob-${PV}
+ ~dev-ruby/activemodel-${PV}
+ ~dev-ruby/activerecord-${PV}
+ ~dev-ruby/activestorage-${PV}
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/railties-${PV}
+ >=dev-ruby/bundler-1.15.0:*
+ >=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 680066a88799..da694f6ceab9 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,5 +1,7 @@
DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
+DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
DIST rails-6.1.4.3.tgz 11007190 BLAKE2B 085d500407f03d8c46335d91e3ebc5cd092c801de25f7e4fd5ac4ae6f03e54c5347e720386763307e183e2f0f48aaf84142092f47b62ab395082e4068e46f883 SHA512 f47a2e155fc80c287360b1a17a0f870208c523a28b77737648b4f260dc4fec6e9ccc91861b84862828fda48c214d39dcff32430ed5a02c8b9ee59ba6efb6151c
+DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
diff --git a/dev-ruby/railties/railties-6.0.4.4.ebuild b/dev-ruby/railties/railties-6.0.4.4.ebuild
new file mode 100644
index 000000000000..a9385fe2d7c5
--- /dev/null
+++ b/dev-ruby/railties/railties-6.0.4.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.24"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionpack-${PV}
+ dev-ruby/thor:1
+ >=dev-ruby/rake-0.8.7
+ dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/mocha:0.14
+ )"
+
+all_ruby_prepare() {
+ rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+ sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+ sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+ elog "To select between slots of rails, use:"
+ elog "\teselect rails"
+
+ eselect rails update
+}
+
+pkg_postrm() {
+ eselect rails update
+}
diff --git a/dev-ruby/railties/railties-6.1.4.4.ebuild b/dev-ruby/railties/railties-6.1.4.4.ebuild
new file mode 100644
index 000000000000..32dd8c456b56
--- /dev/null
+++ b/dev-ruby/railties/railties-6.1.4.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.25"
+
+ruby_add_rdepend "
+ ~dev-ruby/activesupport-${PV}
+ ~dev-ruby/actionpack-${PV}
+ dev-ruby/thor:1
+ >=dev-ruby/rake-0.8.7
+ dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+ test? (
+ ~dev-ruby/actionview-${PV}
+ dev-ruby/mocha:0.14
+ )"
+
+all_ruby_prepare() {
+ rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+ sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+ sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+ elog "To select between slots of rails, use:"
+ elog "\teselect rails"
+
+ eselect rails update
+}
+
+pkg_postrm() {
+ eselect rails update
+}
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index dc5b5dac3aae..59c9037f9904 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,2 +1,3 @@
DIST rouge-3.26.0.tar.gz 971871 BLAKE2B 9739c229788d615f4875caf5d38c91ca30b4fe5703c577b2e7aa5d54bd625f33e998ee887d375d357e72c9f05ac9a284b88ce7902c6fae422e8196098a993259 SHA512 bd6006b11924b3705dc142922878dc87af25ceed8a153ad9691ad2595144ae1f3f909574799002601928e985a6650fe4c8d93e05a1e8e26bdb10e9b2f9a28765
DIST rouge-3.26.1.tar.gz 972469 BLAKE2B 48f7741d69ce6470235ba4f469b8a37b6bac409a68ba44bce3d60f3ffc4d3cd7a1e3fc4358e4f7a4f27b27653e4525767749da5d7949a1208810f2634be2f331 SHA512 4b5d5a840dab75579e2fb10b4d86fde647ccf183b2fe496463a6ab14dfc9022fa44be9ac75e5f792bf3f2102477a40aafb5fe4694e59bfe9786d3a2d70ddb9f6
+DIST rouge-3.27.0.tar.gz 981023 BLAKE2B f0e22bf37563fc12d5308dc13c8de8230dd366eaafa12a7e3a387d4bea108fb14001b0b570e9cf8e2ffba317c7821c3b5f3f1cc0505e39e8057af5b438207235 SHA512 6f35c7bafa18c77a11131700fb8baac1f646be467224b9b863cafcf2445c54605c031009b14b57d95ad72b9311160e9d02e6b4a2bb2682ac4f5e88772a7cc695
diff --git a/dev-ruby/rouge/rouge-3.27.0.ebuild b/dev-ruby/rouge/rouge-3.27.0.ebuild
new file mode 100644
index 000000000000..6b510c11b4fc
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.27.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+ test? ( dev-ruby/minitest-power_assert )
+ dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+ rm -f tasks/{check/style,update/changelog}.rake || die
+
+ sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+ sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index cbaa199fd48d..b3758a4ff399 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 01ce4fdf2a1a..df6605d78500 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,6 +1,8 @@
DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae
+DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d
DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
+DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
new file mode 100644
index 000000000000..f09f17d20444
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic
+
+BITCOINCORE_COMMITHASH="a0988140b71485ad12c3c3a4a9573f7c21b1eff8"
+KNOTS_PV="${PV}.knots20211108"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+ https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots"
+
+RDEPEND="
+ >=dev-libs/boost-1.64.0:=[threads(+)]
+ >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
+ >=dev-libs/univalue-1.0.4:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-devel/automake-1.13
+ || ( >=sys-devel/gcc-7[cxx] >=sys-devel/clang-5 )
+"
+
+DOCS=(
+ doc/bips.md
+ doc/release-notes.md
+)
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2021/09/13/release-${PV}/"
+ fi
+
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then
+ if ! test-flag-CXX -std=c++17 ; then
+ die "Building ${CATEGORY}/${P} requires at least GCC 7 or Clang 5"
+ fi
+ fi
+}
+
+src_prepare() {
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch"
+ fi
+
+ default
+
+ eautoreconf
+ rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+ local my_econf=(
+ --disable-asm
+ --without-qtdbus
+ --disable-ebpf
+ --without-natpmp
+ --without-qrencode
+ --without-miniupnpc
+ --disable-tests
+ --disable-wallet
+ --disable-zmq
+ --enable-util-tx
+ --disable-util-util
+ --disable-util-cli
+ --disable-util-wallet
+ --disable-bench
+ --without-libs
+ --without-daemon
+ --without-gui
+ --disable-fuzz
+ --disable-fuzz-binary
+ --disable-ccache
+ --disable-static
+ --with-system-libsecp256k1
+ --with-system-univalue
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/cmake/cmake-3.21.4.ebuild b/dev-util/cmake/cmake-3.21.4.ebuild
index b1cc1455ac6c..901b2597a6db 100644
--- a/dev-util/cmake/cmake-3.21.4.ebuild
+++ b/dev-util/cmake/cmake-3.21.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 0d1a419a77d7..8564a60dfec1 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,2 +1,3 @@
DIST dialog-1.3-20210621.tgz 563430 BLAKE2B 8ffb630ed67f303facd79ca72aaca89d32c55a2b504293105a72c596409828fffd3e5e5f603fb5bec7f8748358a03ddadc7f1cd6fb989d1b31af1fd8f1078d97 SHA512 bde13aaf215127d143aa0d37989e0bacb6bc23f007681aeff27683efa01a483106710ff756358e396c23e4c1f0355cd8a2b3bb362ae1c3a1a997e00835d53c2b
DIST dialog-1.3-20211107.tgz 566509 BLAKE2B f2c045f60185c34eec18b878219fae10a5acca2dc8bec5d379de069c939a0079e1a95925f860944108c97c8ef4e32041966c423d8b294b2102311c9aa085301e SHA512 a6626092692ca61209f67caa7c5dec91f637e3ff002488a0e117ec80ce8fdf0ef50d3b11f67d84d8abb06145347a100de76223fb4b1f971a755c28de1be860ac
+DIST dialog-1.3-20211214.tgz 565608 BLAKE2B f069968abe258942f27e010f8d14eafd270c45ae467d5131b41b57c0cc5a145a410fdaeab5f7fa221aa7dbea440f8e268d130e0f1f7389a224374b0047228156 SHA512 b76e7e1fc333550a9cc351e37e7121e98f48b2a1f78e8c0c528e2126db16ae14c4c5da088bc611cb12020836e75dd2a1d875561fe5eec6589c104252d4aa7626
diff --git a/dev-util/dialog/dialog-1.3.20211214.ebuild b/dev-util/dialog/dialog-1.3.20211214.ebuild
new file mode 100644
index 000000000000..d9eb069d20c7
--- /dev/null
+++ b/dev-util/dialog/dialog-1.3.20211214.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-$(ver_rs 2 -)
+
+DESCRIPTION="Tool to display dialog boxes from a shell"
+HOMEPAGE="https://invisible-island.net/dialog/"
+SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples minimal nls unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+BDEPEND="!minimal? ( sys-devel/libtool )
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
+ sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ export ac_cv_prog_LIBTOOL=glibtool
+ fi
+
+ econf \
+ --disable-rpath-hack \
+ --with-pkg-config \
+ $(use_enable nls) \
+ $(use_with !minimal libtool) \
+ --with-libtool-opts='-shared' \
+ --with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+ use minimal && default || emake DESTDIR="${D}" install-full
+
+ use examples && dodoc -r samples
+
+ dodoc CHANGES README
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index 578f9f2a7426..a899c044ab38 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -39,6 +39,7 @@ DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffb
DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
DIST git-delta-0.11.2.tar.gz 1196336 BLAKE2B 498147343ecf6f6f37841ceaf22361c1acba270354ecae4beb04502d3d6f1eff6fdf02af8d633f6b4b32ce4cf3a8eb629105309d4d293b5dfbda26282b59ecca SHA512 1f3dbce0673862e210aaff7fe6ecd98194603cb2900d569cfab0aae044d0ec1236bde767dfc699069238e4a2f855fbb27477d79cf47e4a9775dcd4033fd8cec3
+DIST git-delta-0.11.3.tar.gz 1198656 BLAKE2B ba3707a70e1a9f589a91a931e0a908525d9c3faabd78f8e336b9677b91c03e12cddaf985b5a2babfba9522a24e04d4b550015b9d021a80ca39da1f579ea8e97e SHA512 090d64d1a9a8f3b905c1f7e80b98bbf3c62b3db14668cdf1f64fe8614086dd346513b305d9b9f160cb9bf7cdd3cdce640cc948c76ea48fd5a65018d356120785
DIST git-delta-0.9.2.tar.gz 1126468 BLAKE2B 46ed5598965553f6c9df28863efd0304deecedc41970701fe46d8698494cdfd371bc463845586b9e3a1150034a36abde403d6eb5185c79bf65d918418690beea SHA512 14557103e0a5edf1c307c5036dc092fbab119952d2eef95709e3a363d913ae11e3d8fb7bf16e7dd26bd36e8a7d51c49e70edb002fce8f00b428c7ee330d49d01
DIST git2-0.13.23.crate 192186 BLAKE2B d3bd3c54abc7b04c2948edaf35adac671a391c03ecc80c53e6ad0c9f14798d0d9fcd308a9a30424ffe5b1f6da1e6e20751d98eb47c62e123e3bbb16cb11ca32a SHA512 e60f21affcef26aac16181d48ecaa67b6a9578ce5fe9e62b6c460b21bc02feb858fe25f07f7d7443b8eeae88974f1ad76a998972e002a6c5da5aec4c1172c401
DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
@@ -54,6 +55,7 @@ DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e70857111
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
DIST libc-0.2.103.crate 540563 BLAKE2B cc99ae88783e6f3044ecec5154e0de81a7f792b89415cc2736eb4a436edd316277d690971c4aa0eff7935b5a355c8966805c4ee72c5fec8caecf65a29c13caf9 SHA512 79e1c99bfeb30283f85742cf17867000301bbe022c6b2ace415b4a767068dd64b09581bcc802d42150e45849f5adf8ee2720a0c695324d87d3d96a5c554a216d
+DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
DIST libgit2-sys-0.12.24+1.3.0.crate 1476766 BLAKE2B d1164bd49ac122692141ae6f2a38fde941582668169960e9af98bee7a4a26e57b34522057c8503146fc5b7fb1ab646fbf2548c7a3994299fd078e5b835041ff9 SHA512 9d738c318a15b70c749aeef777aebaf59a40912da5e4f23fade1e84a6425acdac6e6a59030811f5cd974edddd965c0c9514f7b5a0286d32d4d7f6ebb6e6ae21d
DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
@@ -114,6 +116,7 @@ DIST structopt-derive-0.4.18.crate 20996 BLAKE2B 2ae17e0d365a7ce7a4d0e007513623e
DIST syn-1.0.57.crate 229228 BLAKE2B c1f4e6a38ce706f86d8f075409fb341ed9a46aeb8d0f4534fceb2aa2fd717063667bc89361b2d95916c0dcb036d5450d94c23139d110afdacabe91c0a5f988cb SHA512 2e7f318f15c57d518df8e2875545f92faa8171c37f1ac15be189bd58e9a178978e3734417ba99030c62fb84e55e4300fc477d0422fac60a7ee8b759cdd1e56a6
DIST syntect-4.6.0.crate 750938 BLAKE2B 9c53e142093f6d9fb703f4fe3f56db15c0bb7eba92cba9f31e567e9de2bcb129b7b415cbaf692c1e1021b12184bb3b064ed1996654581aab3d5f09e992c0eb5d SHA512 9e320afaf4c2adf41dd7e20c5d95e3063fe8d2774d8deec7e0df3debab050e96a1a5c85d1732c661ee4022dc5bf1abfed2982f13269689b527f35efb2c82beba
DIST sysinfo-0.19.2.crate 97919 BLAKE2B e58c90b430e9989ed52b1372ea19a15cd9eeafb0f591015f0cd9ee40cec357209a94ef4d232c91070bf797c38a8d6eadd11d4378814ff82b106e0fba1ea34a3a SHA512 aa27977890afb37b8d6e3467302b301ce7076c53224808a361f1c2780038d0779a719e9a90fede64379cf7f3d391dbe557a79e393ddcc2c35faee17fc50f14a0
+DIST sysinfo-0.22.2.crate 114052 BLAKE2B 71fe67d32e24740bbf8131767795a4f46367ed3dd871a876a8ea0d5e66b159a992ff007909feb40838096661377f8abbe13e6ea7d631036b8d0c55d4f147209d SHA512 90a800c2152d7b3a4707a1250a365baf53797665048a91ae89b98c7f0fe2e7ff606d05e64585d620107fde184e637058f7abec94e299a5cffdade6a823e901d8
DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
DIST terminal_size-0.1.15.crate 8795 BLAKE2B 2e7590a524bd8e439d385f925c3d5a3aadea20bb24b7fb5c52dedc4dccdd67f986b304208dc6d9cecf0e4b2c449dd980613b4e381603cad74fd9038420b289e2 SHA512 cf1612f46c8502e079b87a240ddecdc02be8481cb7b78115ba1550a9a732103bc19de11f46160dbc5af06f8576d3dc780ed0b199b7f24c92fc0734e0d07e484e
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
diff --git a/dev-util/git-delta/git-delta-0.11.3.ebuild b/dev-util/git-delta/git-delta-0.11.3.ebuild
new file mode 100644
index 000000000000..3ddedcc6ab6c
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.11.3.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ adler-0.2.3
+ aho-corasick-0.7.15
+ ansi_colours-1.0.4
+ ansi_term-0.11.0
+ ansi_term-0.12.1
+ approx-0.5.0
+ arrayvec-0.5.2
+ atty-0.2.14
+ autocfg-1.0.1
+ base64-0.13.0
+ bincode-1.3.1
+ bitflags-1.3.2
+ box_drawing-0.1.2
+ bstr-0.2.15
+ bytelines-2.2.2
+ byteorder-1.3.4
+ cc-1.0.66
+ cfg-if-0.1.10
+ cfg-if-1.0.0
+ chrono-0.4.19
+ chrono-humanize-0.2.1
+ clap-2.33.3
+ console-0.15.0
+ core-foundation-sys-0.8.3
+ crc32fast-1.2.1
+ ctrlc-3.2.1
+ dirs-3.0.2
+ dirs-next-2.0.0
+ dirs-sys-0.3.6
+ dirs-sys-next-0.1.1
+ either-1.6.1
+ encode_unicode-0.3.6
+ error-chain-0.12.4
+ find-crate-0.6.3
+ flate2-1.0.19
+ fnv-1.0.7
+ form_urlencoded-1.0.0
+ getrandom-0.1.16
+ getrandom-0.2.3
+ git2-0.13.23
+ globset-0.4.8
+ grep-cli-0.1.6
+ hashbrown-0.8.2
+ heck-0.3.2
+ hermit-abi-0.1.17
+ idna-0.2.0
+ indexmap-1.5.2
+ itertools-0.10.1
+ itoa-0.4.7
+ jobserver-0.1.21
+ lazy_static-1.4.0
+ lazycell-1.3.0
+ libc-0.2.112
+ libgit2-sys-0.12.24+1.3.0
+ libz-sys-1.1.2
+ line-wrap-0.1.1
+ linked-hash-map-0.5.3
+ log-0.4.11
+ matches-0.1.8
+ memchr-2.3.4
+ memoffset-0.6.4
+ miniz_oxide-0.4.3
+ nix-0.23.0
+ ntapi-0.3.6
+ num-integer-0.1.44
+ num-traits-0.2.14
+ once_cell-1.8.0
+ onig-6.1.1
+ onig_sys-69.6.0
+ palette-0.6.0
+ palette_derive-0.6.0
+ pathdiff-0.2.1
+ percent-encoding-2.1.0
+ phf-0.9.0
+ phf_generator-0.9.1
+ phf_macros-0.9.0
+ phf_shared-0.9.0
+ pkg-config-0.3.19
+ plist-1.0.1
+ ppv-lite86-0.2.15
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro-hack-0.5.19
+ proc-macro2-1.0.24
+ quote-1.0.8
+ rand-0.8.4
+ rand_chacha-0.3.1
+ rand_core-0.6.3
+ rand_hc-0.3.1
+ redox_syscall-0.1.57
+ redox_syscall-0.2.10
+ redox_users-0.3.5
+ redox_users-0.4.0
+ regex-1.4.6
+ regex-automata-0.1.10
+ regex-syntax-0.6.22
+ ryu-1.0.5
+ safemem-0.3.3
+ same-file-1.0.6
+ serde-1.0.118
+ serde_derive-1.0.118
+ serde_json-1.0.70
+ shell-words-1.0.0
+ siphasher-0.3.7
+ smol_str-0.1.21
+ strsim-0.8.0
+ structopt-0.3.25
+ structopt-derive-0.4.18
+ syn-1.0.57
+ syntect-4.6.0
+ sysinfo-0.22.2
+ termcolor-1.1.2
+ terminal_size-0.1.15
+ textwrap-0.11.0
+ time-0.1.44
+ tinyvec-1.1.0
+ tinyvec_macros-0.1.0
+ toml-0.5.8
+ unicode-bidi-0.3.4
+ unicode-normalization-0.1.16
+ unicode-segmentation-1.8.0
+ unicode-width-0.1.9
+ unicode-xid-0.2.1
+ url-2.2.0
+ utf8parse-0.2.0
+ vcpkg-0.2.11
+ vec_map-0.8.2
+ version_check-0.9.2
+ vte-0.10.1
+ vte_generate_state_changes-0.1.1
+ walkdir-2.3.1
+ wasi-0.9.0+wasi-snapshot-preview1
+ wasi-0.10.0+wasi-snapshot-preview1
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ xdg-2.4.0
+ xml-rs-0.8.3
+ yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ dev-libs/libgit2:=
+ dev-libs/oniguruma:=
+"
+RDEPEND="
+ ${DEPEND}
+ !app-text/delta
+"
+
+QA_FLAGS_IGNORED="usr/bin/delta"
+
+src_configure() {
+ # Some crates will auto-build and statically link C libraries(!)
+ # Tracker bug #709568
+ export RUSTONIG_SYSTEM_LIBONIG=1
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+ cargo_src_install
+
+ # No man page (yet?)
+
+ # Completions
+ newbashcomp "${S}/etc/completion/completion.bash" delta
+
+ insinto /usr/share/zsh/site-functions
+ newins "${S}/etc/completion/completion.zsh" _delta
+}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 99f243e40a46..5ac86e5bebdf 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -8,7 +8,6 @@ DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef
DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
-DIST anyhow-1.0.50.crate 44096 BLAKE2B fe303c7380e40bd9dac617fc25129fc96a7100a4da8c3476557cceef9f64dd7e9dec0623cb1da269fcca3d6cc35f9e7b01253ddb59ae4f12c276746d4948dc00 SHA512 21cd89077680e877143e9ba88c4af3a91465dfcd81ff6f08e2840fbee1d718d8a5a94b332641d126c3a2fe6b8e8509e0eb8337d987e0ab25c65dc7e71261d30b
DIST anyhow-1.0.51.crate 44100 BLAKE2B 20683fd139775cd399bd0fd63599f64a646f8b74c65415af965d3c24690fd81fe48205bedaaaab92075b487b71d5d315be5fdf38ff7c5ecf3e1a1d693a3505ee SHA512 e8e3feebc3c96b7301787502f000b9940a20343a466ac48186c9aa170fb52f0db17768630535a8b475077733ad6ff9f843a3bd5ae4415c86bf83cae0ed0bad7c
DIST async-io-1.6.0.crate 32282 BLAKE2B fdd46328b23d58058d4501f6a30e396302c36f9a8f91276e6b50b9ddd628a63b8af22e35b5efb4c7cd91cc6c823ffa2ecc492da525c1139f30c02004f0a5b0a7 SHA512 0451c6d53da593bc1753ab56c043d855d2642de5679265970ade0c63cef09268ac5b133100230637bf16506f475e322ffea2c85f8eaa3788a0bbe24ff7e671f5
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -54,7 +53,6 @@ DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4
DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
-DIST crc32fast-1.2.2.crate 38113 BLAKE2B 8ceda4190d9034cc16718719dc23cc63fc8d24dcd9acc8983f2ebca5fb750364f9774268c3935300987c29eb8d289b72f05d44b0bfdd708d3025322d57adf7e2 SHA512 a8dd0ebc180acf47ea89391949c58c430751663c07fa2476176aed6a6e19f58c5737ce4afc1a7ab9781370eab6515f25416456b3fa77e475e2c8abdb3ae3e918
DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c43fa5fa44de02d74b6fb4e4d874218f5a369c4a1d1ea71461cd541203f42afee259343ea139e305043e155ee7 SHA512 6ff361acfc0bb134672b30fb438f6d3ac93841d06332a6ff156025620b23870a79a4ceacf57d4b14ea1744838cffcfb77b413352d055809e74acd853ae912673
DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
DIST crypto-mac-0.10.1.crate 9531 BLAKE2B 6a26505762d8d466275fe7674de1c4f95686b7a5fe107442361c892ba3123213e3f7cfb8d5516219e84c44496ef342ab534ebca724732e509d33fb9300027ef4 SHA512 39b7d966ef2df4f01a6b6f43838ec30c9df4a51106ee42d8d349f2d826722834ad5f7875bf68d7359799015d53ed45942d71a10f701fd080e264b21a89879dfe
@@ -133,7 +131,6 @@ DIST ipnet-2.3.1.crate 24932 BLAKE2B 26be72376dd7f62d3d01cb9d3287f9aa19e7f52e01f
DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
DIST keyring-0.10.1.crate 20169 BLAKE2B 0509c3a512124e08cced67c227373a3817f70c78e065f2d391609b4801905fd774e7524688470a5c9eee23cf64e0158f8ffef545d25a88859df76f37c29c416d SHA512 a133d3908906d7b48c2986eba7525018bcf52d9e0690a2b1342580f9d4b9ab5165b800a853c57d7a7f41fca26487fd42b01eb7b75f5c4f0b623fb9f564ffd011
-DIST keyring-0.10.4.crate 22959 BLAKE2B 7a7f5aa2775895f35d47297d65490a675559cef93302ac62455d4b9662bb1cd4682ba2742838edc52b0b470ee2a3f05096f7679cd09986917ab27c89e718affb SHA512 68497fb8f4ced09a5a812b7c0d0647f68204fa1682cd4fe76ea77dd1e641495e34b56c50e0cd12b9284ad07fe716d29deee868d2bcd7ea5d001817869527b9e7
DIST keyring-1.0.0.crate 28990 BLAKE2B 2309a9d3cce6053d0496dc6699e23ab5947a62fadd48d2ad943b7271c1cc78962ec53d7d674e175944e9a21f9a8b15cb947ed215376baf466e3c56a6ecc0b657 SHA512 988aa67d9fbec41a0704ed611a64bf93fbf38ee5ba02299f0fa0ebcb7794f4003b3b1161e4ff4da9f2d71a83706352e12a5759aad099e355435b82fca0342bc5
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST libc-0.2.103.crate 540563 BLAKE2B cc99ae88783e6f3044ecec5154e0de81a7f792b89415cc2736eb4a436edd316277d690971c4aa0eff7935b5a355c8966805c4ee72c5fec8caecf65a29c13caf9 SHA512 79e1c99bfeb30283f85742cf17867000301bbe022c6b2ace415b4a767068dd64b09581bcc802d42150e45849f5adf8ee2720a0c695324d87d3d96a5c554a216d
@@ -146,7 +143,6 @@ DIST mailparse-0.13.6.crate 34804 BLAKE2B d3e88b5ef7d97e06f0b75cf14f2134c5dbc951
DIST mailparse-0.13.7.crate 34737 BLAKE2B 33ce9844ac364c80c57973e6afe09953f3e73385d5fefc390e42d6018c91a55a25b92bed1df9ec7e3f08fa822368dee8f88c35cafa3a8c5d2936477040c00599 SHA512 00c7e418c3625b7220a677e76589ce7d00d0873d28461716a30d34e2e92f67dee75a64c2fd53b916993240c82c5741fc27ec1d074f80f8d044e6626ecca39f12
DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
DIST maturin-0.11.5.tar.gz 584266 BLAKE2B be92b8b3f94e7b5e5225a57118219cb854ea072a03b92b5811a135f54c634b89dd52c3c6bb50be539b7578e3748a34fdf4552bb46544500b061743c7dbd92ba0 SHA512 31c32849fe424393351c6f895eaf76852647fcd6b5bf77d1244147315c4e730762c03d49d898bc76805dcd0a6ed8004e8eaf26a2f78af2228f8cfd3cb2201c7b
-DIST maturin-0.12.3.tar.gz 264117 BLAKE2B c98de550c99c378e6b9e90118acc7e7b67184455a447165840ceb109611e92c1fc2b1b4512dea16c869f3fa5041c0b8906e5767df6f06d45c308045bc4ad5f47 SHA512 2a568dacf09a01f7198570381079c61c98b1771a2e447cd2077256436a6f9e566828b6e9064c5ca0a7aa8de0e442602ff1940f454503db635bda9682614165ef
DIST maturin-0.12.4.tar.gz 269863 BLAKE2B 422eec4148114dbcca7f8a9a8c60c872ba67df330ffa96972abc5481f593e17770e01c08adae2f763424b09f7172701d94d598a57ef068a599b4a6df38288a50 SHA512 fff317651501f142586826692adf1152dd82bd3d8a5aade337edf1f688a1c12ecb13a5ac1978c23f1c798ea140d5dc87ae3cc68ed73974a52dac3ff30ee1d031
DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
@@ -228,7 +224,6 @@ DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0
DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
DIST reqwest-0.11.5.crate 136526 BLAKE2B 23ed54d3bd88a1c545727283b1090ef2eb8806537cd1f0e584fb899b9db1c0850d25a471ac57f92dea464e121879c28f199774b1400616ab877e147a4bfb9d09 SHA512 59f624e7018fbbd9eb47b448356178196d315792e2418428ea1371a3c2b87417be4aa27d3c75e992bac525cbe95976a6ff481fd2a7661d56aaad3a8c3052cf84
-DIST reqwest-0.11.6.crate 137108 BLAKE2B bc50db076692e89b2a0c3cdb898c2b531c43d51b2d3ce646e1e6f96434a8843d879baf1a77cd65b3a5b2269ddea942cfb0b1ca404afcdf11224b0427805f86fc SHA512 39a76ec1667fb83c5315f5d49c2a4325e14c5fc46c23d5d519449cb2284be3e24313d91007274626e473f1cc663594c018004b9ed1f912292550bed15e0fab1b
DIST reqwest-0.11.7.crate 139871 BLAKE2B 6120cf1c7419d373a6efe6f4b12714ca5eeb06b27c561c4d4420825ed4f839effb934aed0cce0f6361ed135662e1cea02944cb0d727d2102206a149d964ac38c SHA512 fee86d3ebc2d954e24faec1e7f42514395b106fbca689e5e5f3a9f9689e8f0024a5bc602095483353fba9b4c50b5e85a9141b59e1fd189bd8badc0ce2a31d0b2
DIST rfc2047-decoder-0.1.2.crate 6023 BLAKE2B 75d98aadeaed734cca80e21fe8d94e8a4a87f6eabc7cfee63052c51d257058f5589d87c757d2e40f223ef8c4bdd6f5c8335160f67e8f5367b80807ca8c7486c3 SHA512 302893aba05b32dc8262fa9b034fee2f760a09f7af860f99e2e5463bb7f3ee8f9b984d8f9b41b0acbd0703b38373ed7722923b85dee766d7c5f25571b2d842e6
DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
diff --git a/dev-util/maturin/maturin-0.11.5-r1.ebuild b/dev-util/maturin/maturin-0.11.5-r1.ebuild
index fad51fc2c494..6402362d9a86 100644
--- a/dev-util/maturin/maturin-0.11.5-r1.ebuild
+++ b/dev-util/maturin/maturin-0.11.5-r1.ebuild
@@ -254,7 +254,7 @@ SRC_URI="
LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/maturin/maturin-0.11.5.ebuild b/dev-util/maturin/maturin-0.11.5.ebuild
deleted file mode 100644
index 896159452b6d..000000000000
--- a/dev-util/maturin/maturin-0.11.5.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
- addr2line-0.16.0
- adler-1.0.2
- aes-0.6.0
- aes-soft-0.6.4
- aesni-0.10.0
- aho-corasick-0.7.18
- ansi_term-0.11.0
- anyhow-1.0.44
- atty-0.2.14
- autocfg-1.0.1
- backtrace-0.3.61
- base64-0.10.1
- base64-0.13.0
- bitflags-1.3.2
- block-buffer-0.9.0
- block-modes-0.7.0
- block-padding-0.2.1
- bumpalo-3.7.1
- byteorder-1.4.3
- bytes-1.1.0
- bytesize-1.1.0
- bzip2-0.4.3
- bzip2-sys-0.1.11+1.0.8
- camino-1.0.5
- cargo-platform-0.1.2
- cargo_metadata-0.14.0
- cbindgen-0.20.0
- cc-1.0.71
- cfg-if-1.0.0
- charset-0.1.2
- cipher-0.2.5
- clap-2.33.3
- configparser-2.1.0
- core-foundation-0.7.0
- core-foundation-sys-0.7.0
- cpufeatures-0.2.1
- crc32fast-1.2.1
- crypto-mac-0.10.1
- dbus-0.2.3
- digest-0.9.0
- dirs-4.0.0
- dirs-sys-0.3.6
- encoding_rs-0.8.28
- env_logger-0.7.1
- fat-macho-0.4.4
- filetime-0.2.15
- flate2-1.0.22
- fnv-1.0.7
- form_urlencoded-1.0.1
- fs-err-2.6.0
- futures-channel-0.3.17
- futures-core-0.3.17
- futures-io-0.3.17
- futures-macro-0.3.17
- futures-sink-0.3.17
- futures-task-0.3.17
- futures-util-0.3.17
- generic-array-0.14.4
- getrandom-0.1.16
- getrandom-0.2.3
- gimli-0.25.0
- glob-0.3.0
- goblin-0.4.3
- h2-0.3.6
- hashbrown-0.11.2
- heck-0.3.3
- hermit-abi-0.1.19
- hkdf-0.10.0
- hmac-0.10.1
- http-0.2.5
- http-body-0.4.3
- httparse-1.5.1
- httpdate-1.0.1
- human-panic-1.0.3
- humantime-1.3.0
- hyper-0.14.13
- hyper-rustls-0.22.1
- idna-0.2.3
- indexmap-1.7.0
- indoc-1.0.3
- ipnet-2.3.1
- itoa-0.4.8
- js-sys-0.3.55
- keyring-0.10.1
- lazy_static-1.4.0
- libc-0.2.103
- log-0.4.14
- mailparse-0.13.6
- matches-0.1.9
- memchr-2.4.1
- mime-0.3.16
- mime_guess-2.0.3
- miniz_oxide-0.4.4
- mio-0.7.13
- miow-0.3.7
- ntapi-0.3.6
- num-0.3.1
- num-bigint-0.3.3
- num-complex-0.3.1
- num-integer-0.1.44
- num-iter-0.1.42
- num-rational-0.3.2
- num-traits-0.2.14
- num_cpus-1.13.0
- object-0.26.2
- once_cell-1.8.0
- opaque-debug-0.3.0
- os_type-2.3.0
- percent-encoding-2.1.0
- pin-project-lite-0.2.7
- pin-utils-0.1.0
- pkg-config-0.3.20
- plain-0.2.3
- platform-info-0.1.0
- ppv-lite86-0.2.10
- pretty_env_logger-0.4.0
- proc-macro-error-1.0.4
- proc-macro-error-attr-1.0.4
- proc-macro-hack-0.5.19
- proc-macro-nested-0.1.7
- proc-macro2-1.0.30
- pyproject-toml-0.2.0
- python-pkginfo-0.5.0
- quick-error-1.2.3
- quote-1.0.10
- quoted_printable-0.4.3
- rand-0.7.3
- rand-0.8.4
- rand_chacha-0.2.2
- rand_chacha-0.3.1
- rand_core-0.5.1
- rand_core-0.6.3
- rand_hc-0.2.0
- rand_hc-0.3.1
- redox_syscall-0.2.10
- redox_users-0.4.0
- regex-1.5.4
- regex-syntax-0.6.25
- remove_dir_all-0.5.3
- reqwest-0.11.5
- rfc2047-decoder-0.1.2
- ring-0.16.20
- rpassword-5.0.1
- rustc-demangle-0.1.21
- rustls-0.19.1
- ryu-1.0.5
- same-file-1.0.6
- scroll-0.10.2
- scroll_derive-0.10.5
- sct-0.6.1
- secret-service-1.1.3
- security-framework-0.4.4
- security-framework-sys-0.4.3
- semver-1.0.4
- serde-1.0.130
- serde_derive-1.0.130
- serde_json-1.0.68
- serde_urlencoded-0.7.0
- sha2-0.9.8
- shlex-1.1.0
- slab-0.4.4
- smawk-0.3.1
- socket2-0.4.2
- spin-0.5.2
- strsim-0.8.0
- structopt-0.3.23
- structopt-derive-0.4.16
- subtle-2.4.1
- syn-1.0.80
- tar-0.4.37
- target-lexicon-0.12.2
- tempfile-3.2.0
- termcolor-1.1.2
- textwrap-0.11.0
- textwrap-0.14.2
- thiserror-1.0.30
- thiserror-impl-1.0.30
- time-0.1.43
- tinyvec-1.5.0
- tinyvec_macros-0.1.0
- tokio-1.12.0
- tokio-rustls-0.22.0
- tokio-util-0.6.8
- toml-0.5.8
- tower-service-0.3.1
- tracing-0.1.29
- tracing-core-0.1.21
- try-lock-0.2.3
- typenum-1.14.0
- unicase-2.6.0
- unicode-bidi-0.3.7
- unicode-linebreak-0.1.2
- unicode-normalization-0.1.19
- unicode-segmentation-1.8.0
- unicode-width-0.1.9
- unicode-xid-0.2.2
- unindent-0.1.7
- untrusted-0.7.1
- url-2.2.2
- uuid-0.8.2
- vec_map-0.8.2
- version_check-0.9.3
- walkdir-2.3.2
- want-0.3.0
- wasi-0.10.2+wasi-snapshot-preview1
- wasi-0.9.0+wasi-snapshot-preview1
- wasm-bindgen-0.2.78
- wasm-bindgen-backend-0.2.78
- wasm-bindgen-futures-0.4.28
- wasm-bindgen-macro-0.2.78
- wasm-bindgen-macro-support-0.2.78
- wasm-bindgen-shared-0.2.78
- web-sys-0.3.55
- webpki-0.21.4
- webpki-roots-0.21.1
- winapi-0.3.9
- winapi-i686-pc-windows-gnu-0.4.0
- winapi-util-0.1.5
- winapi-x86_64-pc-windows-gnu-0.4.0
- winreg-0.7.0
- xattr-0.2.2
- zip-0.5.13"
-CRATES_TEST="
- indoc-0.3.6
- indoc-impl-0.3.6
- instant-0.1.11
- lock_api-0.4.5
- parking_lot-0.11.2
- parking_lot_core-0.8.5
- paste-0.1.18
- paste-impl-0.1.18
- proc-macro2-1.0.29
- pyo3-0.14.5
- pyo3-build-config-0.14.5
- pyo3-macros-0.14.5
- pyo3-macros-backend-0.14.5
- scopeguard-1.1.0
- smallvec-1.7.0"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cargo flag-o-matic python-any-r1
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://github.com/pyo3/maturin"
-SRC_URI="
- https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- $(cargo_crate_uris)
- test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-PROPERTIES="test_network"
-RESTRICT="test" # uses venv+pip
-
-BDEPEND="
- test? (
- $(python_gen_any_dep '
- dev-python/cffi[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- ')
- )"
-
-QA_FLAGS_IGNORED="usr/bin/maturin"
-
-python_check_deps() {
- has_version -b "dev-python/cffi[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/virtualenv[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- filter-flags '-flto*' # undefined references with ring crate
-
- cargo_src_configure
-}
-
-src_test() {
- cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock
-}
-
-src_install() {
- cargo_src_install
-
- dodoc Changelog.md Readme.md
-}
diff --git a/dev-util/maturin/maturin-0.12.3-r1.ebuild b/dev-util/maturin/maturin-0.12.3-r1.ebuild
deleted file mode 100644
index 936b151e7a89..000000000000
--- a/dev-util/maturin/maturin-0.12.3-r1.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
- addr2line-0.17.0
- adler-1.0.2
- aes-0.6.0
- aes-soft-0.6.4
- aesni-0.10.0
- aho-corasick-0.7.18
- ansi_term-0.11.0
- anyhow-1.0.50
- async-io-1.6.0
- atty-0.2.14
- autocfg-1.0.1
- backtrace-0.3.63
- base64-0.13.0
- bitflags-1.3.2
- block-buffer-0.9.0
- block-modes-0.7.0
- block-padding-0.2.1
- bstr-0.2.17
- bumpalo-3.8.0
- byteorder-1.4.3
- bytes-1.1.0
- bytesize-1.1.0
- bzip2-0.4.3
- bzip2-sys-0.1.11+1.0.8
- cache-padded-1.1.1
- camino-1.0.5
- cargo-platform-0.1.2
- cargo_metadata-0.14.1
- cbindgen-0.20.0
- cc-1.0.72
- cfg-if-0.1.10
- cfg-if-1.0.0
- charset-0.1.3
- cipher-0.2.5
- clap-2.33.3
- concurrent-queue-1.2.2
- configparser-3.0.0
- console-0.15.0
- core-foundation-0.9.2
- core-foundation-sys-0.8.3
- cpufeatures-0.2.1
- crc32fast-1.2.2
- crossbeam-utils-0.8.5
- crypto-mac-0.10.1
- derivative-2.2.0
- dialoguer-0.9.0
- digest-0.9.0
- dirs-4.0.0
- dirs-sys-0.3.6
- encode_unicode-0.3.6
- encoding_rs-0.8.29
- enumflags2-0.6.4
- enumflags2_derive-0.6.4
- env_logger-0.7.1
- fastrand-1.5.0
- fat-macho-0.4.4
- filetime-0.2.15
- flate2-1.0.22
- fnv-1.0.7
- form_urlencoded-1.0.1
- fs-err-2.6.0
- futures-0.3.18
- futures-channel-0.3.18
- futures-core-0.3.18
- futures-executor-0.3.18
- futures-io-0.3.18
- futures-lite-1.12.0
- futures-macro-0.3.18
- futures-sink-0.3.18
- futures-task-0.3.18
- futures-util-0.3.18
- generic-array-0.14.4
- getrandom-0.2.3
- gimli-0.26.1
- glob-0.3.0
- globset-0.4.8
- goblin-0.4.3
- h2-0.3.7
- hashbrown-0.11.2
- heck-0.3.3
- hermit-abi-0.1.19
- hkdf-0.10.0
- hmac-0.10.1
- http-0.2.5
- http-body-0.4.4
- httparse-1.5.1
- httpdate-1.0.2
- human-panic-1.0.3
- humantime-1.3.0
- hyper-0.14.15
- hyper-rustls-0.22.1
- idna-0.2.3
- ignore-0.4.18
- indexmap-1.7.0
- indoc-1.0.3
- instant-0.1.12
- ipnet-2.3.1
- itoa-0.4.8
- js-sys-0.3.55
- keyring-0.10.4
- lazy_static-1.4.0
- libc-0.2.108
- log-0.4.14
- mailparse-0.13.6
- matches-0.1.9
- memchr-2.4.1
- mime-0.3.16
- mime_guess-2.0.3
- minijinja-0.8.2
- miniz_oxide-0.4.4
- mio-0.7.14
- miow-0.3.7
- nb-connect-1.2.0
- nix-0.17.0
- ntapi-0.3.6
- num-0.3.1
- num-bigint-0.3.3
- num-complex-0.3.1
- num-integer-0.1.44
- num-iter-0.1.42
- num-rational-0.3.2
- num-traits-0.2.14
- num_cpus-1.13.0
- object-0.27.1
- once_cell-1.8.0
- opaque-debug-0.3.0
- os_type-2.3.0
- parking-2.0.0
- percent-encoding-2.1.0
- pin-project-lite-0.2.7
- pin-utils-0.1.0
- pkg-config-0.3.22
- plain-0.2.3
- platform-info-0.2.0
- polling-2.2.0
- ppv-lite86-0.2.15
- pretty_env_logger-0.4.0
- proc-macro-crate-0.1.5
- proc-macro-crate-1.1.0
- proc-macro-error-1.0.4
- proc-macro-error-attr-1.0.4
- proc-macro2-1.0.32
- pyproject-toml-0.3.1
- python-pkginfo-0.5.0
- quick-error-1.2.3
- quote-1.0.10
- quoted_printable-0.4.5
- rand-0.8.4
- rand_chacha-0.3.1
- rand_core-0.6.3
- rand_hc-0.3.1
- redox_syscall-0.2.10
- redox_users-0.4.0
- regex-1.5.4
- regex-syntax-0.6.25
- remove_dir_all-0.5.3
- reqwest-0.11.6
- rfc2047-decoder-0.1.2
- ring-0.16.20
- rpassword-5.0.1
- rustc-demangle-0.1.21
- rustls-0.19.1
- ryu-1.0.6
- same-file-1.0.6
- scoped-tls-1.0.0
- scroll-0.10.2
- scroll_derive-0.10.5
- sct-0.6.1
- secret-service-2.0.1
- security-framework-2.4.2
- security-framework-sys-2.4.2
- semver-1.0.4
- serde-1.0.130
- serde_derive-1.0.130
- serde_json-1.0.72
- serde_repr-0.1.7
- serde_urlencoded-0.7.0
- sha2-0.9.8
- shlex-1.1.0
- slab-0.4.5
- smawk-0.3.1
- socket2-0.4.2
- spin-0.5.2
- static_assertions-1.1.0
- strsim-0.8.0
- structopt-0.3.25
- structopt-derive-0.4.18
- subtle-2.4.1
- syn-1.0.82
- tar-0.4.37
- target-lexicon-0.12.2
- tempfile-3.2.0
- termcolor-1.1.2
- terminal_size-0.1.17
- textwrap-0.11.0
- textwrap-0.14.2
- thiserror-1.0.30
- thiserror-impl-1.0.30
- thread_local-1.1.3
- time-0.1.43
- tinyvec-1.5.1
- tinyvec_macros-0.1.0
- tokio-1.14.0
- tokio-rustls-0.22.0
- tokio-util-0.6.9
- toml-0.5.8
- tower-service-0.3.1
- tracing-0.1.29
- tracing-core-0.1.21
- try-lock-0.2.3
- typenum-1.14.0
- unicase-2.6.0
- unicode-bidi-0.3.7
- unicode-linebreak-0.1.2
- unicode-normalization-0.1.19
- unicode-segmentation-1.8.0
- unicode-width-0.1.9
- unicode-xid-0.2.2
- unindent-0.1.7
- untrusted-0.7.1
- url-2.2.2
- uuid-0.8.2
- vec_map-0.8.2
- version_check-0.9.3
- void-1.0.2
- waker-fn-1.1.0
- walkdir-2.3.2
- want-0.3.0
- wasi-0.10.2+wasi-snapshot-preview1
- wasm-bindgen-0.2.78
- wasm-bindgen-backend-0.2.78
- wasm-bindgen-futures-0.4.28
- wasm-bindgen-macro-0.2.78
- wasm-bindgen-macro-support-0.2.78
- wasm-bindgen-shared-0.2.78
- web-sys-0.3.55
- webpki-0.21.4
- webpki-roots-0.21.1
- wepoll-ffi-0.1.2
- winapi-0.3.9
- winapi-i686-pc-windows-gnu-0.4.0
- winapi-util-0.1.5
- winapi-x86_64-pc-windows-gnu-0.4.0
- winreg-0.7.0
- xattr-0.2.2
- zbus-1.9.1
- zbus_macros-1.9.1
- zeroize-1.4.3
- zip-0.5.13
- zvariant-2.10.0
- zvariant_derive-2.10.0"
-CRATES_TEST="
- indoc-0.3.6
- indoc-impl-0.3.6
- libc-0.2.107
- lock_api-0.4.5
- parking_lot-0.11.2
- parking_lot_core-0.8.5
- paste-0.1.18
- paste-impl-0.1.18
- proc-macro-hack-0.5.19
- pyo3-0.15.1
- pyo3-build-config-0.15.1
- pyo3-macros-0.15.1
- pyo3-macros-backend-0.15.1
- scopeguard-1.1.0
- smallvec-1.7.0
- syn-1.0.81"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cargo distutils-r1 flag-o-matic
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://maturin.rs/"
-SRC_URI="
- https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- $(cargo_crate_uris)
- test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-
-LICENSE="
- 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl
- doc? ( CC-BY-4.0 OFL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="
- doc? ( app-text/mdbook )
- test? (
- dev-python/cffi[${PYTHON_USEDEP}]
- dev-python/boltons[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- )"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- # use setup.py only for pure python and handle cargo manually
- sed -i 's/cmdclass.*/packages=["'${PN}'"],/' setup.py || die
-
- if use test; then
- # used to prevent use of network during tests
- cat > "${T}"/pip.conf <<-EOF || die
- [install]
- no-index = yes
- no-dependencies = yes
- EOF
-
- # run plain 'python' from eclass rather than auto-detect 'python3.x'
- sed -i 's/"build",/&"-i","python",/' tests/common/integration.rs || die
- fi
-}
-
-python_configure_all() {
- filter-flags '-flto*' # undefined references with ring crate
-
- cargo_src_configure
-}
-
-python_compile_all() {
- cargo_src_compile
-
- use !doc || mdbook build -d html guide || die
-}
-
-python_test() {
- local -x PIP_CONFIG_FILE=${T}/pip.conf
- local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
-
- cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock \
- --test-threads 1 #825242
-}
-
-python_install_all() {
- cargo_src_install
-
- dodoc -r Changelog.md Readme.md $(usev doc guide/html)
-}
diff --git a/dev-util/pahole/pahole-1.22.ebuild b/dev-util/pahole/pahole-1.22.ebuild
index 6e645bb8300e..90c3dc91f27b 100644
--- a/dev-util/pahole/pahole-1.22.ebuild
+++ b/dev-util/pahole/pahole-1.22.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
LICENSE="GPL-2" # only
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="debug"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 2eefbfb21056..247fe251e9f5 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,3 +1,3 @@
DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
-DIST patchelf-0.12.tar.gz 103075 BLAKE2B 8ea71eb75bcc40e18a168c1e65856809fcceb8f68a9939e5248464d8c2e5d14d4eb1278965727417a26e70734712121d057c3da689be397f93bdb5234a11d5ba SHA512 2563a5b22b90392d5755d9a08022daf8570fa1b741becbbca92548d0a2f82f7ee21175a2c34816a4653c89c2219bf59b1440304b0fa2d49842e398ab18b9923c
DIST patchelf-0.13.tar.gz 117997 BLAKE2B 5db88c9ff9103f2e4b8e15d7dc0d677c3956a85ce5e86e371c4c32a21c3bc219990edd71a20a6b650342eff1068c0ba0976529d62d21dcc17dfc020abf7167ec SHA512 0b4cb41dc1b76d1c0f46655d8b1c56187d2bf18fa12fad9ad6e8acd321a98df372713a92c6649479498bb5939c91ce16a1032ec03afc5a2f7c92cd68882c2bd9
+DIST patchelf-0.14.3.tar.gz 123722 BLAKE2B ca9c28c88ff6a5eb37a8cb9010642f04335b74e2132987f34bc167c140dc95cd4ac7a3ed71b7287d952a0201b12148a15f3066e5c7d3d453cc18a1e97b6283ed SHA512 2f5caa6b038e630896dc0cebaf4d6f88d91f6dee7f2ffa2fc6b90d199b3a0140b7fe39ea43e582f7ac1145309a61e11fb7ce36c579ad217c48f1b189738f79c8
diff --git a/dev-util/patchelf/patchelf-0.12.ebuild b/dev-util/patchelf/patchelf-0.14.3.ebuild
similarity index 73%
rename from dev-util/patchelf/patchelf-0.12.ebuild
rename to dev-util/patchelf/patchelf-0.14.3.ebuild
index b3d5fb270ec6..e66de9a4aec2 100644
--- a/dev-util/patchelf/patchelf-0.12.ebuild
+++ b/dev-util/patchelf/patchelf-0.14.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="https://nixos.org/patchelf.html"
+HOMEPAGE="https://github.com/NixOS/patchelf"
SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
@@ -22,9 +22,3 @@ src_prepare() {
eautoreconf
}
-
-src_test() {
- emake check \
- CFLAGS+=" -no-pie" \
- CXXFLAGS+=" -no-pie"
-}
diff --git a/dev-util/sysdig-kmod/metadata.xml b/dev-util/sysdig-kmod/metadata.xml
index c8c6735782b0..6e469632db79 100644
--- a/dev-util/sysdig-kmod/metadata.xml
+++ b/dev-util/sysdig-kmod/metadata.xml
@@ -1,10 +1,7 @@
-
- mgorny@gentoo.org
- Michał Górny
-
+
draios/sysdig
diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
index 2104ee1011ac..8e4769903018 100644
--- a/dev-util/sysdig/metadata.xml
+++ b/dev-util/sysdig/metadata.xml
@@ -1,10 +1,7 @@
-
- mgorny@gentoo.org
- Michał Górny
-
+