gentoo resync : 22.01.2021

13 files changed, 210 insertions, 44 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index bb20e4f79c6d..7554fca7b557 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index c689a428f22a..7bcf23a51366 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,5 @@
 DIST eix-0.34.11.tar.xz 629932 BLAKE2B 7b203a4763a880379e5bafe086f70aeca6ad508cd558cc53d53683d8ee4a85111ba9fdea9fa81cd9c3939dd01ea392876b2714257138fd40a2c6b124e0fdbc90 SHA512 518dee499ed27acd39ea4c26e7b94a1098408b1d8cf6bc593e5e4b06aa973ae664e155886681c1e90e4a89afe8b54e05f8bd08d6ace2a2e1559fa613e5a351e7
+DIST eix-0.34.12.tar.xz 629704 BLAKE2B 22c3a93b47c607467321445704c8b4fe0f8b131081609709ebe5e2bd09d0ac08194938641ab44304e51d9dc4d473615625a9ca0de649767b6552c60d38974b75 SHA512 458a01b8ccb5fe4c7fbf9eb8368dbb0c63ac587e0452de4c3a58fadfc62aa8b404e509d6f24d20956bd6f04c00bfdfc95d6bf59287c5ea9e07091bea67f8c4e2
 EBUILD eix-0.34.11.ebuild 2556 BLAKE2B 4f5b498031917eeb4340217b9c7b1de4c1cd48d3f9fc838618dbf10d6668fea35b5f156b00a1861e1b85d54b917a4d59d63a1a525d49f62a24d40991a0a07eff SHA512 6a5a6aa6b9fd6b165a55ec11640d0131906de890cd1bb91c117a640e41a025815c928525064944212947ee8ab5da0ff40938c3cfb9eb81c83e634b9b96533274
+EBUILD eix-0.34.12.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.34.12.ebuild b/app-portage/eix/eix-0.34.12.ebuild
new file mode 100644
index 000000000000..a13024c139e6
--- /dev/null
+++ b/app-portage/eix/eix-0.34.12.ebuild
@@ -0,0 +1,103 @@
+# 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 tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 1f4eaa438445..4759592c4669 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,4 +1,4 @@
-AUX implementations.txt 830 BLAKE2B e10d79ca8ea5091166a29b1547e9db03ded897d66391a5ec7deefed5dc1cb4b7546409b585d6185368a9c9ca5e82c01b191a8edca964475c206d09d935246a6c SHA512 43b446e24080076f5351ffb153e6bfb9aa2d1d03632d397c0dc1ffc445d842255a89e5561a939a4bf4a9c8c1b63c961a91b56e8bd18160c1056e8d39c0c8310c
+AUX implementations.txt 818 BLAKE2B 264274c02f6e9305bd7b41a03b1bc998b72a39b1f23270377fbde84981b2e9e68885588fc4dd60ea2770be7ee5d1f41e066bb1fefc61b9cb0e483bbca2aa85b2 SHA512 a8503ca6ea863d2e999e21cc122466a31772823d91c15ceb9f96f98c80c2ceaeeef66c5e2c97034fae9d4f5fc03d314b231e2b3782e75ae15949ee53e1223575
 DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c
 EBUILD gpyutils-0.4.5.ebuild 532 BLAKE2B 008b08ed4d228f7845270cf644ff68199d02bbc85d85eeaaaf0fe0de68afed8e041fd605f749dd230d849b4863b124d031ac0d196f1c831c0c2bf5cc02f89d0b SHA512 3dcb448ffb5567b411293d9c28562a599ea7e174464966b05a328b586d757d399355697f1775b1e00e735d60159b7a461d028d096a0c443d7751f91f0b2222d4
 EBUILD gpyutils-9999.ebuild 510 BLAKE2B f1368e0bf4df4d14e0f5309cf9fdfa76264eff5d627cfcffe62935b0d11fb2fa3b398798ef5677aef44ff30cb1fad36ffb84aa526b3358dfe1955d52f941a2c4 SHA512 4252aa88d5c50bcc697a46daf883494afa20998996e8fd7955d16d131c7481be77df80bd0f6c8e26f82d455e400c41b3374e9a67889434a6417232838631b7c4
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index 231c94cd335b..ae60a85d8c6c 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -8,17 +8,17 @@
 python2_4	2.4	dead	2.4
 python2_5	2.5	dead	2.5
 python2_6	2.6	dead	2.6
-python2_7	2.7	current	2.7
+python2_7	2.7	old	2.7
 python3_0	3.0	dead	3.0
 python3_1	3.1	dead	3.1
 python3_2	3.2	dead	3.2
 python3_3	3.3	dead	3.3
 python3_4		dead	3.4
 python3_5		dead	3.5
-python3_6		old	3.6
-python3_7		current	3.7
-python3_8		supported	3.8
-python3_9		experimental	3.9
+python3_6		dead	3.6
+python3_7		old	3.7
+python3_8		current	3.8
+python3_9		supported	3.9
 
 pypy1_8	2.7-pypy-1.8	dead	p1.8
 pypy1_9	2.7-pypy-1.9	dead	p1.9
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 6880b04cd3da..1c1678f4cc37 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1,5 @@
 DIST mgorny-dev-scripts-6.tar.gz 7270 BLAKE2B 30945ccc04111c91dcf22d180b0f653606910a0f13d3d2c2acdb037a51bc6490917d8dab91580c27caf492487dca7ec575c5d59181ce622dd67dada49e653462 SHA512 b46d6919cea7233131e90c423392bfdc8a560800adc05e164ef88351d84d51a73dfd982fcaf12bd9519219bc08b84b6a1aa3dc078bb30d35d57847ad1b22efa9
+DIST mgorny-dev-scripts-7.tar.gz 7262 BLAKE2B adae301b7a3707aed052e11227f792e247b8e55f56dbe5b07ecfd7c37b1bc401f7f7110c2e38703d8c0f77926374193fd21dd803a60c3300990b85974e084ac8 SHA512 24b7b03bfa5ebac91a19470a49c5df6b4ff808876d8fa3e95adc243542f9b215f4c5b4cf3a3df48bae4386be570948d2976b6d50e1144469690a73bd5c119a6c
 EBUILD mgorny-dev-scripts-6.ebuild 603 BLAKE2B eaa3b41806bc9e16eb74173e3a69c4426220ddae73f62e089deb0eef98d55e2df080064a4f64e53dc01c3baec06af6ff5a7926cb3cb4fb6bda62bdce2c157948 SHA512 3f75ac80f219d8f366a60043c0aceb3553a506baa5c9fdfbf50ccfa2611dd16789edbc2605c501b3037253d8ffc9e4bc427e24aaafbc95813086c16363f08d50
+EBUILD mgorny-dev-scripts-7.ebuild 603 BLAKE2B 129885a428e34844ecf0c42270aa4d1b712da7f99b706d91f25e09cce68ebd918e80c4e2da455478c55fc21879f1c57c3c477def155fad21f02a97f9a9343267 SHA512 f52a8b9b0fa466ff28bb8379ae81208c2cc3e29a21d4c7bbfba59f1b03528a0f89d6cae51ee8333f4bdd82c97004c7af96b80b2031939c1ed203fcfdd48929c2
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-7.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-7.ebuild
new file mode 100644
index 000000000000..5e039f280997
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
+SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-portage/gentoolkit
+	dev-perl/URI
+	dev-util/pkgcheck
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+	!dev-util/pkgdiff"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 2de158a3caf3..70596ad4a47e 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,6 +1,4 @@
-DIST nattka-0.2.10.tar.gz 90745 BLAKE2B 8553b0871fd96e64af97e68cb6164dd71dad17c542191d98b6e61039707b39a98bd8e2ff7e24da4aa167b61c9b8b4d01260df90a28d05809c1fdc61d9c06b8a0 SHA512 31d4ef6162e42f25c807728fa4ec580ac048138a26a97216976d1ddc2901bcf9674f75bcce2da81f350c4f3da863c9cc45d5cbeeb4dae42e7e5da24b190c58b8
 DIST nattka-0.2.11.tar.gz 93992 BLAKE2B ad088de5f96ec5f7f8b0922420d22ef507e1e79ef3bc3161e6a88cd4714f1007a000ab06a7e21245b2792fd3056474459bf424da0560b8666c5cf46f04a2d763 SHA512 5d9de9f437a15e149ce58348f40f86101c10fe1f4c4ce869e7038ba25fc212c22e024a9999a6197179a0a1e1e82380356d304841c33333e04949caaadef96db7
-EBUILD nattka-0.2.10.ebuild 926 BLAKE2B 031243777104451b9f74422abbd289e2ad8f45a8ab0483c21140bd11e7cb307fac1a6f87c9d11e0f42d2f4805936fedffdedf81a1dba21af060dea1d8d6ac808 SHA512 6aaf0cc3f6f43c70f957d57d9306fdd6e43ac954198ff7f38488dd73c8a4e0256b05c04ffb758c87cf0e28a6b740774ff586b9e01c1d4240bccb968f9f2b9ed1
 EBUILD nattka-0.2.11.ebuild 942 BLAKE2B bedbc2c2306b19a18f3971ef21962bfb64c74a13bb624e7ba458b18cf032015a70a2ecef2e64098775f69569b61f70f3c85d4c6de9d8327c1a216f4c28c62b18 SHA512 7b4283778561eaad03f333e6d7900ffec1cc10e8b957a7300ae108a2ec4a6a0a80ac7273c7b33547a70c357bbe32f282bc614e2d72bf2727dd89c60e91a03db0
 EBUILD nattka-9999.ebuild 892 BLAKE2B 1e802a330372653ecc4831fa5beb0787ff575ee9be6e3acebdadc3f33fbe4f4945478fc6d1252ae6589c1420bb07e91c184f60847c4dba9ae72fea8ad709654a SHA512 792f5ec4761a0589941c0f12dcb50e5d42b6e11a8dd53576f36f8e49a939fecd9d0a5966032aefe8371469ae5adc19db41b61e97b987769b14b12b708b44bf2a
 MISC metadata.xml 384 BLAKE2B a75502a1e8d6cbe02ddc6c56505790fe6ab3110797d9d50631650d38c83cd04bcf6eee6d8d1b2db5e092f7721626312ba2f1623e680c5d8bd1aff3feda5fd5cd SHA512 3a6e0ed25d2650d1dc81e3d243726abcfe5a9f8d47feff6f89346df85b425d85369bc03ce49bcb1fc49086ab3c8fa394fb3578618d1bf4c019737a9f7cf17004
diff --git a/app-portage/nattka/nattka-0.2.10.ebuild b/app-portage/nattka/nattka-0.2.10.ebuild
deleted file mode 100644
index 57a65e264ac8..000000000000
--- a/app-portage/nattka/nattka-0.2.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="depgraph-order"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	depgraph-order? (
-		dev-python/networkx[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index d778fdd29e48..b3f698f072cd 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,5 +1,7 @@
 DIST smart-live-rebuild-1.3.6.tar.gz 17194 BLAKE2B a1c4f07e66ce3328ae70f88d086c33875bed68aea645a180e68fbd997051c6d398c1133d8e9c72378741fe41c519e941e76dc25d9c3f9c61c36531fe6fbe8e79 SHA512 f9fe57269654d69c3b21d0b6e378dfa3d2c00e67dae44278b2b81d631e4645346ecaeb5c9f43b77d39312b97edee247ba8b05303be903d6a3573bc226159c40f
+DIST smart-live-rebuild-1.3.7.tar.gz 17283 BLAKE2B 9de30e07b7c950c7e0e3d7f20a364ef65028fe425a017cf46de73a4aaa2c82f13359bc8e2d3269ed50b201b95c41af16c6f233576c1176f8c9b6394227bc8e14 SHA512 47111fa0e4ef9630a60b262566166822ac3245338c9cabc9e5959922e6f60cac70087025321fc9946ef7527b02ce7eb25d74e22d045f9e875c82d6f7877feb4b
 EBUILD smart-live-rebuild-1.3.6-r1.ebuild 844 BLAKE2B a48e2bc621ef29569abe187caae14d1d55a6ffd0e3555c4e7c31d4ca772d694d52dcbd1ba0e4f3d9bda906bd58ec313f93751596bce6841c5c87127bd137fab7 SHA512 3ee649d13cbc69afcc2956fd401fedb8916099b71f0b1ee4ad128bdcd93445dc8c2153d1f024144ddddf564085f09972960625fa675824f2b2aced85ab05edda
 EBUILD smart-live-rebuild-1.3.6.ebuild 841 BLAKE2B fdcb8e95731207501cbb9c77fd4723703f6c7ae9c77f2dc5a05a98021d2b0e782959ca9debb9a4c23e9866b138a16e21310928fc1e798cc0d4ac65b73edf458a SHA512 7148ac3d87795a218e302f855c6cf7e06c1e3ba55233f7aac7b3203034d93ede9ba2a526d5f036c4320456332061a99d51346e3cebaf99b41504e1213b432062
+EBUILD smart-live-rebuild-1.3.7.ebuild 844 BLAKE2B a48e2bc621ef29569abe187caae14d1d55a6ffd0e3555c4e7c31d4ca772d694d52dcbd1ba0e4f3d9bda906bd58ec313f93751596bce6841c5c87127bd137fab7 SHA512 3ee649d13cbc69afcc2956fd401fedb8916099b71f0b1ee4ad128bdcd93445dc8c2153d1f024144ddddf564085f09972960625fa675824f2b2aced85ab05edda
 EBUILD smart-live-rebuild-9999.ebuild 753 BLAKE2B 6213e113179dc428d5f5fb5e72a3a3560c8d52c5361655828e709c97c3cec4d9ad3f5590a839bbfc7ca46ddca9548d3f00949e6c6b4d1e8e480c6c883a1f89a0 SHA512 9f3cd7437a551bdf8faa57990143ca422d30f3a5cd5de58e8cfcac701d553df1d2b3cee5c5aba41501d79b3b49f4ccb6abc67be845675376a9285a7e33866b78
 MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
new file mode 100644
index 000000000000..ccc36895bd2e
--- /dev/null
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check live packages for updates and emerge them as necessary"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
+
+# Tests need to be fixed
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/portage
+	newins smart-live-rebuild.conf{.example,}
+	insinto /usr/share/portage/config/sets
+	newins sets.conf.example smart-live-rebuild.conf
+}
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 188da97cf76f..fd6b9f8a3b9f 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,3 +1,5 @@
 DIST unsymlink-lib-19.tar.gz 11235 BLAKE2B 955583517c485125722bdc808e1038c038509fad0afe0774f16299f2eb3a6088d7433e11565567bb3c9976a27910fbd9fe92289eaa210062f38eb9e3b15e120b SHA512 98943c887aeb70fc667c2092b985fe0078f127123d271cc45e1abb3e9b6218f1190bd23f140fa9775dca1d473d03113e6cfa8aeca8985cfc31f1cb459c4c620e
+DIST unsymlink-lib-20.tar.gz 11333 BLAKE2B bf5ab4390e52dceb0f86717abc21d752449754b6cb1083b34547997377c24618412d1dfef9736286d5af35632113885c998bddaeb373267280289b93a9ee8f40 SHA512 084d733046499ffa3bbeec6f59e72a8bd8bd9924c6f4cdca5f1bec5a6ef59502ceb19b156783c14d0418dbcd37025da65caaa2ce47665a26cec609e1895b01fb
 EBUILD unsymlink-lib-19.ebuild 727 BLAKE2B 9f7fc0461042aa9ff844859a7043b57644d37e65943df81ba243fbf635b98c22d2051ba9a7b7698e02bb59fff638069a7eb604542f25ad0cbaa650aed04ad011 SHA512 e7984ba5b8c5b03817b59afea51792e124ab8b10d492a04b33954a0c69bed8dd56dcdca73afa216aac0e445b3a4d6edbab2576a758cec42b96c02c2828a91321
+EBUILD unsymlink-lib-20.ebuild 728 BLAKE2B 64c902e855cb5ef1d1297dccb882d0036493a82616f4e5181f5c6150dee6d092ad28fd3534c6babb6723327ac2bd1e23a043224e17dc308fae0f05e34a1a68c6 SHA512 5b7921d3c5325c15c029afdc222cafedf70cb268c252837ae73149a0acfeda2740e883e02b1335a14035418f952b4b5af37464e2644e93c9195220cb882d06cc
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
new file mode 100644
index 000000000000..46e5fca98af7
--- /dev/null
+++ b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-single-r1
+
+DESCRIPTION="Convert your system to SYMLINK_LIB=no"
+HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
+SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# tests are docker-based, you need a running docker daemon and you
+# should expect leftover images
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+	')"
+
+src_install() {
+	python_doscript unsymlink-lib
+	dodoc README
+}