Sync with portage [Wed Apr 20 09:47:31 MSK 2022].

app-admin/hcloud/Manifest

@@ -1,2 +1,2 @@
 DIST hcloud-1.29.0.tar.xz 1499276 BLAKE2B 3ec9973fc3ecaf5ec476b2d165fc1663f4d6cd2c00c4c87efc72f3946d1d6028f9a2d20f80020203b1f8f2aa94512a1d02e05b54e9422f5b84826eb8bb552490 SHA512 b5b1e20785fc8a06954a753dbd6c5d91b2b557d0e64cb044ab55cbfb11f0fd7d0a2eb625a51e1216af86cad6f772a206d3b0ef443f256649dba38d199614d41d
-DIST hcloud-1.29.4.tar.xz 1417068 BLAKE2B 88a26d771cd0b7b603bce7de8e8e299dceecf931b8fd7bfa1e734134200cb4f2c6d0598f8253024179ba3a4df87d182418f2ceb8b230af48f82cc6be9720ef6b SHA512 409de5fc334fa725c9b314cf9a327976da043af675b704c8ee4d1bb7e42d70607722891deb9ff2b5b1298b7a38d8ce4b0063a10d64c5d1fe2be03f4c8c794c25
+DIST hcloud-1.29.5.tar.xz 1416952 BLAKE2B 4b1c9e1df9bb3fdb63c28890e7f9cfb8c4c628fd22b765d8265e63415b8feee0466f32fd6a87a5cd981d231f93a60c28c140c1efa7ea33c327b234f1a4d6b0cf SHA512 fbe395c47cf1bef800c162b8c44359dab173c636ec4d7e8e4629fa95b323731c7c3d8a9045dd77692b7beb8a3554cdce567f2285640a5b410262be69442fe99e

app-admin/mcelog/Manifest

@@ -1 +1,2 @@
 DIST mcelog-180.tar.gz 314605 BLAKE2B 0cf4f25dc26901bee56ddd437ad3d56874ba70f2323d9d6821432bf744b78392e871c9632e44a7bef7a1954eb6605cf72f6d9268397741cecd5066b6bcafe54a SHA512 89b2b1c2f7ab03bb358926f10fa2c3e8f048bb5cf2d6f4453de63ecfd44daebe771087522c69ade5638248ab79c80122448efef798e4ea8d1a5f88308e8bfd32
+DIST mcelog-181.tar.gz 314690 BLAKE2B 4e182c84ae15abf3673e0210940830c66377b275e05c0bf88ff2199ef1b87bf1e9bcff12ebd9c07e5af00d763369c96aae37c274174563fb3ae0db7bbd7306de SHA512 70f0a923bfc0a941b2a70501dd89b8634be52f51c98ab482b212e337684620165f71420205bd779039fe7704e230eb35e47c77802109242dc401803613393bb9

app-admin/mcelog/mcelog-181.ebuild

@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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
+}

app-admin/puppet-agent/Manifest

@@ -2,3 +2,5 @@ DIST puppet-agent_7.14.0-1focal_amd64.deb 20339972 BLAKE2B 3e7a230e73c1eb7d96317
 DIST puppet-agent_7.14.0-1focal_arm64.deb 19534676 BLAKE2B a809b4beb8c20ce2e45f1c2c552585403494ed2c0eca719077597106fcb91478bfe7cb12bcb420e5b093840fe41f4ae101c978df48690ea47940216dda7b293e SHA512 4d57fe41d6943b3b6d643f55aead3264ed4f4aedd280e8fc0ed8504a1f7e0da1e9a06e9d7e2b4916f2de2c6726b3dcff3ce8096d02503443ad6e74b0528177bc
 DIST puppet-agent_7.15.0-1focal_amd64.deb 20342292 BLAKE2B 4d8a322182b10462353b4fb78b8a655765e6b91e31626c34126862cf27d7863ed6dcfdf6d8545c9bfb2be25e42bd0f3f34c5726885dc6508eb71aa09646e647a SHA512 b6887ef66c47fcfce7136e13ff96f7a8df8b11011fd9ec8cb01a79d8a7f7b77e43da63033d9c42446c4131ffe04e8bfaf5bdf70ba1cb6c37dcd1d6963024ef29
 DIST puppet-agent_7.15.0-1focal_arm64.deb 19533904 BLAKE2B 234fc85f20df8bba9d1f33e84ac725326201984c041ab371dd645df2e6cce12b6c81481ceff01819dc884d3c8f6191d6e98aafbb78a6856733b4cc3255d0e905 SHA512 70f389bc29270317fc621ef7be2eea9764b490ae2da32fb3968bd2c966eec53ef7e65469ea7fd5069676e23feede48557575b9020783b50292b146cc17ae840e
+DIST puppet-agent_7.16.0-1focal_amd64.deb 20349200 BLAKE2B 73a5bc404b988fc009b95e25ab906afdc56cf8a9b977d0974177bdd5dcf9c0882f10d7e56f05c054f2ff1ea89824879671f857d1f1bf41d4f725ae90994d24ac SHA512 57d58b0a4ea74f461e7820e1f99838eb3c357f1be5277623ce8bb5cdf6aa46696d53db7c64c16ede972bc01660f30ea19111d2495087032d412672564b8612f8
+DIST puppet-agent_7.16.0-1focal_arm64.deb 19543124 BLAKE2B 2a946462ddf1344f05f21c5c5f0a3ad4a1b92fa0b386d405b6cb563b0cb3de0a06ad8212d6001f10ed7afe2d7787d1107732a5890e48de99a32cec802d78d16d SHA512 74db9defefe8aa91daaac8337dd500cf2582c017eab34f61992630a30dc9b2ef62ae5aba21b9ee94f30b6f92e99557e61da742711bba7df8200b3eca5a06f748

app-admin/puppet-agent/puppet-agent-7.16.0.ebuild

@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd unpacker tmpfiles
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
+arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+# virtual/libcrypt:= is in here despite being a pre-built package
+# to ensure that the has_version logic for the symlink doesn't become stale
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet
+	virtual/libcrypt:="
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt[compat]
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+
+	# Handling of the path to the crypt library during the ongoing migration
+	# from glibc[crypt] to libxcrypt
+	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
+	if has_version "sys-libs/glibc[crypt]"; then
+		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
+	else
+		local crypt_target='../../../../usr/lib/libcrypt.so.1'
+	fi
+	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}

app-admin/puppet/Manifest

@@ -1,3 +1,4 @@
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-7.14.0.tar.gz 2816077 BLAKE2B c4aacf7179208e801fad2aa384691e38ca4bd1329819d4ca15b7a3cf25c5787e8adef12c91d233c5adbc301ab77cdf9748f094a1904c78c62d6ac73dafb4a634 SHA512 36aaa9c8cce9d1c40e77eee1e3544c0b0c665bbfa3b8184401905d6f15c142be8490421af0dac57856849de343b288f67153c551db68f8cea9e0ed3ad251feb3
 DIST puppet-7.15.0.tar.gz 2817137 BLAKE2B ce76ad71251a9202d31e858706eb994c6210cbe97f31e56d95b8c36d541d0ce8d1e65ab33d399e7dca1c5ea8e7f4dfccb3a2a4d36baaed6ca31516b7e449bf2a SHA512 0d68bda85a5f61fdb74c3e70304d414afef238dff4f7a4cd60c17f5cc26fcb18ba7f81065d6295adde33bc181031b458d259daa84a41156c9589f5c0e3cb8951
+DIST puppet-7.16.0.tar.gz 2817116 BLAKE2B d367005ea69ceb0f89f4294e74639ad61305f23929e5edf0385eb2cce5da76fa157c5bc7408599dcca4d9adba39c3b29250e78d8f584873f72bb34452a90a74d SHA512 b1f3c6072821225c9068089f44ad9ab955534f2d91bf88b44f762e0588442b9d6191eb89909dc05b7efc3a82302d2d3dc5a5a040fbc84f81645817d695b4db72

app-admin/puppet/puppet-7.16.0.ebuild

@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"
+		dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}

app-admin/puppetdb/Manifest

@@ -1,2 +1,3 @@
 DIST puppetdb-7.10.0.tar.gz 48764663 BLAKE2B 912f779f8d409936122030469152865b50ce71c9b41dee6df1e2f9ada48a1be6ea2a5aa5901a95111cf18e9bd971753839fc461c993f9ffd1c82c367eff9aa7d SHA512 84a8b5071fe7db24b37245c6a1c0215f7720a1bb72aca7531f7957fd65cebe2f7b3090e913be0c4a68d9f94d19f739f23837bd858ad61ad1706b76b18fe5b0b0
+DIST puppetdb-7.10.1.tar.gz 48769606 BLAKE2B 80686ab0ac16e71bd3758b55e10a4f59d29d1a954d62dc576af61777755384a24a3dde08fdb3f9159cf0d888377140cc13cee0c48904382ee2312300c6e8aa32 SHA512 cedebaa1f94e0f100dd9bac5f63a4bbaa19189a01abac011708de835e6a06d6222027f05a15ad2722261072154ebe9efd8f30de171b6f8640ee369dd51feb846
 DIST puppetdb-7.9.0.tar.gz 48143509 BLAKE2B bd08f4127cd68080c7c7f2b9acd571a2fd0e6af4cc36b920eca5e420a2149dbc1c5dcfbb5ac152730e88b0e751f5acd42c5e8c2457673ccbba26fc40258c07d5 SHA512 b24a3233a08fe80c5e3b78bc05262cefb27c6d307cbd8f98c74766157db72d15c0f114c5c3cccd7733b9bb99ff9c7f229b6625af5e7b2ce7b6d349322507654d

app-admin/puppetdb/puppetdb-7.10.1.ebuild

@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="PuppetDB collects data generated by Puppet"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	doins ext/config/conf.d/auth.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetdb.conf
+
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}

app-admin/puppetserver/Manifest

@@ -1,2 +1,3 @@
 DIST puppetserver-7.6.0.tar.gz 63322828 BLAKE2B 252ad828b4066a1b928c17f3b7a62c08e46f969abcd046a5e5a9b2e03856d0a336f1c3c85474323095c43b5bd61c47b48f7aa811ca58e2917b0d70256cdbcde8 SHA512 8c00380a814a9722aaa2b2125124635aa1983ad4dc028a59d9f2dd9789f79f81a2c9a76447fa34b029ba87a48502e8db5ded597d054f11250c403a4058d810db
 DIST puppetserver-7.6.1.tar.gz 64646806 BLAKE2B 4905504e68ee2dbbe0705553da3ee73826dc6bd50cc9ea8e62f3a4f9b5f67e53e829a0faa465fcf3b76dd85288eef71e472f272b0506c5e951b5d88df4274c9f SHA512 5a76e0053f41bf51cb0c4f79a6785e7759ba4ecaeadb84ce3dc777a288910d355bbeb0efc438eb3fddc09b7f7471526124bbfd076bff9091eecb341f3958130b
+DIST puppetserver-7.7.0.tar.gz 64646018 BLAKE2B 7ce0dfc469705093107f3761c25119a488fffd0bf95112108b86fd0bbaf923d090712c0612d0efb8226059645b15386593fcc5b5c13b0881a9ffd36b714a7d50 SHA512 f56a94cfb75f2e95aef4947b2e755cda1ba4b3a1f646f14525c2ed2434c49da7d71b5dc2766bae727dcc307e06e2c56df80682b2376d8379b7c291a319a37ed1

app-admin/puppetserver/puppetserver-7.7.0.ebuild

@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords in puppet-agent (puppet-agent now has arm64)
+KEYWORDS="~amd64"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	keepdir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetserver.conf
+
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}

app-emacs/cask/Manifest

@@ -0,0 +1 @@
+DIST cask-0.8.8.tar.gz 348574 BLAKE2B 9eb2b18b6082a3500642660eebb471bff3bcbb00656a8a3c66bede3cf756e738b1cb8affbdeed97373bbdc0031d093a6ad5c7e4659e14732fbc531a416c78b99 SHA512 2708fa431dc17cb5d4fe56f0c73c3089a213d8ff0bca19091ab4ebf26c4e416c0a500a980daa424bf16b54d0e72b004762f5260329189eb4f8e803de38bc0ace

app-emacs/cask/cask-0.8.8.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Project management for Emacs package development"
+HOMEPAGE="https://github.com/cask/cask/"
+SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"  # Most tests fail
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/epl
+	app-emacs/f
+	app-emacs/package-build
+	app-emacs/s
+	app-emacs/shut-up
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org cask_small.png )
+PATCHES=(
+	"${FILESDIR}"/${PN}-bin-launcher-fix.patch
+	"${FILESDIR}"/${PN}-no-bootstrap.patch
+)
+
+ELISP_REMOVE="${PN}-bootstrap.el
+	package-build-legacy.el package-recipe-legacy.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i bin/${PN} || die
+}
+
+src_install() {
+	elisp_src_install
+
+	dobin bin/${PN}
+}

app-emacs/cask/files/50cask-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/cask/files/cask-bin-launcher-fix.patch

@@ -0,0 +1,24 @@
+diff --git a/bin/cask b/bin/cask
+index 55d4d86..37a5c9c 100755
+--- a/bin/cask
++++ b/bin/cask
+@@ -39,17 +39,7 @@ case $subcommand in
+ 	*)
+ 		WHICH=${WHICH:-which}
+ 		READLINK=$($WHICH readlink || true)
+-		if [ "$(uname || true)" == "Darwin" ] ; then
+-			READLINK=
+-		fi
+-		READLINK=${READLINK:-$($WHICH greadlink || true)}
+-		if [ ! -z "$READLINK" ] ; then
+-			SRCDIR__=$($READLINK -f "$CASK")
+-		else
+-			SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK")
+-		fi
+-		SRCDIR_=$(dirname "$SRCDIR__")
+-		SRCDIR=$(dirname "$SRCDIR_")
+-		"$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
++		SRCDIR="@SITELISP@"
++		"$EMACS" -q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
+ 		;;
+ esac

app-emacs/cask/files/cask-no-bootstrap.patch

@@ -0,0 +1,43 @@
+diff --git a/cask-cli.el b/cask-cli.el
+index f97a28a..eda6d8f 100644
+--- a/cask-cli.el
++++ b/cask-cli.el
+@@ -34,8 +34,7 @@
+       (or load-file-name byte-compile-current-file buffer-file-name)))
+     "Path to Cask root."))
+ 
+-(require 'cask-bootstrap (expand-file-name "cask-bootstrap" cask-directory))
+-(require 'cask (expand-file-name "cask" cask-directory))
++(require 'cask)
+ 
+ (when noninteractive
+   (shut-up-silence-emacs))
+diff --git a/cask.el b/cask.el
+index 7828f49..0bfc7ab 100644
+--- a/cask.el
++++ b/cask.el
+@@ -1,4 +1,4 @@
+-;;; cask.el --- Cask: Project management for package development  -*- lexical-binding: t; no-byte-compile: t -*-
++;;; cask.el --- Cask: Project management for package development  -*- lexical-binding: t -*-
+ 
+ ;; Copyright (C) 2012-2022 Johan Andersson
+ ;; Copyright (C) 2013 Sebastian Wiesner <swiesner@lunaryorn.com>
+@@ -45,7 +45,17 @@
+       (:else (buffer-file-name))))
+     "Path to Cask root."))
+ 
+-(require 'cask-bootstrap (expand-file-name "cask-bootstrap" cask-directory))
++(require 'ansi)
++(require 'cl-generic)
++(require 'cl-lib)
++(require 'commander)
++(require 'eieio)
++(require 'epl)
++(require 'f)
++(require 'package-build)
++(require 'package-recipe)
++(require 's)
++(require 'shut-up)
+ 
+ (setq package-build-verbose nil)        ; Make package-build quiet by
+                                         ; not allowing it to print any

app-emacs/cask/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/cask/cask/issues/</bugs-to>
+    <remote-id type="github">cask/cask</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/commander/Manifest

@@ -0,0 +1 @@
+DIST commander-0.7.0.tar.gz 37120 BLAKE2B 61e7262f7909d866f3890854cc695d1d8769ea54fa2a983d72a3e5b61217f1e898036026f71d8ae0d46e8d45af0b9e0e52c2f88d4f647dd50454877b9abd2946 SHA512 10d25d931f1faf88747c397594becc3832dfb56de7440ada2cd40e0329b0ca984eda77c62290329510ab87b53ac273e5d36e7acd628ff68ee0e981ccd9497d10

app-emacs/commander/commander-0.7.0.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Emacs command line parser"
+HOMEPAGE="https://github.com/rejeep/commander.el/"
+SRC_URI="https://github.com/rejeep/${PN}.el/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/s
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ecukes
+		app-emacs/el-mock
+		app-emacs/espuds
+	)
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test --eval "(require 'f)" \
+			 -l ${PN}-command-test.el -l ${PN}-config-test.el \
+			 -l ${PN}-init.el -l ${PN}-option-test.el -l ${PN}-test.el \
+			 -l ${PN}-usage-test.el -l ert-loader.el -l test-helper.el \
+			 -f ert-run-tests-batch-and-exit || die "tests failed"
+
+	ecukes --script features --debug || die
+}

app-emacs/commander/files/50commander-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/commander/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/rejeep/commander.el/issues/</bugs-to>
+    <remote-id type="github">rejeep/commander.el</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/ecukes/Manifest

@@ -0,0 +1 @@
+DIST ecukes-0.6.18.tar.gz 85246 BLAKE2B f4469f155c0f2ce4756e429df2690b1dda3bb2f38f7e5847d14e1d21d0b8170535a2203fafe66649fc8416d41b983f6bc7428f6b4c053dcf0f9372f0973c0b15 SHA512 6d3a16b8dbf021026be5d7134166079bb1495ad4fd6b7e30386aad56c0196c46cbd3ee541ec8c24d5b7e1bb26e3c14fe5f9423b50341867c50b92194139eca02

app-emacs/ecukes/ecukes-0.6.18.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Cucumber for Emacs"
+HOMEPAGE="https://github.com/ecukes/ecukes/"
+SRC_URI="https://github.com/ecukes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/dash
+	app-emacs/espuds
+	app-emacs/f
+	app-emacs/s
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( app-emacs/el-mock )
+"
+
+DOCS=( README.markdown )
+PATCHES=( "${FILESDIR}"/${PN}-bin-launcher-fix.patch )
+
+# Remove pkg file and failing tests
+ELISP_REMOVE="${PN}-pkg.el test/${PN}-parse-line-test.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i bin/${PN} || die
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-compile reporters/*.el
+}
+
+src_test() {
+	local i
+	for i in test/ecukes-*-test.el ; do
+		ebegin "Running tests from ${i}"
+		${EMACS} ${EMACSFLAGS} -L . -L test \
+				 --eval "(require 'cl)" \
+				 -l test/test-helper.el -l ${i} -l test/ecukes-test.el \
+				 -f ert-run-tests-batch-and-exit
+		eend $? || die "tests failed, last ran tests from ${i}"
+	done
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install ${PN}/reporters reporters/*.el{,c}
+
+	dobin bin/${PN}
+}

app-emacs/ecukes/files/50ecukes-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/ecukes/files/ecukes-bin-launcher-fix.patch

@@ -0,0 +1,31 @@
+index 45ea622..b20754e 100755
+--- a/bin/ecukes
++++ b/bin/ecukes
+@@ -33,7 +33,7 @@
+ # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-2022, USA.
+ 
+-ECUKES_HOME=$(dirname "$(dirname "$BASH_SOURCE")")
++ECUKES_HOME="@SITELISP@"
+ ECUKES_CLI=$ECUKES_HOME/ecukes-cli.el
+ 
+ if [[ -n "$INSIDE_EMACS" ]]; then
+@@ -60,9 +60,9 @@ if has_option "--win" $@ || has_option "--no-win" $@ ; then
+   export ECUKES_OUTFILE=$(mktemp /tmp/ecukes.XXX)
+ 
+   if has_option "--win" $@; then
+-    "$ECUKES_EMACS" --load "$ECUKES_CLI" -Q
++    "$ECUKES_EMACS" --load "$ECUKES_CLI" -q
+   else
+-    "$ECUKES_EMACS" -nw --load "$ECUKES_CLI" -Q
++    "$ECUKES_EMACS" -nw --load "$ECUKES_CLI" -q
+   fi
+ 
+   STATUS=$?
+@@ -72,5 +72,5 @@ if has_option "--win" $@ || has_option "--no-win" $@ ; then
+ 
+   exit $STATUS
+ else
+-  "$ECUKES_EMACS" --script "$ECUKES_CLI" -Q
++  "$ECUKES_EMACS" --script "$ECUKES_CLI" -q
+ fi

app-emacs/ecukes/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/ecukes/ecukes/issues/</bugs-to>
+    <remote-id type="github">ecukes/ecukes</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/emojify/emojify-1.2.ebuild

@@ -16,7 +16,7 @@ S="${WORKDIR}"/emacs-${P}
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test"  # requires some (5) unpackaged Emacs testing tools
+RESTRICT="test"  # Tests fail
 
 RDEPEND="app-emacs/ht"
 BDEPEND="${RDEPEND}"

app-emacs/epl/epl-0.9-r1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-NEED_EMACS="24"
+NEED_EMACS=24
 
 inherit elisp
 
@@ -11,10 +11,17 @@ DESCRIPTION="A convenient high-level API for package.el"
 HOMEPAGE="https://github.com/cask/epl"
 SRC_URI="https://github.com/cask/epl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test" # test requires cask and ert-runner which are not packaged
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/ert-runner )"
 
-SITEFILE="50epl-gentoo.el"
 DOCS=( README.md )
+SITEFILE="50epl-gentoo.el"
+
+src_test() {
+	ert-runner || die
+}

app-emacs/ert-async/Manifest

@@ -0,0 +1 @@
+DIST ert-async-0.1.2_p20200105.tar.gz 14434 BLAKE2B e15d041582beef803d4033e2cad100905c8dff0afc768ea68aafe2d610c13603d7a8f4ed66caf62814964880ea6b0729f4ae3dbc19af6a784b2f69eb3a779097 SHA512 a683a3ab81ac361f2cd852a9ca8a98f7e4994e61c15921bcf6593985c7e59dc171766d7538b81785b44c3142511c25b8d418505365240a9efa7879554ac6624c

app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=948cf2faa10e085bda3739034ca5ea1912893433
+NEED_EMACS=24.1
+
+inherit elisp
+
+DESCRIPTION="Async support for ERT"
+HOMEPAGE="https://github.com/rejeep/ert-async.el/"
+SRC_URI="https://github.com/rejeep/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"

app-emacs/ert-async/files/50ert-async-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/ert-async/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/rejeep/ert-async.el/issues/</bugs-to>
+    <remote-id type="github">rejeep/ert-async.el</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/ert-runner/Manifest

@@ -0,0 +1 @@
+DIST ert-runner-0.8.0.tar.gz 36263 BLAKE2B 8eceabea446ffde87c10cd5257264b61ad2e2617cd9a3243c9be5548298a61d5872b46359a798180e3bf450fc8c474f4651fb834959c30f93df807d4ba006401 SHA512 a8d17c10b7c4db3fb784725c22d382e7cf213c7a6bc320658b64f1aaf9597cfe9cedc436771ade239cc9ad59e0d3457c257ce9342f9bee8a3fd65f76eb6d9e9b

app-emacs/ert-runner/ert-runner-0.8.0.ebuild

@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Opinionated Emacs Ert testing workflow"
+HOMEPAGE="https://github.com/rejeep/ert-runner.el/"
+SRC_URI="https://github.com/rejeep/${PN}.el/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # Needs Cask
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/dash
+	app-emacs/shut-up
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}"/${PN}-bin-launcher-fix.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i bin/${PN} || die
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-compile reporters/*.el
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install ${PN}/reporters reporters/*.el{,c}
+
+	dobin bin/${PN}
+}

app-emacs/ert-runner/files/50ert-runner-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/ert-runner/files/ert-runner-bin-launcher-fix.patch

@@ -0,0 +1,30 @@
+index 97d4ff4..fc14077 100755
+--- a/bin/ert-runner
++++ b/bin/ert-runner
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env bash
+ 
+-ERT_RUNNER="$(dirname $(dirname $0))/ert-runner.el"
++ERT_RUNNER="@SITELISP@/ert-runner.el"
+ 
+ function inside_emacs_24 {
+   if [[ -n $INSIDE_EMACS ]] &&
+@@ -31,9 +31,9 @@ if has_option "--win" $@ || has_option "--no-win" $@ ; then
+   export ERT_RUNNER_OUTFILE=$(mktemp /tmp/ert-runner.XXX)
+ 
+   if has_option "--win" $@; then
+-    "$ERT_RUNNER_EMACS" --load "$ERT_RUNNER" -Q
++    "$ERT_RUNNER_EMACS" --load "$ERT_RUNNER" -q
+   else
+-    "$ERT_RUNNER_EMACS" -nw --load "$ERT_RUNNER" -Q
++    "$ERT_RUNNER_EMACS" -nw --load "$ERT_RUNNER" -q
+   fi
+ 
+   STATUS=$?
+@@ -43,5 +43,5 @@ if has_option "--win" $@ || has_option "--no-win" $@ ; then
+ 
+   exit $STATUS
+ else
+-  "$ERT_RUNNER_EMACS" --script "$ERT_RUNNER" -Q
++  "$ERT_RUNNER_EMACS" --script "$ERT_RUNNER" -q
+ fi

app-emacs/ert-runner/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/rejeep/ert-runner.el/issues/</bugs-to>
+    <remote-id type="github">rejeep/ert-runner.el</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/espuds/Manifest

@@ -0,0 +1 @@
+DIST espuds-0.3.3_p20171111.tar.gz 48779 BLAKE2B de97a922f82a19ee5a6229d4bfbc43baeb8da6a234f7add6f44fe2848657b9587f5471688733a0d9e2d95878408fe462d826a18e6701f15253bcd29cb1687d0d SHA512 34b1f2bfabd24072d30be4df02eceafa833b357c24a2a1c6cc868ce2a72d413d5b2686734f74a27cb2875ad45a7248823efbb2930f1cb89b95ef813100611281

app-emacs/espuds/espuds-0.3.3_p20171111.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=78fc53feaf77a98d63894cd410faee2a18107b00
+
+inherit elisp
+
+DESCRIPTION="Common step definitions for Emacs Ecukes"
+HOMEPAGE="https://github.com/ecukes/espuds/"
+SRC_URI="https://github.com/ecukes/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # Tests fail
+
+RDEPEND="
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/s
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"

app-emacs/espuds/files/50espuds-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/espuds/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/ecukes/espuds/issues/</bugs-to>
+    <remote-id type="github">ecukes/espuds</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild

@@ -16,11 +16,19 @@ S="${WORKDIR}"/emacs-${PN}-${H}
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="test"  # requires Cask
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-emacs/s"
-BDEPEND="${RDEPEND}"
+BDEPEND="
+	${RDEPEND}
+	test? ( app-emacs/buttercup )
+"
 
 DOCS=( CHANGELOG.md README.org )
-ELISP_REMOVE="eglot-fsharp.el"
+ELISP_REMOVE="eglot-fsharp.el test/integration-tests.el"
 SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	buttercup -L . -L test --traceback full || die
+}

app-emacs/noflet/Manifest

@@ -0,0 +1 @@
+DIST noflet-0.0.15_p20141102.tar.gz 3123 BLAKE2B 0886da1af599e8ca226fbbefa31b6130c76d704d62c5323803543c31e975c375c1cfc12a5a3cfb5e2491488a31fce5538ab80f826de43fa4c77bdc7e8bd84315 SHA512 7007cb09f3ceaba652042a1ba9ff669e73b0a01775de573f0cfab33eef963e7b9125bb16ce1cd809479ea3ec0277eeed757a716538b1ca1f5b559b1ecdf7ed73

app-emacs/noflet/files/50noflet-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/noflet/files/noflet-fix-requires.patch

@@ -0,0 +1,28 @@
+index 58d3b8d..c003987 100644
+--- a/noflet.el
++++ b/noflet.el
+@@ -28,10 +28,8 @@
+ 
+ ;;; Code:
+ 
+-(eval-when-compile (require 'cl))
+-(if (version< emacs-version "24.4.1")
+-    (load-library "cl-indent")
+-    (require 'cl-indent))
++(require 'dash)
++(require 'cl-lib)
+ 
+ (defun noflet|base ()
+   "A base function."
+index 58d3b8d..73f0719 100644
+--- a/noflet.el
++++ b/noflet.el
+@@ -155,7 +155,7 @@ maintainers refuse to add the correct indentation spec to
+            (indent noflet-indent-func))
+   `(cl-flet ,bindings ,@body))
+ 
+-(defmacro* letn (tag bindings &rest body)
++(cl-defmacro letn (tag bindings &rest body)
+   (declare (debug (sexp sexp &rest form))
+            (indent 2))
+   `(cl-labels ((,tag ,(-map 'car bindings) ,@body))

app-emacs/noflet/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/nicferrier/emacs-noflet/issues/</bugs-to>
+    <remote-id type="github">nicferrier/emacs-noflet</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/noflet/noflet-0.0.15_p20141102.ebuild

@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=7ae84dc3257637af7334101456dafe1759c6b68a
+
+inherit elisp
+
+DESCRIPTION="Dynamic, local advice for Emacs-Lisp code"
+HOMEPAGE="https://github.com/nicferrier/emacs-noflet/"
+SRC_URI="https://github.com/nicferrier/emacs-${PN}/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.creole )
+PATCHES=( "${FILESDIR}"/${PN}-fix-requires.patch )
+
+ELISP_REMOVE="let-while-tests.el"
+SITEFILE="50${PN}-gentoo.el"

app-emacs/package-build/Manifest

@@ -0,0 +1 @@
+DIST package-build-2.4.tar.gz 14768 BLAKE2B 404dff528b3240cc0052e3feb556c1f1e3e829e7bda5e2468d2034b19f998245c48c126f8f3c67b2687e3f43da223bc7b917abab056c978edd6dd46040743c2d SHA512 cc06afcf954b44322cd010e3c557ad6222d30f4f5e83e608d49d439ff0a78acadeb9f334da900478624cf4575e5abf3d3bd67590336729ebc16a70c4f9440d87

app-emacs/package-build/files/50package-build-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/package-build/metadata.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <bugs-to>https://github.com/melpa/package-build/issues/</bugs-to>
+    <remote-id type="github">melpa/package-build</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/package-build/package-build-2.4.ebuild

@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Tools for assembling a package archive"
+HOMEPAGE="https://github.com/melpa/package-build/"
+SRC_URI="https://github.com/melpa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"

app-emacs/pkg-info/pkg-info-0.6.ebuild

@@ -14,7 +14,7 @@ SRC_URI="https://github.com/emacsorphanage/pkg-info/archive/refs/tags/${PV}.tar.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test" # test requires cask and ert-runner which are not packaged
+RESTRICT="test"  # Tests fail
 
 RDEPEND=">=app-emacs/epl-0.8"
 

app-emacs/servant/Manifest

@@ -0,0 +1 @@
+DIST servant-0.3.0.tar.gz 5440 BLAKE2B 8ff804f01dc60daa5134c3a7bd872ba36508fc6bc94641acb5b10662cccdd808453d4a26ca23198291919ac7fafbfb5dcb727b9091a15ce7c98f7b54bd03caee SHA512 7c7dd448bc1164bb76f7b17c109ee7e1e489b7ef80d7b0cc04257fdcc99158500f9bfb3a733d1b6d879b69dc3a752165ea743044996993ed76fb02d71a6db44a

app-emacs/servant/files/50servant-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/servant/files/servant-bin-launcher-fix.patch

@@ -0,0 +1,13 @@
+diff --git a/bin/servant b/bin/servant
+index dc8fabe..0cfc72c 100755
+--- a/bin/servant
++++ b/bin/servant
+@@ -6,6 +6,6 @@ else
+   SERVANT_EMACS="${EMACS:-emacs}"
+ fi
+ 
+-SERVANT_HOME="$(dirname $(dirname $0))"
++SERVANT_HOME="@SITELISP@"
+ 
+-${SERVANT_EMACS} -Q --script "${SERVANT_HOME}/servant-cli.el" -- "$@"
++${SERVANT_EMACS} -q --script "${SERVANT_HOME}/servant-cli.el" -- "$@"

app-emacs/servant/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/cask/servant/issues/</bugs-to>
+    <remote-id type="github">cask/servant</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/servant/servant-0.3.0.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="ELPA server written in Emacs Lisp"
+HOMEPAGE="https://github.com/cask/servant/"
+SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"  # Tests fail
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/dash
+	app-emacs/epl
+	app-emacs/f
+	app-emacs/s
+	app-emacs/shut-up
+	app-emacs/web-server
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}"/${PN}-bin-launcher-fix.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i bin/${PN} || die
+}
+
+src_install() {
+	elisp_src_install
+
+	dobin bin/${PN}
+}

app-emacs/shell-split-string/Manifest

@@ -0,0 +1 @@
+DIST shell-split-string-0.1.tar.gz 3453 BLAKE2B 3907501aff6aeee821050980b0c65612e0b76bfc3dc98735d70b2bdabd4bd19d1225d4e5c85bc2910e795e53715d2dfc49b900c24f8ed6bb63751e8e25e41c89 SHA512 55b76a4664cecb1c894559efd8270a567868f1e758b55ea23480cfdb550009af0042d69302b7ac7b73eef54e01c01e9978bfb5421d2db3806a4054e3b7e8f893

app-emacs/shell-split-string/files/50shell-split-string-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/shell-split-string/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/10sr/shell-split-string-el/issues/</bugs-to>
+    <remote-id type="github">10sr/shell-split-string-el</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/shell-split-string/shell-split-string-0.1.ebuild

@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Split Strings Using Shell-Like Syntax"
+HOMEPAGE="https://github.com/10sr/shell-split-string-el/"
+SRC_URI="https://github.com/10sr/${PN}-el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-el-${PV}
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	emake emacs=${EMACS} test
+}

app-emacs/web-server/Manifest

@@ -0,0 +1 @@
+DIST web-server-0.1.2_p20210708.tar.gz 62215 BLAKE2B 66d3a3ed6ff20dd4029f7d5d226df2aead694d63ea07fa33e2ada7a04e75124c9ba31876668c4ba6afc42ed7ee717b804f871e519569d6f6461ab31847391b62 SHA512 2f64be98195bf2bd72a9a61495ff4f57c8bfd1be68c2a396f6f706ff4f0123c3492576e758059d16a320df9a6146d352f65506aa0d43573f497452a90a099b26

app-emacs/web-server/files/50web-server-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/web-server/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/eschulte/emacs-web-server/issues/</bugs-to>
+    <remote-id type="github">eschulte/emacs-web-server</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/web-server/web-server-0.1.2_p20210708.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=6357a1c2d1718778503f7ee0909585094117525b
+NEED_EMACS=24.1
+
+inherit elisp
+
+DESCRIPTION="Web server running Emacs Lisp handlers"
+HOMEPAGE="https://github.com/eschulte/emacs-web-server/"
+SRC_URI="https://github.com/eschulte/emacs-${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+DOCS=( README NOTES )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+
+	emake -C doc
+}
+
+src_test() {
+	emake EMACS=${EMACS} check
+}
+
+src_install() {
+	elisp_src_install
+
+	doinfo doc/${PN}.info
+	dodoc -r doc/${PN}
+
+	insinto ${SITEETC}/${PN}
+	doins -r examples
+}

app-emulation/libvirt/metadata.xml

@@ -5,6 +5,10 @@
 	<email>tamiko@gentoo.org</email>
 	<name>Matthias Maier</name>
 </maintainer>
+<maintainer type="person" proxied="yes">
+	<email>michal.privoznik@gmail.com</email>
+	<name>Michal Prívozník</name>
+</maintainer>
 <maintainer type="project">
 	<email>virtualization@gentoo.org</email>
 	<name>Gentoo Virtualization Project</name>

app-shells/bash/bash-5.2_beta.ebuild

@@ -5,8 +5,6 @@ EAPI=7
 
 # TODO on release:
 # - check READLINE_VER, obviously
-# - remove autotools/eautoreconf from readline ebuild
-# - tidy up is_release check in this ebuild for using system readline
 # (presumably there weren't always readline releases for bash RCs etc)
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
@@ -20,8 +18,8 @@ MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
 is_release() {
 	case ${PV} in
-	*_alpha*|*_beta*|*_rc*) return 1 ;;
-	*) return 0 ;;
+		9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
+		*) return 0 ;;
 	esac
 }
 [[ ${PV} != *_p* ]] && PLEVEL=0
@@ -42,11 +40,16 @@ patches() {
 }
 
 # The version of readline this bash normally ships with.
-READLINE_VER="8.2_beta"
+# Note: right now, we don't use the system copy of readline for bash for non-releases.
+READLINE_VER="8.2"
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif is_release ; then
 	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
 else
@@ -56,7 +59,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+if is_release ; then
 	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
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
@@ -95,9 +98,12 @@ pkg_setup() {
 }
 
 src_unpack() {
-	verify-sig_src_unpack
-
-	unpack ${MY_P}.tar.gz
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		verify-sig_src_unpack
+		unpack ${MY_P}.tar.gz
+	fi
 }
 
 src_prepare() {
@@ -167,8 +173,7 @@ src_configure() {
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=${READLINE_VER%%_*}
 
-	# TODO: Clean this up before 5.2 release
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]] || is_release ; then
+	if is_release ; then
 		# Use system readline only with released versions.
 		myconf+=( --with-installed-readline=. )
 	fi

app-shells/bash/bash-9999.ebuild

@@ -0,0 +1,285 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO on release:
+# - check READLINE_VER, obviously
+# (presumably there weren't always readline releases for bash RCs etc)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+is_release() {
+	case ${PV} in
+		9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
+		*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+			printf "${u}/${pn}-${pv}-patches/%s.asc " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for non-releases.
+READLINE_VER="8.2"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+if is_release ; then
+	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
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+#BDEPEND="virtual/yacc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		verify-sig_src_unpack
+		unpack ${MY_P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+
+	keepdir /etc/bash/bashrc.d
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+
+	if ! use readline ; then
+		# bug #432338
+		sed_args+=(
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}

app-text/enchant/enchant-2.3.3-r1.ebuild

@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	voikko? ( dev-libs/libvoikko )
 "
 RDEPEND="${COMMON_DEPEND}
-	!<app-text/enchant-1.6.1-r2:1
+	!<app-text/enchant-1.6.1-r2:0
 "
 DEPEND="${COMMON_DEPEND}
 	test? ( >=dev-libs/unittest++-2.0.0-r2 )

app-text/gspell/Manifest

@@ -1 +1,2 @@
+DIST gspell-1.10.0.tar.xz 432484 BLAKE2B aee73d1745720d7c5bef1264ca717866321696953a8c0f2a538e7c8ea2133b8c666b1521280fd6c4f1a9333f178b2559bc21e462f94f7e217480bd3cb5068068 SHA512 8c776f2ea388ab145bc53de112ddc8e737c65ce7be0518edfe695f3e677a89c57a4826eb0fcdc39c5023bd1839ebd60a6a25eb8ac8e3363d0c406994828b743f
 DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca

app-text/gspell/gspell-1.10.0.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=app-text/enchant-2.1.3:2
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	dev-libs/icu:=
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/dbus )
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		app-text/enchant:2[hunspell]
+		|| (
+			app-dicts/myspell-en[l10n_en(+)]
+			app-dicts/myspell-en[l10n_en-US(+)]
+		)
+	)
+"
+# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
+# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
+# however a different backend like hspell or nuspell + their en_US dict might be fine too,
+# but we don't support them at this time (2020-04-12) in enchant:2
+
+src_prepare() {
+	use vala && vala_setup
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx dbus-run-session emake check
+}

dev-db/postgresql/postgresql-14.2-r1.ebuild

@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT=$(ver_cut 1)
 

dev-db/sqlite/sqlite-3.38.1.ebuild

@@ -25,7 +25,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-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"
+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"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"

dev-lang/erlang/erlang-23.3.4.12.ebuild

@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="

dev-lang/erlang/erlang-24.3.3.ebuild

@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="

dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://luajit.org/download/${MY_P}.tar.gz"
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~arm64 -hppa -riscv -sparc"
+KEYWORDS="arm64 -hppa -riscv -sparc"
 IUSE="lua52compat static-libs"
 
 PATCHES=(

dev-lang/ruby/files/3.1/900-musl-coroutine.patch

@@ -1,28 +0,0 @@
-Adapted for Gentoo version 3.0.2
-
-From b570e7de87aaad8c903176d835e8124127f627b3 Mon Sep 17 00:00:00 2001
-From: Andrew Aladjev <aladjev.andrew@gmail.com>
-Date: Sat, 26 Sep 2020 12:58:06 +0300
-Subject: [PATCH] fixed default coroutine selection for musl
-
----
- configure.ac             | 5 ++++-
- coroutine/copy/Context.c | 2 ++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ab5d532c103b..084f0936c006 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2364,7 +2364,10 @@
-             rb_cv_coroutine=copy
-         ],
-         [
--            rb_cv_coroutine=ucontext
-+            AC_CHECK_FUNCS([getcontext swapcontext makecontext],
-+                [rb_cv_coroutine=ucontext],
-+                [rb_cv_coroutine=copy; break]
-+            )
-         ]
-     )
-     AC_MSG_RESULT(${rb_cv_coroutine})

dev-lang/rust-bin/rust-bin-1.59.0.ebuild

@@ -17,7 +17,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
 
 DEPEND=""

dev-lang/rust/rust-1.59.0.ebuild

@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ppc64 ~riscv ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"

dev-libs/libfilezilla/files/libfilezilla-0.37.1-pthread.patch

@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 14bb5d0..da45769 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,7 +120,7 @@ AC_CHECK_DECLS([pthread_condattr_setclock], [], [], [[#include <pthread.h>]])
+ if test "$windows" = "1"; then
+   libdeps="-lws2_32"
+ else
+-  libdeps=-lpthread
++  libdeps=-pthread
+   CHECK_ICONV([libdeps="$libdeps -liconv"])
+ 
+   CHECK_RANDOM

dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild

@@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/24" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
@@ -23,6 +23,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.37.1-pthread.patch )
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		if ! test-flag-CXX -std=c++14; then

dev-libs/libical/libical-3.0.14-r1.ebuild

@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="Implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/timezone-data
+"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		glib? ( dev-util/gtk-doc )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		${PYTHON_DEPS}
+		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
+	)
+	vala? ( $(vala_depend) )
+"
+
+DOCS=(
+	AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents.txt,UsingLibical.md}
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch"
+)
+
+python_check_deps() {
+	has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	use examples || cmake_comment_add_subdirectory examples
+	use vala && vala_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DICAL_GLIB=$(usex glib)
+		-DGOBJECT_INTROSPECTION=$(usex introspection)
+		-DSHARED_ONLY=$(usex !static-libs)
+		-DLIBICAL_BUILD_TESTING=$(usex test)
+		-DICAL_GLIB_VAPI=$(usex vala)
+	)
+	if use vala; then
+		mycmakeargs+=(
+			-DVALAC="${VALAC}"
+			-DVAPIGEN="${VAPIGEN}"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_src_compile docs
+
+		HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+	fi
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}

dev-libs/libuv/libuv-1.44.1.ebuild

@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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
 
 LICENSE="BSD BSD-2 ISC MIT"

dev-libs/ncnn/Manifest

@@ -1 +1,2 @@
 DIST ncnn-20210525.tar.gz 11578821 BLAKE2B 1b6dc67cb89e4761c6de256c8854c3969c553159c11713d9bbbe04abd027e9439ffb694e8129da4d965807d1ec326d643c71c00ee1f032dbf4c2271c2699ceb2 SHA512 5d919b6830f5a75c751d64476f5bf2b9b71ced1cee29e4156c4f01a9d7d8833dfdf8420747c55979c5b39b29fd63b5bf4bc3d27b756a617ef39f4e2ce4da2f93
+DIST ncnn-20220420.tar.gz 12158916 BLAKE2B fcecf395e54ff683bb8301365d805b99439b3797493e419fa8c99a325ebd1dfd80e65b08cffd9283fe453010a0cdde221aeeffa37e154335d2f6d7f6c6b9b138 SHA512 7c567bcd75cf36be7fbb16dba7f978ae965478afed8948e9e1c6f8c681ea678f769e64fae337a5c1d0bc1549bf922c1761b51a7822153a1eb4d267ef8adf1ecd

dev-libs/ncnn/ncnn-20210525-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Tencent/ncnn"
 SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD ZLIB"
-SLOT="0"
+SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds
 KEYWORDS="~amd64 ~x86"
 IUSE="tools +vulkan"
 

dev-libs/ncnn/ncnn-20220420.ebuild

@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High-performance neural network inference framework"
+HOMEPAGE="https://github.com/Tencent/ncnn/"
+SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD ZLIB"
+SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds
+KEYWORDS="~amd64 ~x86"
+IUSE="tools +vulkan"
+
+# Need the static library to run tests + skip vulkan / GPU:
+# -DNCNN_BUILD_TESTS=ON -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=OFF
+RESTRICT="test"
+
+RDEPEND="
+	dev-util/glslang
+	tools? ( dev-libs/protobuf:= )
+	vulkan? ( media-libs/vulkan-loader )"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-glslang-include.patch
+)
+
+DOCS=( README.md docs/. )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i "/DESTINATION/s| lib| $(get_libdir)|" src/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # for tools
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+		-DNCNN_BUILD_EXAMPLES=OFF
+		-DNCNN_BUILD_TOOLS=$(usex tools)
+		-DNCNN_PYTHON=OFF # missing portalocker, and nothing needs this for now
+		-DNCNN_SHARED_LIB=ON
+		-DNCNN_SYSTEM_GLSLANG=ON
+		-DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d (build date)
+		-DNCNN_VULKAN=$(usex vulkan)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use tools; then
+		local tools=(
+			caffe/caffe2ncnn
+			darknet/darknet2ncnn
+			mxnet/mxnet2ncnn
+			ncnn2mem
+			ncnnmerge
+			ncnnoptimize
+			onnx/onnx2ncnn
+			quantize/{ncnn2int8,ncnn2table}
+		)
+		dobin "${tools[@]/#/${BUILD_DIR}/tools/}"
+	fi
+}

dev-python/fonttools/fonttools-4.31.2.ebuild

@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}

dev-python/google-auth/Manifest

@@ -1,5 +1,3 @@
-DIST google-auth-2.6.0.tar.gz 188477 BLAKE2B 19baf9ec41e2b8667b8800687f4920d0e53df6cbfd17830e352f808b1438b21d952a4480f3b0fbc8e83dd215c0cd49b393f4798952eea1eb808b5417d578af85 SHA512 160fae0afcebd62dc0d46bf5e1102be34c6084cf188941105facd00b4a9b2bf6b36b58623e84595111849af0cb16b4f4a09b1e13ce095be025831fa4e7241b4c
-DIST google-auth-2.6.2.tar.gz 189490 BLAKE2B 5506b4d316a40274cd8ce0cea8c6a76b882e14f4f7e28f5a50e67c8828353d3078f713f874e36ba4c81537228325cf19c7ea1c3040b04d4b6338e456a8622024 SHA512 196bcec8f90ddc7ba95f03576f496aab38526c2305d729db806f07c0b44e578c6bfcb3a79224f4edaacb8760a3c7bb17a0af90cb2986aff3fdc5f767328fb247
 DIST google-auth-2.6.3.tar.gz 189685 BLAKE2B 68718ce4031c4e764dcfec19361b034ed5e1efa602d5c734b61a853020f40aaa856f9d9a3b964470e148fbfcb081dbc7d2c8bf0a53fc843d9360dbc72623bcdf SHA512 cba3228dbc0887c127d50cc45eb134e3a0b2bea044b8a1e65807918a3808e550fd58217a236c07b6cb908e5a080d9c1c1a2e9ee1853968d8c0bd50b7228ea262
 DIST google-auth-2.6.4.tar.gz 189668 BLAKE2B fe1f660c80095bae4772c78e223f8ba2be1ee749f4571249236fee84abd9a165d08c1acb5dad4ee61accd86c5b60c66befb24c9cbc5665b95bc587dddf99ecb7 SHA512 616004ad945e88dd9561abfcb29c69a0ade5163d6175191bf9421a2d59620a042ae352d833fc20e5f31e20b929dda391a35aa2d391b17af221bc4044f82663f9
 DIST google-auth-2.6.5.tar.gz 189699 BLAKE2B 2a18c25e13a48562aaa5d7524857343928f35ecec4a11a85e50f022acc6d2e90bc1e604c7ed1a4141ace4af830ceb466ef71e4678d7fbb5fb0fe9407d9de544d SHA512 f5b63b879348d86b7d840a188435c444e2b35dd3e7421c284092bfd9421ed2ff1a7584ffc2359195a2e3f9e99903b8b59fe2833559a1c1ccc429f5c363142cc4

dev-python/google-auth/google-auth-2.6.0.ebuild

@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}