Sync with portage [Wed Mar 11 20:17:36 MSK 2020].

Manifest

@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29473 BLAKE2B 99dea43d9e85b74565e45775a971048ea990a96d02e6fc34ca61c2b1e5c3c5438a07ea0919e249574c9e8b5fe233741673667e9d3e34cff60490327341da53ac SHA512 e1cdfe7f7647c87f02073a06a435f16afdde55272b1ac74455084ee216ad1e377bdb8f5eb932bfdf2b819a721755ae8822a956981ec2149908a89bdd457ae603
+MANIFEST Manifest.files.gz 29464 BLAKE2B f57ba331c810ea7b808ad79d75533170145df8f8b64f14f5fdece5025148caad39856a143f710d5b243d21c7693dd058579b226d1fea4cd407cae62984f8dd1b SHA512 57573d2990d876f263258f5e445d0696c33b81abac2d61017aa3822e74293e7bdc45e88fd5f083f772138caec5204c51ba9e617b4debb90cfed0c01bec346204
-TIMESTAMP 2020-03-09T07:09:05Z
+TIMESTAMP 2020-03-11T16:39:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl5l65FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl5pFClfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD1ZBAArk7jZWGUznGbOaGa1CYNDWasiA89qsF3wPeoP6oXUovQIkjyDgTBCFkU
+klAUJg//ZYP07pasXlkwT6PvT4LtqEFBC2RM0Kzn4e2XnmfInjtSo1N+VV8ep943
-LUQ5stj/hi91wSdc1Fe9GG0qlPBsMv/t8Y3nPsgi7PNdzQyJCVnGNy7zHFRJ31Mg
+E8MmZaj8ILtvFaOXsczY8ihN6rtG7fwYTL8Axls/avqEmS7JCag7uWGyfjAfPfNV
-FO68MvNzTeVmtnbj79OptUxLwQgLEiiNIQzJbl+8qciSAbEwSN/ysXaHuok6GdhS
+3qhtQpb2CVt0RoQkcYsfVrTYi+FCyPgouHxrsrnOSQB/APBZl99Xf1LSohp4c2t/
-6l9HZ38x87qkE3QZyOHO1q0Rlxx+dtnyRMFjLkOxw+p8W71JQ+XjrnUaECppgb3t
+NuDLIniDlm86xqaGBQeXtSh0oHwOJh6cJ5U9JRpJ3PpuplTshMEM8TMaaHGAadkb
-VSTydT8pi8REPISMmAUIG2PkBziu5NKjHBquZXgHEE0kPZQapmhtrdY5TW6YHU3F
+EYfqkUnw4Buh8mkLIqppMrF8uec6TPYvju/QLwedr8pJ00bXhPI+22ECCaTuvmgV
-RjxXObsTL4syEPuMWh3veKl7s6io2h+3wyplh0mj+MxAK0Kap96hvkpJk4Z1Qvpl
++fB9dV+zPUzTGGoxyvBkMFuYPbkZYjWLFoNl7PDddlSt0SsY6NAOulkeausSHqih
-4pgM61d3/D6YyncVMHpT8bP5xH9eNOTexhVZKvKoxXezmNM34NBeV3rOzYReN36M
+fc5qfWO7uYn5tIErw2MnTfg+lzix6gVGyeKlm86vIMAxRYLopNcT4nkYiSE3ZbZo
-cmTjuarOSiw0T/U6b7TmQN/gOhm1CurRAdK85RoRMusL/sIwcSKzMjuxmOndhvIq
+p0dwEBk5G/QsxiYinr3/orB1s0SZoVvp9yR3ltj2aJx5MtM1fT/hrCCXlSMF5UKV
-+ASyx1G55Q6SkJam4PuSuHPG7k27kQPAgn/k/E0bn3aVcG1p7EYgaGk9XxpnCb/3
+aYZHAysd7lrXJgndJFOMr4ocooOiAwSOQtRuXRVI8G9BBuJh/WC4l0JXHGxlYONV
-xkj5dsgaCHbH6SdLn5bBu7Pr7+vxlglrjAzMx9o6chNRK8K/ruAZyuqbW+i5C7yl
+WHUWJvh8iN7XOyTSDE5HukBb3wLyyU1DFtbA4qPzQsFeR5G59IEZK6ayvGKACAFl
-rIaH4aXzY4V9hSXq9t9FeNS6eeqJiPRSOkBo59a8YEjqgSjJf5Q=
+eP+yXJVeu/f6RKfGOtqp6EPeRQGuIGeYSDGb8aBeNb10y7iqobI=
-=ZB0w
+=nFnD
 -----END PGP SIGNATURE-----

acct-group/ossec/Manifest

@@ -0,0 +1,2 @@
+EBUILD ossec-0.ebuild 194 BLAKE2B 6217c683976cb8cc6f5618949736bbbd97f1bf1d097dc24154f3bddc2882227fe933c7dfff2bbbce60f092429c09984862e9dd9e004c125d2067ebde04290f84 SHA512 60e12f1b6663eeb3bb1d489aa95122f0ac8fe099f3077b3de6a012374e3e8e2176ac254751c30b00081a98976291da37ea1a78fc0a3d3622f84e2fae79922707
+MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454

acct-group/ossec/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>

acct-group/ossec/ossec-0.ebuild

@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=330
+DESCRIPTION="Group for net-analyzer/ossec-hids"

acct-group/pdns/Manifest

@@ -0,0 +1,2 @@
+EBUILD pdns-0.ebuild 146 BLAKE2B 4f62c9a763a94b693a38085f2b8e8b27acb08db934bec0b2894bc13d8f02586f6f70fbfd94a491261e1714791075ec889a37bf7c991d181a63d081d3b13c88c5 SHA512 5383eb2d31832155d6a81938101a114ac206ae1b73e6166fac3c9fdfc8e4bc7052ec9701d3d391c78822e66466767598aabe24d3d07b18d47f436bc502f5d994
+MISC metadata.xml 247 BLAKE2B 96e8f6e5345107cc8935aac38e9219639ea75bb89a8d14e63523e49b066ce1fba1448ace5f63e3e975b0f557b4b37783b1b139d79f7ffd77ac81f73c1e59247a SHA512 e072e812b43559440dfa987096fb12279f8816e4e6366183fcacf29028159019165c786f9a7603a5fbd3ed2ce5245e521aa0aef33e7aa4fb6a0e18213878dfdf

acct-group/pdns/metadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
+	<maintainer type="person">
-		<email>python@gentoo.org</email>
+		<name>Sven Wegener</name>
-		<name>Python</name>
+		<email>swegener@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>

acct-group/pdns/pdns-0.ebuild

@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=423

acct-group/quagga/Manifest

@@ -1,2 +1,2 @@
-EBUILD quagga-0.ebuild 146 BLAKE2B 89087587a4dead74343c97f45e8f07d06b7926d50bbe261d89fde31592ab6bb42a53fbeb1d16a0744d5421f30b878db02e519ebc9021046153217d345392d929 SHA512 d2ce36e9bf13b76e332aaa61d54fa2a70308dc35310d79318c34cc3b58c3b271ba79dd8f06529768560e008002332a7538226762997672e12bb00b197f336a61
+EBUILD quagga-0.ebuild 146 BLAKE2B fc2fcbd9c0691d683a891154902328fa40d41604e6e3fb7737c905dcd9f1e704799934739573b67121de1000f6de37e5559874fbf59a44fd7b417917c0f03ac3 SHA512 64995333018b33fd6a1795e1511c50db60cfbfd5316e22790f0e24857d359089129cfdc0b67b89c398fc7a2af7be4daa9c57661f4dbcfcfdda07a49f3b7bad9c
 MISC metadata.xml 247 BLAKE2B 96cc346ee7a7f6815ff6e125a6342497605ffeefa4b00c9e4ed4ab52f082e3361d6c0d2779c6315f64321acabb3eaecba1c7e503e7ffbe53b945aa6a6cbd5e0f SHA512 83d0d6d8a84ae943d31c289be5e988dff3567b0a60ceda9e87870727f4c14c276f5c33345473ffbe0543e1443cc057c8a1d8320c9cd299c4ebc981c444cded2a

acct-group/quagga/quagga-0.ebuild

@@ -5,4 +5,4 @@ EAPI=7
 
 inherit acct-group
 
-ACCT_GROUP_ID=425
+ACCT_GROUP_ID=424

acct-user/ossec/Manifest

@@ -0,0 +1,2 @@
+EBUILD ossec-0.ebuild 289 BLAKE2B 5820ea90a2ed2f8e100f8afa0e40b2bef5b80f4af88addeafe3bfb4f88b04c301457fba4a41c8a0b1a9ce5ce98136a2ed1f2d1990f4b5784ffe7679c696f09d9 SHA512 f1ca67bc0db90aeae7259039cc2e6a30a3190c054cd11c3b15b8793feff101d8961471ee488484bc4950b885c3d21934ef1554cd2b2d16fcaa5c3c40bbdb1240
+MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454

acct-user/ossec/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>

acct-user/ossec/ossec-0.ebuild

@@ -0,0 +1,13 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=330
+ACCT_USER_GROUPS=( ossec )
+ACCT_USER_HOME=/var/ossec
+DESCRIPTION="net-analyzer/ossec-hids (agentlessd, analysisd, monitord)"
+
+acct-user_add_deps

acct-user/ossecm/Manifest

@@ -0,0 +1,2 @@
+EBUILD ossecm-0.ebuild 247 BLAKE2B 288296ef31b602e1dac853b031fab1a5b3277259de84110ff223c3bd1e6f4ae5446c9404347f1b66c980cd0d5fdaf864212d1f0a36c1ab53b017e3bb1d321053 SHA512 cbb873005ab2ac5e17c2c2b2d8640a66d69fb9eede52bbb7ff27961509bf50c81f02cf47d1e850a9067980b4f820c499a8392f122506cdec1b7f05deda538465
+MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454

acct-user/ossecm/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>

acct-user/ossecm/ossecm-0.ebuild

@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=331
+ACCT_USER_GROUPS=( ossec )
+DESCRIPTION="net-analyzer/ossec-hids (csyslogd, maild)"
+
+acct-user_add_deps

acct-user/ossecr/Manifest

@@ -0,0 +1,2 @@
+EBUILD ossecr-0.ebuild 239 BLAKE2B a3d0b70d0e176b6fd1bbfa834cb45807dde16139ae9e53646bd87e847b61bcec310f45b6a14b1d3617649b4335adcb55537f8556b8996813ea1bacac86b337fc SHA512 5d633783b8a8f680495fd116270b7b5dcaf2e3faff80bc3048fba5ca5c26f683a46e8864f91c85c6937fc4d2b2e9077e90b4ef4447d8fa66903d2d411d799201
+MISC metadata.xml 365 BLAKE2B d44237f2d0b8058ecd06f223131fdcd35bea05507ba728f809da1eae53dd40d62e798e0478f73842246c2a68466950952b2dde655bd4b7ce64a99209be57ac26 SHA512 bd308a5d9e4bd25e2228eb4dbd8128f2d4cefc0d89928e0933a5af2c423a69025a7a35eb20860722264e69627234617df085e3ad77d65809401d7fd73fbc8454

acct-user/ossecr/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>

acct-user/ossecr/ossecr-0.ebuild

@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=332
+ACCT_USER_GROUPS=( ossec )
+DESCRIPTION="net-analyzer/ossec-hids (remoted)"
+
+acct-user_add_deps

acct-user/pdns/Manifest

@@ -0,0 +1,2 @@
+EBUILD pdns-0.ebuild 190 BLAKE2B 9c698917dd9043b4b265d9f2eb78382836b95972b0623057ee8bb5b56ffd4580f062fc2b7cdeb629ed6ddb0c219fc0dfc2cdcce14ca7891ca7f5fdb2bd56e102 SHA512 a02ccf0b9d44c8bea550b730d54632f1b098ddcd7c7186de1b96cc0b44ccc8b9b89b6a82c10472530dc7c1d201b2adfba49ef1d8dd38d216159bd0c65da79354
+MISC metadata.xml 247 BLAKE2B 96e8f6e5345107cc8935aac38e9219639ea75bb89a8d14e63523e49b066ce1fba1448ace5f63e3e975b0f557b4b37783b1b139d79f7ffd77ac81f73c1e59247a SHA512 e072e812b43559440dfa987096fb12279f8816e4e6366183fcacf29028159019165c786f9a7603a5fbd3ed2ce5245e521aa0aef33e7aa4fb6a0e18213878dfdf

acct-user/pdns/metadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
+	<maintainer type="person">
-		<email>kde@gentoo.org</email>
+		<name>Sven Wegener</name>
-		<name>Gentoo KDE Project</name>
+		<email>swegener@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>

acct-user/pdns/pdns-0.ebuild

@@ -0,0 +1,11 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=423
+ACCT_USER_GROUPS=( pdns )
+
+acct-user_add_deps

acct-user/quagga/Manifest

@@ -1,2 +1,2 @@
-EBUILD quagga-0.ebuild 192 BLAKE2B cf64723d4a81b1545f230068a7c8794fff4e46573ddf870f7a894abe428b54af6cdb522837a0b942a1f8424c1e814f235f19df8821ea7c5eb88a55e63d4af7d2 SHA512 fef0a53a2dacca4087080ee7d5436b03083856d2db3cf4619daf35d6f0d975b374c32d582808cd33cd1cedef98cfe87c7d38acd764148fbc2c22262c1c4597a8
+EBUILD quagga-0.ebuild 192 BLAKE2B d8969da8a4e3c98f96b2903c94ca2b55ac373fa273f35ce70f7580ea110d104c983aa91b935643fbcbfd236e9afc317426578f8c3d6e5bb31a753d5f8fae00f9 SHA512 ffeb98c06850385fb33ac83b8666c36487f45b1add5effdc72bc613715970bb1b473501f4c7913f54e0dec9ae1f07352a896977590be3f1b53b5b4aec503e27a
 MISC metadata.xml 247 BLAKE2B 96cc346ee7a7f6815ff6e125a6342497605ffeefa4b00c9e4ed4ab52f082e3361d6c0d2779c6315f64321acabb3eaecba1c7e503e7ffbe53b945aa6a6cbd5e0f SHA512 83d0d6d8a84ae943d31c289be5e988dff3567b0a60ceda9e87870727f4c14c276f5c33345473ffbe0543e1443cc057c8a1d8320c9cd299c4ebc981c444cded2a

acct-user/quagga/quagga-0.ebuild

@@ -5,7 +5,7 @@ EAPI=7
 
 inherit acct-user
 
-ACCT_USER_ID=425
+ACCT_USER_ID=424
 ACCT_USER_GROUPS=( quagga )
 
 acct-user_add_deps

app-admin/ansible/Manifest

@@ -1,8 +1,6 @@
-DIST ansible-2.9.4.tar.gz 14170264 BLAKE2B e230837360d29df460906d118b3c2ebb9a9dc1ac2a4427809a16716e67a79db8e737ed1beca757bd8a75b631c8cb6c26e58b1caeaaeb613731d63031f1e4e34e SHA512 21020548100fc31b59d4ee1b461f2a14359f2f18752d431cd041eb987c8c8b308f1aa1687461a9b3f5a086485b77b3a38c8f006b942cc24cb2157b45e6582822
 DIST ansible-2.9.5.tar.gz 14186885 BLAKE2B c64fb384ab55c5b9cca753319fba911b8a40d634b59998f2e4c65ccafaa536788f3ac8c18a45a4b0d322ecca9b7fa2c580311a35a202ad70c2de2157ab04bfaf SHA512 cd2ce807b3136e2c02856339ea910b0a5cae8ca946da804ed7d3ec5725d3eff0fe5b4bd8527b2a17d6f3109e16859d52045b50f2ffd21169b30768e65b813407
 DIST ansible-2.9.6.tar.gz 14201258 BLAKE2B 29da78035291a252f215a49945e82d9f3598a91c9c8993c69623668e9f8a667882330d51c75e1ae27ee5242f4a6320ee947af338c4c38e23f4f9d04cf19364ca SHA512 7111fd72b4e029b2f661bfb849b4323b69ea796f8a069ad3120e8de390effa670180c69ca0fd5e0a1c2e444db6d574a52d530a2b0343c76cd81ba963b3c3a7cb
-EBUILD ansible-2.9.4.ebuild 1704 BLAKE2B 5222fcb64c188bb54bfa1a645a45179f9f9e9ba98020e824c2b355a567e0790c0c6bd2c0c149121fadb7dc1ce110cf4837519cb5df8d48fa9cd4cc3366e33cea SHA512 ed56bca21b973e313e8e08d5cc71856becc53ecf6eacb7e6e921c280f89a0a49edb5f0bdfe0354bd0280800ce80a14bdf557acc78de7f39067f338b91e28f24a
+EBUILD ansible-2.9.5.ebuild 1704 BLAKE2B 5222fcb64c188bb54bfa1a645a45179f9f9e9ba98020e824c2b355a567e0790c0c6bd2c0c149121fadb7dc1ce110cf4837519cb5df8d48fa9cd4cc3366e33cea SHA512 ed56bca21b973e313e8e08d5cc71856becc53ecf6eacb7e6e921c280f89a0a49edb5f0bdfe0354bd0280800ce80a14bdf557acc78de7f39067f338b91e28f24a
-EBUILD ansible-2.9.5.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
 EBUILD ansible-2.9.6.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
 EBUILD ansible-9999.ebuild 1697 BLAKE2B da48c9b97787143e815cc768b5aebbf7bf005ac8a8562a3420f4d4594214e601e90cab78a447017de45b7217952c5c2b0922e37c2e7770b2e786632089230b22 SHA512 0276bdacbfef27725a2714d8cc56d05c2c64d2b37fcbe77d7cbeebaf30828364a7ecf86ea960327d01ae1e3202387777b32d5903152b405036c2541bc38c7f9f
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7

app-admin/ansible/ansible-2.9.4.ebuild

@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}

app-admin/ansible/ansible-2.9.5.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 

app-admin/entr/Manifest

@@ -1,3 +1,5 @@
 DIST entr-4.3.tar.gz 23756 BLAKE2B 0272b0185932d7c388818df0cc615e991c9545473a823c478ad9f0b6a23c97c0f4b2727b109a7bb18e2b0792f18d94d188d4a5d3fc90c479628ea078b1288f96 SHA512 f65dfc3f106e25ec4ff39eaec94222d8a547eb35390c654f6a741f92541c1b86d7d303a795308fcbfced44ac8eca6ad67e70393802ac9d46153e037dc1eab902
+DIST entr-4.4.tar.gz 24125 BLAKE2B c77b4a862c0b4a2861d7e2784fbaa3f60899a9934314a5cf3abb01d70df946e3786957cbaa9ed58cea7171390d115157f0d9a48093f6e7a8c05bcabf34da9792 SHA512 355bc19cfee9a9b5a460b136d8db014a1d129b6e4c95d905c1c4557cf7d845a076d260798ae8b84221563c049a9bd6d81974f00eea681abaf2eac2f2f5e6d087
 EBUILD entr-4.3.ebuild 578 BLAKE2B 65f1c99b403ee686a265ce41713faf013e0badcb545a1fef69bf7617af35538aa4c37100cceca603f9cf98a2162d81db4fc43c1e65b15a539d7e4d05a9ffd6a0 SHA512 1560373ff2342ae3726efd781dc538c558a46767b910feda4b04bb281827d4d4009cf35b654ea6978ce5ac31176b2bc6c58118b43a9c270c8d98c439e1e94c2e
+EBUILD entr-4.4.ebuild 578 BLAKE2B fca2962c24f9694e63fd97a6456fe7c628205016df398c79ed1e8cdd03a9fa8e7701f240747c1602a3e2f7449434f12f135d1122064c32b462a52905e466fc7a SHA512 94290e46fc8b37b5b4673bb105bb5bcbe039b97d1049d4a12ba2b00b18db4fe9806bb3525af8c55e2ef79b19398a07717c5d262fd174379fd3a65803bb05aed2
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6

app-admin/entr/entr-4.4.ebuild

@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	sh configure || die
+	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
+
+src_compile() {
+	export CC=$(tc-getCC)
+	default
+}
+
+src_test() {
+	export CC=$(tc-getCC)
+	default
+}

app-admin/helm/Manifest

@@ -1174,5 +1174,5 @@ EBUILD helm-3.0.0.ebuild 7131 BLAKE2B 50e7fcd49e605386d35ac98266d89da63e0e2f91f8
 EBUILD helm-3.0.1.ebuild 7057 BLAKE2B ea4a09c1ed7a18e03e258a674b6587d38f915161c8fed17b7c5d92e800cd547f17b633ace759dd3cce5d3f0d584cf373df949dbb1a951d771fa1b0457e62bc12 SHA512 af0fdc6f3fe0bc6f0f12050a6c78f285a88c20ea418a25f44437fe8cf12905f644f54f1210dd2a9b6b316b1f40d62d7018ca9c550c3bee9c569a8cbeef49a390
 EBUILD helm-3.0.2.ebuild 7057 BLAKE2B 35d906b9ff6ffabe35a88d069652c3efba27c4c3598713cb332cdd7b1835ebd47f50c5e6dbf0e62a13079ada2808e5aacce7167fb918d30ccbf0f6f8ac57627f SHA512 c05e5e8a9eee9a6a698af4c8fad82f5f664ec9a549001966f41f674451b4991c3bd3b1c11d0cd67dfb55152a072a1a4ef7e1251ba010e8a2a656b906557ad62b
 EBUILD helm-3.0.3.ebuild 38439 BLAKE2B 3827ab505c187340588ef4e2596e3b0913ea2e98f51c9fa23718c5f2e4b57a5623c9bf4244b589a195292978cbe134a2dfc6358dbabf701bfe8bf67de7a4a636 SHA512 b978278e59854245840bc4cd80cd1fe48835f685ed61015211d5c83267c437321454d1c4e380df8b1cbe20243317d3af0f5fba7a5dc2cf531b3e7d6d26f70a50
-EBUILD helm-3.1.1.ebuild 38627 BLAKE2B cc5325a4d9fd41b0f9f3c785898d68a7392a21f22327c4f64bd0d0c15f9edbcab1df80fd340c4da6d51b38a4a88d9eb6581e31bd849674ec798b3ad74451a0f6 SHA512 18ad7c0371a2438be1733a6a2e3f42c6eaf8b2af3c7dfcd9d9ce09099801056cd17676128707b14e687f513b325f8213fe4d62c7be003dd702fe6b1dcc657b41
+EBUILD helm-3.1.1.ebuild 38892 BLAKE2B 911b9e3e4ba6bcb4659130811361f3c315e5301fefcf73a6e1074b6e5ed9f224168f3f620be57df9fd93b290d75e4c1a5bda85c5c40f3a753f98ba468ae4720c SHA512 3b9fd7ef4d45b0d08c537ce54d546ce621ffc54def9fe6ec7c2fa64618e742d2f6b785c80984cc0cc4dcd3cfff75f51af38fbb3a74d1ed10a11a9439abcbcfa6
 MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be

app-admin/helm/helm-3.1.1.ebuild

@@ -700,17 +700,29 @@ RESTRICT+=" test"
 
 src_prepare() {
 	default
-	mv ../vendor .
+	# Makefile:
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+	# - change GIT & LDFLAGS variable assignments from immediate ":=" to
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+	#   deferred "=", to allow better overrides.
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+	# - Remove GOFLAGS entirely
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" || //' \
+	# - Remove -w & -s from LDFLAGS
-		-e "/GOFLAGS    :=/d" \
+	# - Git spec will be passed later
+	sed -r -i \
+		-e '/^GIT_(COMMIT|SHA|TAG|DIRTY)/s,:?=.*,=,g' \
+		-e "/^GOFLAGS[[:space:]]+:?=/d" \
+		-e '/^LDFLAGS[[:space:]]+:?=/{s,-[ws],,g;s,:=,=,g}' \
 		Makefile || die
 }
 
 src_compile() {
-	emake GOFLAGS="-mod=vendor" LDFLAGS= build
+	# Do not pass LDFLAGS directly here, as the upstream Makefile adds some
+	# data to it via +=
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		GIT_SHA=${GIT_COMMIT} \
+		GIT_COMMIT=${GIT_COMMIT:0:7} \
+		GIT_TAG=v${PV} \
+		GIT_DIRTY=clean \
+		build
 	bin/${PN} completion bash > ${PN}.bash || die
 	bin/${PN} completion zsh > ${PN}.zsh || die
 }

app-admin/keepassxc/Manifest

@@ -1,9 +1,5 @@
 AUX keepassxc-2.5.2-ccache_switch.patch 2274 BLAKE2B 640bd0bdbd56aa93a3f7d70b4827b50639bcf6cea1cb0339ec78b91cbd4ab7c364bd36353ccc02e88b438566ecbad6545124bf5fd89c2c8e766c723e278ba1c9 SHA512 5b43fe2e5dea3ff3626ae4b75faa8aa4666a2703d08a30c4a18fd2b1079a73ad033d8788f05e28b860f51ef42e9f1a65253319b9d8fe0c34ec058b9ffb59dfea
-DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d
-DIST keepassxc-2.5.2-src.tar.xz 6835848 BLAKE2B 4c536ec062295655c04a360ba3c94ff97078aa03b96e5bb29e246f6ad13cce16ba77bcf5e7232de4df669706bc612f6b157e3050f0d8b9eb4b1f47e4308af0d0 SHA512 f87408362e5fbba10e2e66ff1cead2f8495214197e142c16cd3c95ea47956570b6cfc561d7b593c9a962f476637b8bd6b5e21e2fc3e4f20224506bd97d16bb23
 DIST keepassxc-2.5.3-src.tar.xz 6839148 BLAKE2B b3cc32f9abb42e662edec0c28967fca65a4f3c794f70bfe6c40c39375cad8cbc35eba95431b33119268230a324f83f2e5a53186ee8fc64cd366e20eac1341dc5 SHA512 8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6
-EBUILD keepassxc-2.4.3-r1.ebuild 2144 BLAKE2B 0c5d29f1403d1cd3a536ecd3beadb42ef085607af6167f7ebe97bb999826d996178226c58febab6c359e743d1eec125fc60492e132f69b74b33d48ac02fcfc2c SHA512 55f227ff8ad47f123b56a70bf0b2569a0fa1b6ed9ec105a0ed0f111144bbd23618777bfdfefad9823dbee3d42e779d723cfae30997c79b17716aabfa63c7fb35
+EBUILD keepassxc-2.5.3.ebuild 2183 BLAKE2B 68019fba5936cecc2f48e3c3ea5fb8f24e3385d5cc80f36fde0d7bea796d01c823d338c8d08600cd291cea880c57e78d3b7d20bfc32021598a05c32cb3a212e6 SHA512 b8c4efb3e662085c87357e65355a9b1957bdf06c265668d84cf071ed024f1f4d9f8083cf62f1f8882ef7ce5d44411764895d78e20c2f32c0ab44929f2662c80b
-EBUILD keepassxc-2.5.2.ebuild 2185 BLAKE2B f28738a5ca4db3750a375f40760add93b90f4291b3d58cd9b6efdd025972ce391392a25cf66dc28fa3e45329f01f2b52ef22e3a6a2f14d43b24b78e1c3dc3717 SHA512 5dfc6c8e7cb50e551d94e7f0a5c60cf27f933cf1d0a3cbc7adb05f1c48af18169ecf3444738902cd5b8b32025a024bb9b8107aa3eade93a8fd861b2accf111e6
-EBUILD keepassxc-2.5.3.ebuild 2185 BLAKE2B f28738a5ca4db3750a375f40760add93b90f4291b3d58cd9b6efdd025972ce391392a25cf66dc28fa3e45329f01f2b52ef22e3a6a2f14d43b24b78e1c3dc3717 SHA512 5dfc6c8e7cb50e551d94e7f0a5c60cf27f933cf1d0a3cbc7adb05f1c48af18169ecf3444738902cd5b8b32025a024bb9b8107aa3eade93a8fd861b2accf111e6
 EBUILD keepassxc-9999.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e

app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild

@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
-	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 x86"
-	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser debug keeshare +network test yubikey"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	>=dev-libs/libsodium-1.0.12:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/qrencode:=
-	sys-libs/zlib:=
-	autotype? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXtst
-	)
-	browser? ( >=dev-libs/libsodium-1.0.12 )
-	keeshare? ( dev-libs/quazip )
-	yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-"
-
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-	x11-misc/xsel
-"
-
-src_prepare() {
-	 use test || \
-		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
-	 cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_UPDATECHECK=OFF
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-	fi
-	cmake_src_configure
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}

app-admin/keepassxc/keepassxc-2.5.2.ebuild

@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
-	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~x86"
-	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	>=dev-libs/libsodium-1.0.12:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/qrencode:=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	autotype? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXtst
-	)
-	keeshare? ( dev-libs/quazip )
-	yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-"
-BDEPEND="
-	ccache? ( dev-util/ccache )
-"
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-	x11-misc/xsel
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.2-ccache_switch.patch"
-)
-
-src_prepare() {
-	 use test || \
-		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
-	 cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CCACHE="$(usex ccache)"
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_FDOSECRETS=ON
-		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_UPDATECHECK=OFF
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-	fi
-	cmake_src_configure
-}

app-admin/keepassxc/keepassxc-2.5.3.ebuild

@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~x86"
+		KEYWORDS="amd64 x86"
 	fi
 else
 	inherit git-r3

app-admin/needrestart/Manifest

@@ -1,5 +1,7 @@
 AUX needrestart-3.1-gentoo-kernel-detection.patch 870 BLAKE2B 9d56a445bdda0af61fa0303c0b3dcc04f241687727f1fd94ac74d3f1f25583c9b0248a1d06a9007b31032fb01244246f8bec4d9a40e66de5f1b06a76de4ade19 SHA512 ddbda09aa655beb918883029b5137cc50f4bf2ad225ed2096551a13c6ccba352a04b96257da6c60085a86ecb4106569ed323d2beac924e76e37baf4810745857
+DIST needrestart-3.3.tar.gz 59814 BLAKE2B bfba00dee7c0f225efcaaa80b301eb38d0ea82645f253c8bef9294102f9f4183433ed1b6efe71a9dc34c65f76364ff3fc2344e840b34f97361f3ddcd0dc9ab4b SHA512 ea2f3cbe228a6b879905bd3b3de8b5e0bb2362e8d3cd566817d2e7d519d54207ff5923eb8e49cbd8ffe8ed50729f4da04bf4d55268e806f49157860584058d50
 DIST needrestart-3.4.tar.gz 63219 BLAKE2B 892bb610001575b7e653e06380ba39bb91608db6b5cc491d1e89543a72a17f69547f2610ebe7f3e51835dc1af5a32604fe54f79b6565c9f97df194a87f5f7bdf SHA512 3d63a9c32112b1d4f5d0c6d66430323761c9e7c17f01f52d0572b64ebf113fc9b52838dada363667632ae51894312d891ae8016e8eb5cbd4e0d06fa37c603f25
+EBUILD needrestart-3.3.ebuild 859 BLAKE2B cf0291a65f58175de23b840320e586d485be4978de574db6c48ad0046ea9a661cad515ffb154f9e4f25dc8ae55d6172edc1796f4d5d2d9724c8f395cec8a8a7a SHA512 9b18c5ea2c2afddb37efc238a0ac14ffc461d2fd3b1d57f8547f407ed39712404483f5bbcba159a890333d545777d2b9b85ca61a910683f578c86c5e9b04724f
 EBUILD needrestart-3.4.ebuild 874 BLAKE2B 9a4441711eaf20dc2ec30596e9d898cb9c91f30ce91aa236e09948ccf45474fe878b720771819dba22516b1c623705ce798ccbd3523f75547a971cca1d3d44df SHA512 97587e9942c153939ae20922d73454cd1e16dcd5a763f6a93c4bda87dbf644e0ac813fae574a4ee13b32d4865132e6b6ff3e9d66eacd5c728bef7c8f26c32aab
 EBUILD needrestart-9999.ebuild 874 BLAKE2B 9a4441711eaf20dc2ec30596e9d898cb9c91f30ce91aa236e09948ccf45474fe878b720771819dba22516b1c623705ce798ccbd3523f75547a971cca1d3d44df SHA512 97587e9942c153939ae20922d73454cd1e16dcd5a763f6a93c4bda87dbf644e0ac813fae574a4ee13b32d4865132e6b6ff3e9d66eacd5c728bef7c8f26c32aab
 MISC metadata.xml 461 BLAKE2B 28793d229fbcb27f6ad2bf256bfae268236133d14302a72693b90e319af2bc2dc4c1928546b9f3c5e5fc657fa4013fb28acedb1762b84bed60850e5ba0852c23 SHA512 6b8877f41545dafdb30cc0ed3664e568901cc13c68c5221817631be63d454ef30d1b2e923f3a8fd9b0d77be825e1f183601e7a7d474a1d196b2a8eef099095b4

app-admin/needrestart/needrestart-3.3.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS="amd64 x86"
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}

app-admin/puppet-agent/Manifest

@@ -3,5 +3,8 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_6.13.0-1stretch_amd64.deb 22432484 BLAKE2B 231f8683afbf4d2c5ded7bfec323baecbfd52446bb3483c2c16764bc57b79a18d256ecf94b27d4db1bbe88038d7f3eef037c500a39e3b66d641e4effa94cd2d3 SHA512 6101e84e5dbfa64bd336bb23595fe559165e4a159fa5de739aa1617e6825ab11ad62d1abbee26ff94b9f68caa7a192c0339a0c721efcc534ae9ddbba161af907
 DIST puppet-agent_6.13.0-1stretch_i386.deb 22787442 BLAKE2B 1bcea00b2da5c5b0db51fdd12d3828492a9a56af3a8c84919258ac7b90f7d135df708aba602a6d517364ac8b42f1ee3f1c11596cca0e89809a72d1d04c7ecc58 SHA512 55afd1ec6d331808a2a5adcd9c41803d932bcd7e2653da42c81c8ea1179649ae7ac642993813d527b2f365fb4f21d67015a0c2eb5379de2184585475521f8726
+DIST puppet-agent_6.14.0-1stretch_amd64.deb 22450130 BLAKE2B fe6e30d99357328a884944e59d7cb1c66ad9fc36642ba377ed99e23551c5cbf06cffc4336b47440389fee7a9f1996b8325d18335768187f5d052fcecae041f5b SHA512 41d87f1ab4ead019eb5ef90ad21e557db686729151618e4ec642ea6636feda383874f7d457de7e9e323cf44d9d410e7fb650edd6e69b186c2fdff5657955ac5a
+DIST puppet-agent_6.14.0-1stretch_i386.deb 22792198 BLAKE2B 7638fd1edfeb22377ab22484dd0fd5377bab6ee5e3e01c64ffd8eae29b08e0182204446db23d8cf68018a58c2419ce22c4dda4fd10a6dfac64356d68a5478bfa SHA512 dc787dfeb2565fde00da6e991fb94435c56e804657a38268ad49d72783b9857de4e359d6d9002525759684ddcb48a00e2fdb73f069cd79da74237bcb9530a116
 EBUILD puppet-agent-6.13.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
+EBUILD puppet-agent-6.14.0.ebuild 2018 BLAKE2B 74f72ffb55bb069bca1a2ea3db686ae1d5236e8c180b3b14afd18f451c7718e51ff09413380abb0bc79497ccde9aa011d7de55a9f7f92ce213d9b8361dde3d50 SHA512 f4aa0379772aa69bc9bb75fd085000e1ea64a889919b025372244f8a72df2da2f5bd27d51844d34985a8f397e9d6b8159ac46da647f62ae7f9e1cb2ec25d7000
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7

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

@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd unpacker
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet"
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/7
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+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
+	dodir var/log/puppetlabs/puppet/
+	fperms 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.initd" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+}

app-admin/puppet/Manifest

@@ -6,8 +6,12 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b
 DIST puppet-5.5.18.tar.gz 2984835 BLAKE2B d5a1d023d3d26e04ccc81efa772131c06fc7ace8ec59c7efa97bddb775bb492d3256290824a87d54df5c28862cbba98c58cf41bb4a0c27a4128701652c06eee0 SHA512 86f210ee783ca36340b22463cd4ac237d8dc1c6a35526530af0696bb3f0373b0b22f690d3e3f8e31655ea182a33eb60b66b5826bd6c4d1b0059a8e46152416e6
+DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
 DIST puppet-6.13.0.tar.gz 2837171 BLAKE2B dc64b23fa2d5fcb978cfb03bf67f89ff0ae084883320f267bbb7fd613fd8948193658d717ecbf30f73e313c4530f872617a186675547509db9492589e4f226d6 SHA512 fb7abc9cf79a3de1daf597c0c1768ab4abcc11a236beb8294c5fc69d07ae23149216f7c8d33599365d3c10485f3fb3f8f5fe492e0e7312d19ffdaa0bc8b87d0c
+DIST puppet-6.14.0.tar.gz 2842351 BLAKE2B db9a467d8e0f4f25d45c2f735ee9d11ac6ed4e47c16b95ded3ff9f1c5055ea866735bcda27c19c2988035d9592035e433ef0d79a19781c99f4e97388edf46b93 SHA512 066ad8de6393cb58b1f92fae450dc72dabcbe912cdbb3417848a66955fe17696a68abf67d86b107a2b1c54e7037d38da7264a9234a8833b56065c8e407ff57a4
 EBUILD puppet-5.5.17.ebuild 3737 BLAKE2B fdef57a527cacfe399a1acc5cf6a098c0de6a6676d51e2da0c11c37036f7d3e55d98140f5c7cbf52c610edcd6cc9e35b2a0bb1ccf92d52aef7d0de08e4b3c805 SHA512 b83747415c59389373f07ddb32f70fa22d8baf89f1d229dbea3931e1a41e03592e66ddeab2be2a21810d17097e205f1db035007376e692c68ba1682d6ee36a2c
 EBUILD puppet-5.5.18.ebuild 3739 BLAKE2B 180f08d4120e872353af7efec593fe400552a642ada66bb3ade49a2cfc4b58b012a2bcde6c85b61f029b633c67e455e081e37260e50aad9ba5275447bc45181c SHA512 57023e9d13e829f71ddbc790dfc3b9a334ceb707050ba728b954c6f7b2e534173c86abf7f53834847be0b873dd1e4b9cde493f43be7fd2269daf128449582fe8
+EBUILD puppet-5.5.19.ebuild 3739 BLAKE2B 180f08d4120e872353af7efec593fe400552a642ada66bb3ade49a2cfc4b58b012a2bcde6c85b61f029b633c67e455e081e37260e50aad9ba5275447bc45181c SHA512 57023e9d13e829f71ddbc790dfc3b9a334ceb707050ba728b954c6f7b2e534173c86abf7f53834847be0b873dd1e4b9cde493f43be7fd2269daf128449582fe8
 EBUILD puppet-6.13.0.ebuild 3630 BLAKE2B 1f992fbf96769cc70be52ff9997076ae971c20b78cee5b887523cea8be5a39e5d2a378a117558c51eb327d520a43bab0a1ccb7d2975a52491714cddff76fba9c SHA512 2818d322416f95269d185ba052604854be03f90953226c3f8232a1974bcff938c6fb74658cd68829e4148e65b658f4d1edcdcb23a82eabd5b73e08f43474269c
+EBUILD puppet-6.14.0.ebuild 3632 BLAKE2B c31b356950b8247bd9bd9161c6c51a8ee36be6508d64e925001e86a787788eae3af5379b30313a0f7e7d5a7104b44417f1cab30d415baa49dbc90db4f2c9ee2a SHA512 b5be8b20c4ad992078a8607f0679e45820a665a571aa870a79c29c8382656ec238f79f71bbdab9376aeb0b72532ad7f641990c3f0d5aa26288209ccef15e1ea3
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198

app-admin/puppet/puppet-5.5.19.ebuild

@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem eapi7-ver
+
+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 ~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/facter-3.0.0
+	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"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+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
+	epatch "${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
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	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
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	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
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}

app-admin/puppet/puppet-6.14.0.ebuild

@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils ruby-fakegem eapi7-ver
+
+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 ~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
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
+
+	# fix systemd path
+	epatch "${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
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${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
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	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

@@ -2,6 +2,8 @@ AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-6.8.0.tar.gz 44216021 BLAKE2B ac5641ee0bceef3948d108c725e2ff53d76e897cafd75c9bc6978462f4b157c3d30146ce2f57fd2aa7610b2defc4e074c168847d8aba5501cde16ee0ab7b5aaf SHA512 2dd01058edbd8a4bb3f4717dc518e58ac57139ccc0651e8e39c721a32651bd932fe4ec747c7da23561ab33d7d4d7ddc448fe9b05734d1562f799e183c5e236d5
 DIST puppetdb-6.9.0.tar.gz 44270700 BLAKE2B 2346bf8cf3c944b1a75d0ed9fc32678909f0a6615ea615b7d89316ce470eaaa9540b56550b655214711564c6f0f0e2931a0f037e0ffad983f5578a54b4b180ec SHA512 2450f82bcbcd84fd63f107ea69dc3890a77fc94a54b2c5601c5aa3ed80fcc12e26302f6150777fbcbc1fbedb3c9fb9dd60e6aea37101c0abb2cf19a1696be2e7
+DIST puppetdb-6.9.1.tar.gz 44274016 BLAKE2B eaf1fe6ee88d2f4a1d147032db017eefd95a3edaba6fe5b114be6ac4ce37584ee58fa96c34fdac97b9b8b1aecd8abc982107024d2155bb78781d1c2c2f2112e1 SHA512 8db39c7571af597be2cff7e21ec5818d422f83f1c3188896e8eb9391e52d0f4bb1f85358a25998db599e9db2b93baec60415a43b519be3da600a9c1de0f073bc
 EBUILD puppetdb-6.8.0.ebuild 2763 BLAKE2B 913c721b82a8ae802f53ea1fa332f5cc1a60183103b80d53d1c22aaf467f157d553ef8b7b278a561e0187b4bcafdff4bf14679cdedf7a76a093ea00559d57111 SHA512 3b913c9578b32300e711fa7e3c8fef072546adffedbf96ae62a3b69c2789277f90b6ccecf51da07c1400956f913ab2e67b6b7c008f7e5a557a24905769fad486
 EBUILD puppetdb-6.9.0.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
+EBUILD puppetdb-6.9.1.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2

app-admin/puppetdb/puppetdb-6.9.1.ebuild

@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+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
+	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
+	systemd_newtmpfilesd 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() {
+	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

@@ -2,6 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.8.0.tar.gz 59370389 BLAKE2B 227512d3a054980867730882459bff32559f8baa5fb0c807a14fcc827b8f41fc1da2cceab6bdbd6162bb4e6e6e4312f5d47d478f6887a978c359c6a4225d663d SHA512 9e4d0ea1aad1209342151cfcfd304e4a296df0e95fefde46d4e4a28a9da62422194492d430c3492cc717a7c872ee0f448a89a40fe1e1cb565f865fc0aca7089b
 DIST puppetserver-6.9.0.tar.gz 59495229 BLAKE2B 17e02d201dd39a7c9a060c8898c76de3b85c5ffceb8dae128c032352e8f2959b6084558790c14979f95b7904bc70db0b3374d81f2b0c1f70bfb286084d6ba3a4 SHA512 b1446d407d50e3da502e2cd882647379fb51334bf5d4cc13d3654c8f7cbec2d6c4d7efd8acdfbdc1c70c6e30e3b420ed642cbdb97ee5f6a16b3b404dbd42bba7
+DIST puppetserver-6.9.1.tar.gz 59496176 BLAKE2B 1599380ebf731fb4d67c04abc06303647d5d29c99f2b9721d049972eaaf3d4c2b108c6ac2f1a45efce3c52e9a57ebd362c874c36093027ebca77a2ae1d4c0323 SHA512 3a794adfa48c7bf9bd241c9da0578ea192b8551e75093e4d95c7c10fa659ef59d59ae72b33561d13ac31e839245d266301a6067d30b466138a95a6c4879bc58a
 EBUILD puppetserver-6.8.0.ebuild 5391 BLAKE2B 3db19d3de9931dbe5b79271c5d8c8400227f03de2e7cef8e9d1f265caee0b0ee8cbe8d045087f151dd45514118b171ec517d60f0430f765fc8f109393001e22c SHA512 678422ef9c9b792bb646d2392b1efcc354c906dbf514a72c6ef1fad4b8704f891a458576463f6f1138fc8468c9d7644cc55e0e2ebee3960406a4dd4a61c5a307
 EBUILD puppetserver-6.9.0.ebuild 5315 BLAKE2B 0b2fd54543dd6308d1a27157580387a5a2c1e8bb8144f435650eec139637478744d201e21f0607a4de8a7c21dfa0b862ebdface2baea6e115d94759e62a0957c SHA512 4f62ab911d8d6a3f6e723e7d2b3aebf2aa22798011b9494c552c5c09115e6e31e2835c2c6b071d7601187d089c106316a90d9eafbd6ceb67a63ecb4814a1a902
+EBUILD puppetserver-6.9.1.ebuild 5315 BLAKE2B 0b2fd54543dd6308d1a27157580387a5a2c1e8bb8144f435650eec139637478744d201e21f0607a4de8a7c21dfa0b862ebdface2baea6e115d94759e62a0957c SHA512 4f62ab911d8d6a3f6e723e7d2b3aebf2aa22798011b9494c552c5c09115e6e31e2835c2c6b071d7601187d089c106316a90d9eafbd6ceb67a63ecb4814a1a902
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c

app-admin/puppetserver/puppetserver-6.9.1.ebuild

@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+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 as puppet
+KEYWORDS="~amd64 ~x86"
+
+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
+	dodir /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
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	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-ri --no-rdoc \$(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-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}

app-admin/salt/Manifest

@@ -21,7 +21,9 @@ AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4
 DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b
 DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
 DIST salt-2019.2.2.tar.gz 14420887 BLAKE2B 84e8a0aa72b88a66a1020b695849926669728ee02f8cb51a14853b5e9c2ab692fe65810367e5d53268f7b234c10911f16d063ce665b3761432ab1d9c0aa52d16 SHA512 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
+DIST salt-2019.2.3.tar.gz 14572686 BLAKE2B 770b815f43ca8651408c1c057377b02c8037e673584c719e0a9b5c56c13c8db2db0e2c8641a17323f2b890d4a69d1508b0090624c7067869d9fa84303c2f8585 SHA512 cd694ca19696a84e3370e39c61da180e508592253713d99dd6dd5342b57c2814fee22e46bade30d7604f5730d9e1a736e59c3a512161f744d3f097f74a2836c5
 EBUILD salt-2018.3.4.ebuild 4708 BLAKE2B 162a115f026d2ad3ae9848e01480a8ae58038f56265ab54897d423cba3047bcaed8416df40a2ec4fd2dcdefc7d10358d3db09c4cdeb62e1ace79b71e84b37488 SHA512 a7c164af686586f7f936ddf19a6c7e0566438563c957c1f0687d3c9503cb52d2645ad776ca136f96c184bdcd1f6a81549e153da4616e8584da6286117a8d34f6
 EBUILD salt-2019.2.0-r1.ebuild 4882 BLAKE2B ea68671fa7e238daf2de3a6e20cec466fb6b90a6a847c7337a7d8f57ce9461fcfa7f2504bd474e1fe7e645ca4fcdd0fd4cf28a4ee71eaee36baaeda4642ecc97 SHA512 96c42a2afbb96cfab8601b19898a5d45c32bca07098da5e17cba3be6705d15d9d00fb8ccea27a421403979eca84e6a620d6355b538a9baf97c8a17f18bc9bb50
 EBUILD salt-2019.2.2.ebuild 4873 BLAKE2B 201471aa42f821ced444eb88ccecf80b9115913c8de3978018a5cd3435affacb32b61308edf71e2458272b6fc4575c2ade092c6b63ac8703f301b269b13126e0 SHA512 7c142f4afb28219b0d9bbc606b895e04e0306153e8ae5d44c80cf4e58110f1e441f0c94bad11784064150b0561d928492bb01fe0097d170696c44dfeca854763
+EBUILD salt-2019.2.3.ebuild 4873 BLAKE2B 201471aa42f821ced444eb88ccecf80b9115913c8de3978018a5cd3435affacb32b61308edf71e2458272b6fc4575c2ade092c6b63ac8703f301b269b13126e0 SHA512 7c142f4afb28219b0d9bbc606b895e04e0306153e8ae5d44c80cf4e58110f1e441f0c94bad11784064150b0561d928492bb01fe0097d170696c44dfeca854763
 MISC metadata.xml 2200 BLAKE2B eab8763ef66f507d2c22280d0539ac86b6aacc150936d8f79acf9618ce377b16c5fa50217937ed64bc4e54911e59ad00e56c28e3d7d1bd14e60e6e2b1e9a80a5 SHA512 f2e9292a4e554ccf37205171629a001e740731b2929d20fa68c4e9736939684f072e01526cec30d201aab8d211d45444415acb3268ea5763dbc3fcc933c737cc

app-admin/salt/salt-2019.2.3.ebuild

@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova"
+IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:0=[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/salt-2019.2.0-tests.patch"
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-2019.2.2-newer-deps.patch"
+	"${FILESDIR}/salt-2019.2.2-workaround-broken-mock-on-py2.patch"
+)
+
+python_prepare() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+	(
+		cleanup() {
+			rm -f "${tempdir}"
+			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+		}
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}

app-arch/libarchive/Manifest

@@ -1,7 +1,4 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
-AUX libarchive-3.4.0-without_zlib_build_fix.patch 4850 BLAKE2B 2f4a670afa2ca1ec22036b3544d03b04f7cd5fed4ce9829017c07323c45f4d0eae40555856d26a81345f65f6b65d0cb026ae4fa17ed3c1a42392190e390cf069 SHA512 1ae44704d4fcf5477baec6fdbf518dac6b9f40d3648d1a0447c0311b8388a3ab11fdea3db8b249a1cdfde65fcd27c4f41076d3f50444e67ec9bcec1a801775bc
-DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
 DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021
-EBUILD libarchive-3.4.0.ebuild 3740 BLAKE2B 04ab8c8883d737e487a7958126f67ce33fee85fe718a1d96f3ecd2973bce9cf88a5b63ae7a2cd92855829e5b7ded008810d19099a1b84103c504be291214ea4a SHA512 3c01e29150aaf15a326bf8e88357520964dc5f171640c2ffe35517bbfee74669345e55f2e3bd399407866fc14042260d121d720a5bf9751da211f27614f069b3
 EBUILD libarchive-3.4.2.ebuild 3685 BLAKE2B 9ef5d9b6d22873686459eae14d9987d220dd9e02227669e52ff90fb781f54f78356bc727966f4884264aedaab3cab77014af140aa92c987d33d9391ae6cf7200 SHA512 7dbe355f8623f85251fcc2ef658539edef96fbea58b6527b1bbf0ad7bf2468d1208c595adb589e012337bb4dbbf15b78b65b1a6d1daaf228c7bfd4f69d15e553
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7

app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch

@@ -1,160 +0,0 @@
-From 64333cef68d7bcc67bef6ecf177fbeaa549b9139 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Sat, 29 Jun 2019 00:20:58 +0200
-Subject: [PATCH] Unbreak compilation without zlib
-
-Fixes #1214
----
- libarchive/archive_read_support_filter_gzip.c | 54 ++++++++++++-------
- libarchive/test/test_read_format_raw.c        |  4 ++
- 2 files changed, 39 insertions(+), 19 deletions(-)
-
-diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c
-index 458b6f729..9fa9e2b0d 100644
---- a/libarchive/archive_read_support_filter_gzip.c
-+++ b/libarchive/archive_read_support_filter_gzip.c
-@@ -131,12 +131,20 @@ archive_read_support_filter_gzip(struct archive *_a)
-  */
- static ssize_t
- peek_at_header(struct archive_read_filter *filter, int *pbits,
--	       struct private_data *state)
-+#ifdef HAVE_ZLIB_H
-+	       struct private_data *state
-+#else
-+	       void *state
-+#endif
-+	      )
- {
- 	const unsigned char *p;
- 	ssize_t avail, len;
- 	int bits = 0;
- 	int header_flags;
-+#ifndef HAVE_ZLIB_H
-+	(void)state; /* UNUSED */
-+#endif
- 
- 	/* Start by looking at the first ten bytes of the header, which
- 	 * is all fixed layout. */
-@@ -153,8 +161,10 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
- 	bits += 3;
- 	header_flags = p[3];
- 	/* Bytes 4-7 are mod time in little endian. */
-+#ifdef HAVE_ZLIB_H
- 	if (state)
- 		state->mtime = archive_le32dec(p + 4);
-+#endif
- 	/* Byte 8 is deflate flags. */
- 	/* XXXX TODO: return deflate flags back to consume_header for use
- 	   in initializing the decompressor. */
-@@ -171,7 +181,9 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
- 
- 	/* Null-terminated optional filename. */
- 	if (header_flags & 8) {
-+#ifdef HAVE_ZLIB_H
- 		ssize_t file_start = len;
-+#endif
- 		do {
- 			++len;
- 			if (avail < len)
-@@ -181,11 +193,13 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
- 				return (0);
- 		} while (p[len - 1] != 0);
- 
-+#ifdef HAVE_ZLIB_H
- 		if (state) {
- 			/* Reset the name in case of repeat header reads. */
- 			free(state->name);
- 			state->name = strdup((const char *)&p[file_start]);
- 		}
-+#endif
- 	}
- 
- 	/* Null-terminated optional comment. */
-@@ -236,24 +250,6 @@ gzip_bidder_bid(struct archive_read_filter_bidder *self,
- 	return (0);
- }
- 
--static int
--gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
--{
--	struct private_data *state;
--
--	state = (struct private_data *)self->data;
--
--	/* A mtime of 0 is considered invalid/missing. */
--	if (state->mtime != 0)
--		archive_entry_set_mtime(entry, state->mtime, 0);
--
--	/* If the name is available, extract it. */
--	if (state->name)
--		archive_entry_set_pathname(entry, state->name);
--
--	return (ARCHIVE_OK);
--}
--
- #ifndef HAVE_ZLIB_H
- 
- /*
-@@ -277,6 +273,24 @@ gzip_bidder_init(struct archive_read_filter *self)
- 
- #else
- 
-+static int
-+gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
-+{
-+	struct private_data *state;
-+
-+	state = (struct private_data *)self->data;
-+
-+	/* A mtime of 0 is considered invalid/missing. */
-+	if (state->mtime != 0)
-+		archive_entry_set_mtime(entry, state->mtime, 0);
-+
-+	/* If the name is available, extract it. */
-+	if (state->name)
-+		archive_entry_set_pathname(entry, state->name);
-+
-+	return (ARCHIVE_OK);
-+}
-+
- /*
-  * Initialize the filter object.
-  */
-@@ -306,7 +320,9 @@ gzip_bidder_init(struct archive_read_filter *self)
- 	self->read = gzip_filter_read;
- 	self->skip = NULL; /* not supported */
- 	self->close = gzip_filter_close;
-+#ifdef HAVE_ZLIB_H
- 	self->read_header = gzip_read_header;
-+#endif
- 
- 	state->in_stream = 0; /* We're not actually within a stream yet. */
- 
-diff --git a/libarchive/test/test_read_format_raw.c b/libarchive/test/test_read_format_raw.c
-index 0dac8bfba..3961723b4 100644
---- a/libarchive/test/test_read_format_raw.c
-+++ b/libarchive/test/test_read_format_raw.c
-@@ -36,7 +36,9 @@ DEFINE_TEST(test_read_format_raw)
- 	const char *reffile1 = "test_read_format_raw.data";
- 	const char *reffile2 = "test_read_format_raw.data.Z";
- 	const char *reffile3 = "test_read_format_raw.bufr";
-+#ifdef HAVE_ZLIB_H
- 	const char *reffile4 = "test_read_format_raw.data.gz";
-+#endif
- 
- 	/* First, try pulling data out of an uninterpretable file. */
- 	extract_reference_file(reffile1);
-@@ -119,6 +121,7 @@ DEFINE_TEST(test_read_format_raw)
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
- 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
- 
-+#ifdef HAVE_ZLIB_H
- 	/* Fourth, try with gzip which has metadata. */
- 	extract_reference_file(reffile4);
- 	assert((a = archive_read_new()) != NULL);
-@@ -144,4 +147,5 @@ DEFINE_TEST(test_read_format_raw)
- 	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
- 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
-+#endif
- }

app-arch/libarchive/libarchive-3.4.0.ebuild

@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
-
-RDEPEND="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.3-libressl.patch
-	"${FILESDIR}"/${P}-without_zlib_build_fix.patch #693202
-)
-
-# Various test problems, starting with the fact that sandbox
-# explodes on long paths. https://bugs.gentoo.org/598806
-RESTRICT="test"
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-multilib_src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}

app-arch/lzma/Manifest

@@ -1,3 +1,3 @@
 DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
-EBUILD lzma-9.20-r1.ebuild 908 BLAKE2B bba909595d3e21b8915634b6bdf4a441e7c81eb3b3f88c04c2d420adc722bd08481a143e8424cbd994941a01e2aff16e0c3ee264bb9f0cabe04ece43a25fe9ec SHA512 43584227a1f4dc8fd14eb61424c211b9012ceca4d7c2d4b082f0e47a3f31cca0e9c467d1c1300de9777133cdfa258be23939ba16e71b0a2d60361989393c18b1
+EBUILD lzma-9.20-r1.ebuild 902 BLAKE2B 5a10369eb680f8674d9003bfba3a2ed4a7172a529c5bc438474b7e7971440a57e701d0978f4f0449343cc40caff848ceebd1844fba425bd6747d14243df8a92f SHA512 8eb76a953e16a7db587c31dd6dd4a82714ea0f842581aa75f6dd25b7e1efa2e55cd076bf4e754f5ea1f0b0763161a7a8753ea6a94b2c5ada5d116c204b6ddf99
 MISC metadata.xml 250 BLAKE2B e05a373f0ea02a1a107bb27632d2f6b87bb754d82a7a7c6f56b7bb6041a92a0bea6ef1a6353cd535f5f9d992b10cb68e402c4efa3189d7f65d2c9fc904a4610a SHA512 7bd753e69082bd70f8afe68f12584dd5ee18b9972c27c523570075d4d0168f3e3d8eb638da7ca08ab3969904e39ec2c76f4891fd649a26553abd4115a41b70bb

app-arch/lzma/lzma-9.20-r1.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 S=${WORKDIR}

app-arch/unar/Manifest

@@ -1,6 +1,6 @@
 DIST XADMaster-1.10.6.tar.gz 2064628 BLAKE2B 34203e5280a8e450db616849a953eb9f5147c8fe2922fabdcfce8585fd4bbe2c3aad76921368818e546d60d64b9c59de942cb63008edec83efa29ce4f5caae7f SHA512 f6e51943fd3ced9d0a0a2189db0a7a45d7f59e8109e78406b8c434f568fb53d791613e51437996cb1debae7d4490cdfabc9fa1fdfcc621ad97a43770af6b13e8
-DIST unar1.10.1_src.zip 2552535 BLAKE2B 678c90dae6572cf9de6f90d044de650d82293df3918eb298de27fe5a557efdda1c1da284c6829c667bb2812033627fcb1a31bf22318d277e9467ca965435f6b2 SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e
+DIST XADMaster-1.10.7.tar.gz 2064770 BLAKE2B f6119dfb46f3d617fafb5847f41d6c0f3e5e87c8cd0763cd8e5986fae1d5b1c6e6761e9e7e4fa84125003979151b2b34d35ff47dc9be3271107cf53f1be22644 SHA512 3447b6d8f3f4fa5eea93c6628a1633017da6ff09c580d5ce4fd422027b3b79acbf38d6e41a059806d1e60eb25a9d66889938b32599168dc2c0ca648e1c1976b1
 DIST universal-detector-1.1.tar.gz 196274 BLAKE2B d84dc1f850031213d88c288341edcbb588197f23ae0d10632ed129e73e4cc2b7670c8c862bba2165fcc7421c265e4dc3e791ea188e3d2b647bd1ab9b428bb866 SHA512 e514670b3d37b2472ed3e9cb0fdc3298a8479772264b7573411f104be554222bec2e01f73e1f35db95620fe785bee2dcf9ddc9c2b1f4ff6b522fa64d14d020f5
-EBUILD unar-1.10.1.ebuild 1182 BLAKE2B 19606fe1687ab46d2080b7441eed97febdba4d99b738e2b2251007d66d94a1d46c5f628ae8c4ef2ec8fdec2e44fefe26c6acc30135fd57af52ce3d00b3821e4e SHA512 2ecbd3d4d8061c2ac9f1f8e3bc0deb978442ebe38d0f9adf35670619f322b754583b292c095a775f0a3e22260a7ca02857e99c6bf1286dac4e6628ef6f07f567
 EBUILD unar-1.10.6.ebuild 1382 BLAKE2B 0f96855ee431dbdf70c35d09b4243b44681df61f580c1e3c39932475ff06e705a2a20b00e7f5a3da31da72ae4b0f8136798235a2419e1daf7c1d4d3ed5813e7c SHA512 1b71fdcc97e02e49217aa435ee8ff66bb4df0184fc0182082d391883539889c7d3f053c788501f5dc4f08a47a4663af61856f2124d4a9d076c1802470d34961b
+EBUILD unar-1.10.7.ebuild 1382 BLAKE2B 0f96855ee431dbdf70c35d09b4243b44681df61f580c1e3c39932475ff06e705a2a20b00e7f5a3da31da72ae4b0f8136798235a2419e1daf7c1d4d3ed5813e7c SHA512 1b71fdcc97e02e49217aa435ee8ff66bb4df0184fc0182082d391883539889c7d3f053c788501f5dc4f08a47a4663af61856f2124d4a9d076c1802470d34961b
 MISC metadata.xml 499 BLAKE2B 421812ffc3267f8786e62b36886bf0364ebffa55568f81d68bdfd32b0e10345b0501aae1a1196e7c91836bdec985b19c664f60c123ea5f42d40402176c31909e SHA512 784d45167cd50ca9bd5b3e0e5a2ec7f4086b3f653ed095f71246cbe7f8aa9515577611030e1d4a868b3cb690385afcd13c4839ca34c70902f9e07132e916e4a9

app-arch/unar/unar-1.10.1.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="unpacker for various archiving formats, e.g. rar v3"
-HOMEPAGE="https://unarchiver.c3.cx/"
-SRC_URI="https://unarchiver.c3.cx/downloads/${PN}${PV}_src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	app-arch/bzip2:=
-	dev-libs/icu:=
-	gnustep-base/gnustep-base
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
-	sys-devel/gcc[objc]
-"
-
-S="${WORKDIR}/The Unarchiver/XADMaster"
-
-src_prepare() {
-	default
-	# avoid jobserver warning, upstream bug:
-	# https://bitbucket.org/WAHa_06x36/theunarchiver/issues/918/dont-call-make-from-makefile
-	sed -i -e 's:make:$(MAKE):g' Makefile.linux || die
-}
-
-src_compile() {
-	emake -f Makefile.linux \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OBJCC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		OBJCFLAGS="${CFLAGS}" \
-		LD="$(tc-getCXX)" \
-		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}"
-}
-
-src_install() {
-	dobin {ls,un}ar
-	doman ../Extra/{ls,un}ar.1
-}

app-arch/unar/unar-1.10.7.ebuild

@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Unpacker for various archiving formats, e.g. rar v3"
+HOMEPAGE="https://unarchiver.c3.cx/"
+SRC_URI="
+	https://github.com/MacPaw/XADMaster/archive/v${PV}/XADMaster-${PV}.tar.gz
+	https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	sys-devel/gcc[objc]
+"
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/icu:=
+	gnustep-base/gnustep-base
+	media-sound/wavpack
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	${BDEPEND}
+	gnustep-base/gnustep-make[native-exceptions]
+"
+
+S="${WORKDIR}/XADMaster-${PV}"
+
+src_prepare() {
+	default
+	# avoid jobserver warning "make[1]: warning: jobserver unavailable: using -j1"
+	sed -i -e 's:make:$(MAKE):g' Makefile.linux || die
+	mv "${WORKDIR}/universal-detector-1.1" "${WORKDIR}/UniversalDetector" || die
+}
+
+src_compile() {
+	emake -f Makefile.linux \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		OBJCC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		OBJCFLAGS="${CFLAGS}" \
+		LD="$(tc-getCXX)" \
+		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}"
+}
+
+src_install() {
+	dobin {ls,un}ar
+	doman Extra/{ls,un}ar.1
+	dobashcomp Extra/{ls,un}ar.bash_completion
+}

app-backup/borgbackup/Manifest

@@ -1,4 +1,7 @@
+AUX borgbackup-1.1.11-unbundle-msgpack.patch 4540 BLAKE2B 7b1da72db127c03f8ab78008b58db122f3257e44d6cd4abd41bb45d333280fe0ac6373fa02eba423b714f760562e76b6ec6433ce4057b50c79ce3d4b4213e8ee SHA512 24f42a0d60266896901f7a37037c1ebce088e82bb46c8077b64fc44e9ee4a4dd96fa6efe91fa4d6d967829c8cf58ed8a0877200b73c76dd4047eeaf3dc1d1bdb
 DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
+DIST borgbackup-1.1.11.tar.gz 3718055 BLAKE2B ea03d538bd7936cc12705f73c3f8e63dc28167f1930e84bdd04fc13bcc34c2b9f35e7e6ed945ba20b647dbdefe12c66c04645414c7efc974e53a312e3dff6991 SHA512 cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573
 EBUILD borgbackup-1.1.10-r1.ebuild 1166 BLAKE2B ae27cdf2189b79b8f92b81fae737864cf1060760794309bdd8b2b7e58b8145f543540018846c2389fe67da3a8f2dc03358c58643883547e0a095a9dc57183156 SHA512 b73ff4cb83104d0b1f262ec6c663d7282f9508538d901e8956705326419fb5eba2019ad914015f15b9fa228885f42409aa8a11a1f22fe214eb847839d73f8364
+EBUILD borgbackup-1.1.11-r1.ebuild 1165 BLAKE2B 3f60fbeb5a6f9006ab18e289ec4a3ff93d97260d9e17aea0dbf50f23a30392d67f47ad4c287199750de76ab8148ea8b78817668b5374f6c6c2f82e330d2f03f4 SHA512 a986e0948aae26c29f11548bb6791c19f8688ad7d30b6ba7c6b1b1d467c9d9aabc10e3cf7f6a81ed3324d8eaf47326e18ef39d194410e8c5be6cd4cf55eb4616
 EBUILD borgbackup-9999.ebuild 1189 BLAKE2B 9feb65668e744f9731af3a4336f95b3d19a8e9dab8fa34250d2304e4ae1a1c8575da83fd6194849abd0b436d7c44d2084368460fbe4f11aff84307f5c45fd91e SHA512 a042d878db9bde0efb0d6ab6029217fe32a5061653d1112a6d9354d2440e4a8f21f5f44008e6732f4ed57365f43505d0e49c7a61051aa40bc94989881856f052
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17

app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild

@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	virtual/acl
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	rm -rf src/borg/algorithms/msgpack
+	eapply "${FILESDIR}"/${P}-unbundle-msgpack.patch
+	distutils-r1_python_prepare_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+}

app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch

@@ -0,0 +1,110 @@
+diff -Naur borgbackup-1.1.11.orig/setup.cfg borgbackup-1.1.11/setup.cfg
+--- borgbackup-1.1.11.orig/setup.cfg	2020-03-07 18:44:15.000000000 -0500
++++ borgbackup-1.1.11/setup.cfg	2020-03-11 10:28:25.168481822 -0400
+@@ -6,7 +6,7 @@
+ 	F401,F405,F811,
+ 	W504
+ max-line-length = 255
+-exclude = build,dist,.git,.idea,.cache,.tox,docs/conf.py,src/borg/algorithms/msgpack
++exclude = build,dist,.git,.idea,.cache,.tox,docs/conf.py
+ 
+ [egg_info]
+ tag_build = 
+diff -Naur borgbackup-1.1.11.orig/setup.py borgbackup-1.1.11/setup.py
+--- borgbackup-1.1.11.orig/setup.py	2020-03-07 18:32:06.000000000 -0500
++++ borgbackup-1.1.11/setup.py	2020-03-11 10:28:15.568759338 -0400
+@@ -25,8 +25,6 @@
+ # True: use the shared libb2 from the system, False: use the bundled blake2 code
+ prefer_system_libb2 = True
+ 
+-# prefer_system_msgpack is another option, but you need to set it in src/borg/helpers.py.
+-
+ min_python = (3, 4)
+ my_python = sys.version_info
+ 
+@@ -79,8 +77,6 @@
+ platform_syncfilerange_source = 'src/borg/platform/syncfilerange.pyx'
+ platform_darwin_source = 'src/borg/platform/darwin.pyx'
+ platform_freebsd_source = 'src/borg/platform/freebsd.pyx'
+-msgpack_packer_source = 'src/borg/algorithms/msgpack/_packer.pyx'
+-msgpack_unpacker_source = 'src/borg/algorithms/msgpack/_unpacker.pyx'
+ 
+ cython_c_sources = [
+     # these .pyx will get compiled to .c
+@@ -98,12 +94,6 @@
+     platform_darwin_source,
+ ]
+ 
+-cython_cpp_sources = [
+-    # these .pyx will get compiled to .cpp
+-    msgpack_packer_source,
+-    msgpack_unpacker_source,
+-]
+-
+ try:
+     from Cython.Distutils import build_ext
+     import Cython.Compiler.Main as cython_compiler
+@@ -133,8 +123,6 @@
+                 'src/borg/platform/syncfilerange.c',
+                 'src/borg/platform/freebsd.c',
+                 'src/borg/platform/darwin.c',
+-                'src/borg/algorithms/msgpack/_packer.cpp',
+-                'src/borg/algorithms/msgpack/_unpacker.cpp',
+             ])
+             super().make_distribution()
+ 
+@@ -155,14 +143,12 @@
+     platform_freebsd_source = platform_freebsd_source.replace('.pyx', '.c')
+     platform_darwin_source = platform_darwin_source.replace('.pyx', '.c')
+ 
+-    msgpack_packer_source = msgpack_packer_source.replace('.pyx', '.cpp')
+-    msgpack_unpacker_source = msgpack_unpacker_source.replace('.pyx', '.cpp')
+ 
+     from distutils.command.build_ext import build_ext
+     if not on_rtd and not all(os.path.exists(path) for path in [
+         compress_source, crypto_ll_source, chunker_source, hashindex_source, item_source, checksums_source,
+         platform_posix_source, platform_linux_source, platform_syncfilerange_source, platform_freebsd_source, platform_darwin_source,
+-        msgpack_packer_source, msgpack_unpacker_source]):
++        ]):
+         raise ImportError('The GIT version of Borg needs Cython. Install Cython or use a released version.')
+ 
+ 
+@@ -805,26 +791,7 @@
+                                                system_prefix=libb2_prefix, system=libb2_system,
+                                                **crypto_ext_kwargs)
+ 
+-    msgpack_endian = '__BIG_ENDIAN__' if (sys.byteorder == 'big') else '__LITTLE_ENDIAN__'
+-    msgpack_macros = [(msgpack_endian, '1')]
+-    msgpack_packer_ext_kwargs = dict(
+-        sources=[msgpack_packer_source],
+-        include_dirs=include_dirs,
+-        library_dirs=library_dirs,
+-        define_macros=msgpack_macros,
+-        language='c++',
+-    )
+-    msgpack_unpacker_ext_kwargs = dict(
+-        sources=[msgpack_unpacker_source],
+-        include_dirs=include_dirs,
+-        library_dirs=library_dirs,
+-        define_macros=msgpack_macros,
+-        language='c++',
+-    )
+-
+     ext_modules += [
+-        Extension('borg.algorithms.msgpack._packer', **msgpack_packer_ext_kwargs),
+-        Extension('borg.algorithms.msgpack._unpacker', **msgpack_unpacker_ext_kwargs),
+         Extension('borg.compress', **compress_ext_kwargs),
+         Extension('borg.crypto.low_level', **crypto_ext_kwargs),
+         Extension('borg.hashindex', [hashindex_source]),
+diff -Naur borgbackup-1.1.11.orig/src/borg/helpers.py borgbackup-1.1.11/src/borg/helpers.py
+--- borgbackup-1.1.11.orig/src/borg/helpers.py	2020-03-07 18:32:06.000000000 -0500
++++ borgbackup-1.1.11/src/borg/helpers.py	2020-03-11 10:28:42.519980213 -0400
+@@ -55,7 +55,7 @@
+ #   any feedback related to issues caused by this will be ignored.
+ # - especially, it is known that msgpack 0.6.x does NOT work for borg 1.1.x.
+ 
+-prefer_system_msgpack = False
++prefer_system_msgpack = True
+ 
+ try:
+     if prefer_system_msgpack:

app-backup/duplicity/Manifest

@@ -10,5 +10,6 @@ EBUILD duplicity-0.7.10.ebuild 1267 BLAKE2B cdd85dc1c3e0aa64c95f74f24ff7001856b4
 EBUILD duplicity-0.7.12.ebuild 1273 BLAKE2B a50c92e242971f614628e35f7a5aae330da3135b90cef0f6c9aea6a757b25754786b2d77b5ef1fce553b23a73a3a53b537250ede4dc5efd6dcf5c60fd9dc0a45 SHA512 ed81b75b9f407f33dd75450bcde00b94a5dc17ab6cb51808fef872d4d4d19b29f676aef440ba69b24835e1eab5e2b69196b8d8deb983f36916863be12b099cc7
 EBUILD duplicity-0.7.19.ebuild 1268 BLAKE2B dc3546c00b5d333b9675d8d75bdfdb7ed5043f7909bc814be17b3f49328facd92d75aa30aaddcd50a6630327a85e0d5d1c5434282dafd3aa0045279130272d28 SHA512 e7b5ce1870df96a4a0a5fe0e4a78057afdea70966a478d5156a48254d6b6fbe2ff77b770919e870e0bb36984e724b97548d78a58ddf1bf8e7c01a86a5aebb1d6
 EBUILD duplicity-0.8.09-r1.ebuild 1145 BLAKE2B 273578315aaba146baedf841470888715b6558ea5c8bf999d91587a21cfc3450f423d4ec61b03985dc298f051c82131003649cf596b3dfbf5743f8bcac59cc57 SHA512 280efb11daad97dbf694487ee264f51b8c504ba81039b25da4601614315d77abb076906c35f8d2f0fdee483750f283476bd946bc51cc1bd7bfad9bcc923659ae
+EBUILD duplicity-0.8.11.1596-r1.ebuild 1165 BLAKE2B a26ded86a001f0999c1c7509a8541b99a40c3c8889998c8692d2fb43098a135f0aea3cb32daf8ebe321e627837813ca2d3105f4bfa70cb201b19a0ac5402a8b9 SHA512 f4fb5780fdff31a5df0a856d957501f29ce22c8537bc6d52233bf164e8e2bc426fae6fe8d3ea2db9aa48a23108c945ad16d398155b98d47876de55258355098f
 EBUILD duplicity-0.8.11.1596.ebuild 1155 BLAKE2B bae8655b95ecd52279b51a211ad61a976a734d8eb792196eea0cb8c143174664f60cd8e64bf2cd1b3713599b4694fcfa90bca5066ef98da6f4d63f14183ee771 SHA512 4137e2f454de49e8733d4a392c5940efa34a98f6cdd7df98feb5ec8d56a449f166c92d024ad88b32f9d529f0701fe4786fd547305505a0298f69fa06ce1dedfe
 MISC metadata.xml 539 BLAKE2B d83188c2a48a4ef03912a7fe8ca40700797a0d46a3f646292b03b328104b7bb6669729ce82330c40cb4935df26f8171c460630029e41b4013b6eaefeeb258fd5 SHA512 4d82d8f4096c2791e79a1dbb6652783d3a773d7a96c1e8726e00fc8c570c011908ba24370c4c751c30a16bf8e977e3d6fe26d011950cf9d5bd8277c4a0471b76

app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
+HOMEPAGE="http://www.nongnu.org/duplicity/"
+SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="s3 test"
+
+CDEPEND="
+	net-libs/librsync
+	app-crypt/gnupg
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-arch/par2cmdline
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-docs.patch"
+)
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
+}

app-crypt/gpgme/Manifest

@@ -1,6 +1,6 @@
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
 DIST gpgme-1.13.1.tar.bz2 1759616 BLAKE2B 17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70 SHA512 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8
-EBUILD gpgme-1.13.0-r1.ebuild 2878 BLAKE2B 2da91bd9d625f1165df0abfad33810e1b007a029e7b48d491d72986cbe4971d3e7c0ae8bfabfb203a0c284e39c8327d3dba4a6dee8f954ebdb0d8d5ef7b21b9f SHA512 94548fcefc1d5828385b7efdaf611f39598750077c0f4858f1c562fe76a17b65735344b16612dddae0fdea79bf09274d80c5b4af84ae0617178b9aab4b7b7819
+EBUILD gpgme-1.13.0-r1.ebuild 2673 BLAKE2B 9797013c00daf7aa9d0d0771307a33c870d701ebdec840f3dcc36ad4f8f48529020deb845eb8a564caea99f8a2bfac5ad5b48ce9725a79ece2b05961f3d073d9 SHA512 ad969c148aa75802ded68c6dfadee04eaa808a4c61717b6e1261876b4469d5f7114ecf5ac99215e9046bf4298d7055ae8b054b7908377b367238a4c6e973b6e3
-EBUILD gpgme-1.13.0.ebuild 2869 BLAKE2B c1d9063718585de62adbc334c9da2184e5b546f41e61dda7e22f5c966aea7f9229507853952c28a6af9e8ce2b9895954f8f3a7eea4c0d8523af3ddddefb4c379 SHA512 ec8fafe2070633be382cff3d09393b87b3a15fe018e58961d6525eaeedb98ddc94ba374d157c9e8e4a87cbf09e80c0b65148ccb271a89e36de5f017e91756576
+EBUILD gpgme-1.13.0.ebuild 2664 BLAKE2B 51c4bac11534ae6187d0d3bf49ea845953f4d139e659d92ff258e9e0013300165a928b8b576522654f24b59eb5e53399056013d97f3dcd4557c607f02e79075a SHA512 2fa9f953118a31dd4a827a38626ed6192d9c94674066062c38d74fab2bacdac3c2c671daad47b333b7b3ba433f8043f8d1ce87085dc0ba735a8b26b555fed6d7
-EBUILD gpgme-1.13.1.ebuild 2878 BLAKE2B 4023fe243cf0df209c1a408e7f635a06cf30c4e0e96f19b8f797a4c5aa899fe301bd97c264fe1a0f009934faf9f3bec29a25c5d88b9c7601a35c9c538cddb2bf SHA512 c442573cbbbd40906634f1a736e04837c3a3cb19e957808b68ba5ae4998f42c0e3ed4d3cd61ab8af2ef96fbf23af85cfc263ed604c89246cd6568e617d9be322
+EBUILD gpgme-1.13.1.ebuild 2673 BLAKE2B e64826465153cc45763b92b1cc3c14722a1e6b482ef6ce9836ab8d9a61bd647dbd0134cba1336f0878dc7fab96275004a9d19f11fa5360b93a3f6184be72a09e SHA512 550752badc923cc321b6efd81b21320070a9333275e3b6cb00bb206bfe5cb44128172805d6692eb4e68fcf1945907e87e68ec02e599ad94ca31cf1f20bc874be
 MISC metadata.xml 438 BLAKE2B c080438b3f22dbb803acca5a47dd880271b97c2def132cb0fefbc3d3e30c663d02be6bc7553393ab1d33932313026ade3f3f0c576fb572938f0b5fdc6f07210f SHA512 5a5c496db2115e5bc4ccb81aa69995c85a6b967c3acaab1423f94d22c55965f8e9377711e8c3a4e359ae661ef9d6137959058500a6cb036656a5d14fb88d0bac

app-crypt/gpgme/gpgme-1.13.0-r1.ebuild

@@ -15,23 +15,16 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs cxx python qt5"
+IUSE="common-lisp static-libs +cxx python qt5"
 
-COMMON_DEPEND=">=app-crypt/gnupg-2
+RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.5.3:=
 	>=dev-libs/libgpg-error-1.29:=
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	qt5? ( dev-qt/qttest:5 )"
-RDEPEND="${COMMON_DEPEND}
-	cxx? (
-		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
-		!kde-apps/gpgmepp:5
-		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
-		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
-	)"
 BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"

app-crypt/gpgme/gpgme-1.13.0.ebuild

@@ -15,23 +15,16 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs cxx python qt5"
+IUSE="common-lisp static-libs +cxx python qt5"
 
-COMMON_DEPEND=">=app-crypt/gnupg-2
+RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.0.2:=
 	>=dev-libs/libgpg-error-1.29:=
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	qt5? ( dev-qt/qttest:5 )"
-RDEPEND="${COMMON_DEPEND}
-	cxx? (
-		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
-		!kde-apps/gpgmepp:5
-		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
-		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
-	)"
 BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"

app-crypt/gpgme/gpgme-1.13.1.ebuild

@@ -15,23 +15,16 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs cxx python qt5"
+IUSE="common-lisp static-libs +cxx python qt5"
 
-COMMON_DEPEND=">=app-crypt/gnupg-2
+RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.5.3:=
 	>=dev-libs/libgpg-error-1.29:=
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	qt5? ( dev-qt/qttest:5 )"
-RDEPEND="${COMMON_DEPEND}
-	cxx? (
-		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
-		!kde-apps/gpgmepp:5
-		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
-		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
-	)"
 BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"

app-doc/doxygen/Manifest

@@ -10,8 +10,8 @@ AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc6079
 DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
 DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de
 DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
-EBUILD doxygen-1.8.15.ebuild 3189 BLAKE2B e1cc31bd9a61ac2b13f33919519ee1411805dfe89de013831ce7194ca88bdf1329f00b9c5716e9f84c91c527b632d9d868f8fc4fb96cdd66eb862d97d8424003 SHA512 3653836afac52091fa525db6061713e5f0d3a1c8aef6785b93a120985f6e0e6db1b5818a9288b219d6ddb52b33321c2eddd3848581bfc9a2fc7f687132dadec8
+EBUILD doxygen-1.8.15.ebuild 3236 BLAKE2B ef3deb36da35b1e49c24acc10124415a858381d2674bc0c84baf685a691e2b8a06c762db492e12a519f190070272ede6f927c92807b6a3ac8f828b470480dcde SHA512 c53de503df9505d066f8ffb8763cbe7c4045eca1c74dfc902e138bc674b051335b5f851c80365b89cf93fb177eafbbb17bd83a1f4cd679c533cf4d532240d517
-EBUILD doxygen-1.8.16-r1.ebuild 3362 BLAKE2B fc150f8a64e316f2748e0f8f273ce6ea123eea3d4e1f399dfb9258640449bbddae5f881f9f137e8c91591fa90b91ad4c8eac2f4b5bbfab2b85932db16d6d2f86 SHA512 3ba6b25e61f3013b246ed8ed47f3375899eb241907f4775869f40b8af78b2e671308569b9d6f1d700b999ec57dabbf51aa403339912f71a6e8a8fb2446e41849
+EBUILD doxygen-1.8.16-r1.ebuild 3408 BLAKE2B d0a9adfccacda766724aeec3f7dbee65fe3c6d4eaa72218e4116200baf9b7b0815f304cc9af2618781e4b28927193bc421b78208c3a7aec262a98edbfedee98e SHA512 67debd3dd6a1115ef3deb552ff8685a9f9751fe1d5ccc31e844be3e57b3063bc91e8c76686fd31e544bb1c100826807291ce2c82a8b9b4f81d0fecd1a4420801
-EBUILD doxygen-1.8.17.ebuild 3208 BLAKE2B 60a9a0cf7c2633ae1ac1261fa58b057b51d219d5f04d6a11859427025103f2273abe5fd3f2044d1b7eb4999c10214e6e03701d67e7aeaacde642ebf18b0607d7 SHA512 726a6e361428018e41e0ac2526da378f68a24b6d339beb5ba8fc182f76c143010d78800dd2c7439d1e4a32d6a89502eddb048d6c73485b8045397fb0c6e852cb
+EBUILD doxygen-1.8.17.ebuild 3255 BLAKE2B dff54dc8bb212467feabf718c1bb1acc547ad18f6accc66ada57a4f3a22a2d37486043b388a9fa77455f7a9074bd2da7e88e2895ed04c13491f294f182ed5c5a SHA512 aac0dceee3b2c9df1e53c8d02a2e08fd6e06ded2e7ccb9402520d6f7c14735cf67d0992408842056654d47590d4dc7fdb0ce6789a6b74e16d2f005f63617fb20
 EBUILD doxygen-9999.ebuild 3097 BLAKE2B 5206c586341d3b466cddd8e67a2ef850d729fade70d02760614e98cfa32dd44dfd6ca6295ffc656e004e1c6c2a8b46485ed5378535037469af9e57350945a247 SHA512 2d83e329ebef1ccfea7d8f99f37feb6cb4bfd058f89cc85a7d3d123131d0e4e7098aab292cb0697974e7bb39f25d5a57ee3362735ecf36f171528db541a0b86d
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61

app-doc/doxygen/doxygen-1.8.15.ebuild

@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils eutils python-any-r1
+inherit cmake-utils eutils llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
@@ -27,7 +27,7 @@ RDEPEND="app-text/ghostscript-gpl
 	dev-lang/perl
 	media-libs/libpng:0=
 	virtual/libiconv
-	clang? ( >=sys-devel/clang-4.0.0:= )
+	clang? ( <sys-devel/clang-10:= )
 	dot? (
 		media-gfx/graphviz
 		media-libs/freetype
@@ -67,7 +67,10 @@ PATCHES=(
 
 DOCS=( LANGUAGE.HOWTO README.md )
 
+LLVM_MAX_SLOT=9
+
 pkg_setup() {
+	use clang && llvm_pkg_setup
 	use doc && python-any-r1_pkg_setup
 }
 

app-doc/doxygen/doxygen-1.8.16-r1.ebuild

@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils eutils python-any-r1
+inherit cmake-utils eutils llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
@@ -28,7 +28,7 @@ RDEPEND="app-text/ghostscript-gpl
 	dev-lang/perl
 	media-libs/libpng:0=
 	virtual/libiconv
-	clang? ( >=sys-devel/clang-4.0.0:= )
+	clang? ( <sys-devel/clang-10:= )
 	dot? (
 		media-gfx/graphviz
 		media-libs/freetype
@@ -68,8 +68,10 @@ PATCHES=(
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )
+LLVM_MAX_SLOT=9
 
 pkg_setup() {
+	use clang && llvm_pkg_setup
 	use doc && python-any-r1_pkg_setup
 }
 

app-doc/doxygen/doxygen-1.8.17.ebuild

@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils eutils python-any-r1
+inherit cmake-utils eutils llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
@@ -28,7 +28,7 @@ RDEPEND="app-text/ghostscript-gpl
 	dev-lang/perl
 	media-libs/libpng:0=
 	virtual/libiconv
-	clang? ( >=sys-devel/clang-4.0.0:= )
+	clang? ( <sys-devel/clang-10:= )
 	dot? (
 		media-gfx/graphviz
 		media-libs/freetype
@@ -66,7 +66,10 @@ PATCHES=(
 
 DOCS=( LANGUAGE.HOWTO README.md )
 
+LLVM_MAX_SLOT=9
+
 pkg_setup() {
+	use clang && llvm_pkg_setup
 	use doc && python-any-r1_pkg_setup
 }
 

app-emulation/diskimage-builder/Manifest

@@ -1,4 +1,6 @@
 DIST diskimage-builder-2.33.0.tar.gz 434041 BLAKE2B 16d14c68e7a54b785426516ecced4adb53b4e84f36d36846732ef7c4823644375373249ceacd1371e39262ebc9050f2f86184718dc3fb17b44eaa20f561410c0 SHA512 125bdcc0a2d4249918485115c49482746e4f86cb7883d3689afd4288a0d18ca97bcb669b811034ccb159879520172ca37bd9f9d7ba4ea509f788be0f3cf2259b
+DIST diskimage-builder-2.34.0.tar.gz 436267 BLAKE2B b234385fedb48ec32c7fb8b684bd5531e04e342b237cc2090bd69742774a58868a1021767fb281a06cff1507d7d0c109ecb26caea61d0075ddf1a0fff9b1b48b SHA512 ddad45d57fc59c64a07276492354a7ea6d6aea76e300f1fce202208159a285c51dfc851f6630287b19c9f5685315cdcab1125e37cea90a92c361ea38e82a5a33
 EBUILD diskimage-builder-2.33.0.ebuild 1130 BLAKE2B 7525abba5802a5475bf5f79ee39956ac265d3bda5ebdeb9468c50811c8ba564c1c8391c67616d208f00a3620c39b1f3cb8cc55e34789472c437307e4663aa02f SHA512 8a15f329598ba70129071e4efc5e62b257fc56dde57a9c238cedcfe002d997385bae6cf0c8a380ae19ed8b58a17c113046cf419786626aeb515fd3020f3a2e60
+EBUILD diskimage-builder-2.34.0.ebuild 1131 BLAKE2B d077e0bcc6df338cfbab02a90bf1cada112848619de1a660afb0e79d282d1698e6ab39acb47dffb5b8582ac2cd465b63b60febbff791d84f3cdb2c015f194cf5 SHA512 ab2e56b8e7068487ac60422a81b0ba60a59b8bb30e20108a82d1bb809d3ed6987ae0226632e91a7eb3b30d92145792858f0d6b7cd4eaf8fa15caf6d863bfeb0b
 EBUILD diskimage-builder-9999.ebuild 1131 BLAKE2B d077e0bcc6df338cfbab02a90bf1cada112848619de1a660afb0e79d282d1698e6ab39acb47dffb5b8582ac2cd465b63b60febbff791d84f3cdb2c015f194cf5 SHA512 ab2e56b8e7068487ac60422a81b0ba60a59b8bb30e20108a82d1bb809d3ed6987ae0226632e91a7eb3b30d92145792858f0d6b7cd4eaf8fa15caf6d863bfeb0b
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277

app-emulation/diskimage-builder/diskimage-builder-2.34.0.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"

app-emulation/libpod/Manifest

@@ -6,5 +6,5 @@ DIST libpod-1.7.0.tar.gz 8679022 BLAKE2B 8a8037b75deae9f94461ab697b2a7cf095254c6
 DIST libpod-1.8.0.tar.gz 8992983 BLAKE2B a3b12dbfbdb0fe01ef8791de2c938cbf21c01ac0b36314d2a170c593d22eea08d912f8547861b239bb982db6acc9d2426adb97ffda4603739321cff0fb9ff1d8 SHA512 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87
 EBUILD libpod-1.6.4.ebuild 4073 BLAKE2B f0b50d64b5df8ecd7079d744fc26fab7c236d30b50a2ee855db64171ef112d95aa86a9defd71bf4d0ab348b59301e7814543d40ba5bf80a6ea012121a332697c SHA512 c4c99e465743ca0f97351e691edf91c535a734b4e9ac499724904341352dbffb9f5f5772df61bab87ac47bc45e9ff5a72d79eebf4de34c3046a9d458a75a146f
 EBUILD libpod-1.7.0.ebuild 3740 BLAKE2B 3de42be1182622ed7b050bd15b442b791f2b4ad53472276d46b5cf730d0d179f35c13b621ea210c3395480e7a4353ff93a9749ed13b957e14cbfb7ae20bd456c SHA512 3799b940413f1c02df27133dd93289dd8d9776c84838292dafbd424ffc8fa25ace3f440fb06e579f1d0d11f33d868af643a15cbf96f61e9ff726794f24e28bdc
-EBUILD libpod-1.8.0.ebuild 3740 BLAKE2B a14d6f736f790cdcc3d2235e447c10f62a072c958d77381a487aa26486830bf5e7dff558ebceff9697c5add3bbc383dfe905baf1e4f0dddd209f9331cae438ca SHA512 fd2396a399f7290a157abe6f39aff044fb69da5d0790b94af7c19614f308bc8c5a6fb795242794f7a530e84e77ea0399f025407ebc516a0a92492607c7a43c1d
+EBUILD libpod-1.8.0.ebuild 3849 BLAKE2B e53bb5e9d01d104de15d8d8a13190cb2d9a53a49c9b583b2aeb30660a85c003b6a2d63f2a3b3d947ca5dff4089a4c58bc3ca123cb2afd095dfbc78384ba06ef2 SHA512 fcb10d5f350d53863190e3b8d328d6c21535042de092ba617b03250fc3c652422fb853f134b785f4a5c7adba7e93a27ef0ef669d5206ab64e3b535d079efe2e2
 MISC metadata.xml 879 BLAKE2B 71e5ad7ed29e426919198aafd97805d704938cf938db4c6ce72e6e490753ed1c7a61e63209e855fddea0598f7c869dc1dde42cd5152f94377763d7163455ca53 SHA512 6a1a84612a4aa99a10d6f9b64168c748e2d19ea26e938938e1581e5f09bfac3d972382dfe7ea78e446d326743e8adf872a2010742d256cb04093c6d3fef36a31

app-emulation/libpod/libpod-1.8.0.ebuild

@@ -41,11 +41,15 @@ src_prepare() {
 
 	# Disable installation of python modules here, since those are
 	# installed by separate ebuilds.
-	sed -e '/^GIT_.*/d' \
+	local makefile_sed_args=(
-		-e 's:GO111MODULE=off:GO111MODULE=on:' \
+		-e '/^GIT_.*/d'
-		-e 's/$(GO) build/$(GO) build -v -work -x/' \
+		-e 's/$(GO) build/$(GO) build -v -work -x/'
-		-e 's/^\(install:.*\) install\.python$/\1/' \
+		-e 's/^\(install:.*\) install\.python$/\1/'
-		-i Makefile || die
+	)
+
+	has_version -b '>=dev-lang/go-1.14' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+	sed "${makefile_sed_args[@]}" -i Makefile || die
 
 	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
 		-i hack/get_release_info.sh || die

app-emulation/xen/Manifest

@@ -2,11 +2,11 @@ AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3
 AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689
 DIST xen-4.11.3-upstream-patches-1.tar.xz 30200 BLAKE2B c63fd2d15efda1ae9aab534c13cd1826a87a5fbd2757f3d82461b1ef2dada0ee23dbb814328e3f8695e0819094d80584fc388536c927c386f02201d4d26a8287 SHA512 e48c60f724fa0f2d5e2bbea3d71590d7c3be2973c35c4b73ff0737f03207dcbfd7f9e43b43783bb739f7059778862693a50354178ae2fd53b04e5d39429e59cf
 DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
-DIST xen-4.12.2-upstream-patches-0.tar.xz 3976 BLAKE2B 4527b5699b13e1b5bed9b82b67c7a3ddfbe39dc69f63b3bb1fda81cb315c6d78a34441219b8d4ae3d95ae2bc52ef0779410b65813212fa07867061fcb2b599ac SHA512 462de147b0474ca8e051219b41b088f25eb4be3962cde399403be5fbcfd4747054f84bf8c732ba8d86c1ba1980c518b67cd8e4f342e4120dd8bf6594d185a92e
+DIST xen-4.12.2-upstream-patches-1.tar.xz 17016 BLAKE2B 5bd27f6187c13b1c4792aa81c0ca8cde0d687566e0fde322e7cb249e1c8665fca0def5a137493a04598b617c46f052cf69701257ea1b97823fd1534d94cabd8f SHA512 dab5e7a3ac1a82faff3069f07945dc0b9651f90e8e87b3c342bb98a06ac244d212dc0baf8c7f1997f285b06baca9dc57d4823bfb220ca34274bd3d6d31421b02
 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
-DIST xen-4.13.0-upstream-patches-0.tar.xz 11156 BLAKE2B e704a3fc1a9213a79208cf60b9972f5480214c0f050fce15245e225b67a34f90ca46e77a74c286d7aef90718295ec6968c2671b72f1994a4372bc191681d38f8 SHA512 594194021d0786016e8e214d477892c1ea721e1964729a15ab6928c3cb14b986cbc628d1522ccbf9d53fe568f680acb056d2ff2a37e64261d183589accea4983
+DIST xen-4.13.0-upstream-patches-1.tar.xz 26000 BLAKE2B 0ab884f4b64f318c256d1959fde34da85e85a1d6974f00001125e29838f3f7d9b06ff767dff437635648eed1449976ff88250cbe141e9175d4430135e8923667 SHA512 f37514bf7ad92f8d8be798129c446fe9ec0d409e904f6b4971f07dd8b899dd20f40424a72106d7c50da83fed1f7097c575fbdeee06e18f9f4255bf6b2a71f08a
 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225
 EBUILD xen-4.11.3-r1.ebuild 4078 BLAKE2B c2d4cecd045f3d5581fad3270903fde3113c19a035e27b0840db436d903ef6b78b125d0ba61cc6b8250d325720862089133bc2b53f345c271047a3681830fb59 SHA512 130e127d07fa13f83e3cfce7b7e6a685ed2daaeea76752259658f45b70cb27a5f13903fae783876bf55aae025aa03eb66ad792373c138b8facc60295a9908e35
-EBUILD xen-4.12.2.ebuild 4439 BLAKE2B 31601fa16424ed5e65279132306f439c065e2cdf4b52d84373f0f45e34868ec3d3a623aabb4f098215f65f8fe8d904076d91907c2d018fb8542ee05de8ce5eed SHA512 c224fd8b0e6fc08894d82194117d044a776e2317aa5a2bd97a6fd2d84c5f7e79692c946499b21c122d22456a80eb32253db1b6fc77e199b84185ad129fa85b13
+EBUILD xen-4.12.2-r1.ebuild 4439 BLAKE2B f6f75aecc3d0aa8316bcdbe4390f3cb1d4e7f84b06ed885ffa35db4d2429f02e3da9b4a2c4e514cfe1588a2559cdcd41ccdae8ae256d56439214d7cbebc2aed0 SHA512 bf542eb66c38f9d4e2f7a010f044b8ccbad0f6b86ce66c3feaf7dabd335149fc759eca5fe8cda717d381ee9b24b47df6ae76970b2adcb12d7d6d224d5a7d7a53
-EBUILD xen-4.13.0-r1.ebuild 4439 BLAKE2B 7091774c8d21c8592c29ae9791c41158267b06fdc07a081f5f5d321b2ab83fc07028f3b2c4d58082124ed3fe6e4a0d3db7949bc019239acb9ba40e694464fb95 SHA512 ea52095cdeedb1bc3ee6eb4b5e3a07b63bdf3b3e9b1e8dab2698857bf210881fe34db6bda252b07cad0fd5298bbdc105b20866e23bb436b50be15ba2cc0501f6
+EBUILD xen-4.13.0-r2.ebuild 4439 BLAKE2B 99ef4fced66b15fe06b80676653468934a0b32c049a239a086025c2bfa03be6225bac1bdd0ec53947b49251c4be46ad0e3034047c30b6ea59660c50e8786d049 SHA512 23d99e5d555aa72c8d87a4665390be52e07fc955c1748b91a9b0b36046006109dd141bc35a188360c272e00db9d13bb84c80911f6aa26e6d12ebe2bc242ab229
 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248

app-emulation/xen/xen-4.12.2-r1.ebuild

@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=
 

app-emulation/xen/xen-4.13.0-r2.ebuild

@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=
 

app-i18n/tomoe/Manifest

@@ -3,5 +3,5 @@ AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af9
 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
-EBUILD tomoe-0.6.0-r5.ebuild 2199 BLAKE2B 240e9312cfd232c1afe7c2ee748a50cc3cf6e9d8b8fd52b67d3cb837285af8e134b7ff2af7e991dc4a6406de05bfb1bfab95184c058b244f0893a75e3d82ac6c SHA512 65df6d8a174907477efc18153b02cb35f32f82f606bd01b826a1f32482a134ce7121126bb4d37e18049f49413daec3573c4a75c93db292ae66f7dcd2b1a53cdf
+EBUILD tomoe-0.6.0-r5.ebuild 2112 BLAKE2B c60b4ac44e9db3005059b9543c81a8b4932e9344cb5dfea9c234dba273d97ece424f53af97714b95c134f99ffc9f180790f09b127274924e7ce9f8d0b7013ea2 SHA512 d9232f2954d898247cbce92152ef2ca59771759658ff664707b56153075f81f07421ccb3263dce3b8f26603ffc3867a6352b643d8678dfa386dcf2f0b1b72198
 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb

app-i18n/tomoe/tomoe-0.6.0-r5.ebuild

@@ -3,9 +3,9 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24"
+USE_RUBY="ruby25 ruby26 ruby27"
 
-inherit autotools python-single-r1 ruby-single
+inherit autotools python-single-r1 ruby-utils
 
 DESCRIPTION="Japanese handwriting recognition engine"
 HOMEPAGE="http://tomoe.osdn.jp/"
@@ -17,17 +17,7 @@ KEYWORDS="amd64 x86"
 IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
+	ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
-
-_ruby_set_globals() {
-	local ruby
-	for ruby in ${USE_RUBY}; do
-		RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?,"
-	done
-	RUBY_USEDEP="${RUBY_USEDEP%,}"
-}
-_ruby_set_globals
-unset -f _ruby_set_globals
 
 RDEPEND="dev-libs/glib:2
 	hyperestraier? ( app-text/hyperestraier )
@@ -40,8 +30,12 @@ RDEPEND="dev-libs/glib:2
 		')
 	)
 	ruby? (
-		${RUBY_DEPS}
+		$(for ruby in ${USE_RUBY}; do
-		dev-ruby/ruby-glib2[${RUBY_USEDEP}]
+			echo "ruby_targets_${ruby}? (
+				$(_ruby_implementation_depend "${ruby}")
+				dev-ruby/ruby-glib2[ruby_targets_${ruby}]
+			)"
+		done)
 	)
 	subversion? ( dev-vcs/subversion )"
 DEPEND="${RDEPEND}
@@ -75,7 +69,7 @@ src_prepare() {
 
 src_configure() {
 	local ruby
-	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+	for ruby in ${USE_RUBY}; do
 		if use ruby_targets_${ruby}; then
 			break
 		fi
@@ -85,7 +79,7 @@ src_configure() {
 		$(use_enable ruby dict-ruby) \
 		$(use_enable static-libs static) \
 		$(use_with python python "") \
-		$(use_with ruby ruby "$(type -p ${ruby})") \
+		$(use_with ruby ruby "$(type -P ${ruby})") \
 		--with-svn-include="${EPREFIX}"/usr/include \
 		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
 }

app-misc/todo/Manifest

@@ -1,4 +1,7 @@
 AUX todo-2.10-fix-bash-completion.patch 344 BLAKE2B 8e19719ce96559e49715bec34e6e4b90ea2c3dae9d4a4ecd1a05be51919f5ae8d7a1a29fa55ae3d70d0c42e8e55b6bab596b598116a5f8399a9a4e95df3415e9 SHA512 eb7bf79eabc912f3a5ca211ff1c4d5ac09cb42b2a8719a8c60a1f0880d89703afbe7073a640ac1b8ef8bf0d8c5ec8e2891faf924123d3bbe04f37479eadac95d
+AUX todo-2.11.0-fix-bash-completion.patch 385 BLAKE2B cfb5b88e8113d45790d9dcc7a005a09816aa6658ec781b1a3a76721ff8f4d573a2ae1208fe27ae136c48747dde70d9ce2c375357c4117e0a2303dab1c648d565 SHA512 804ba00f3c3bf494c853778ad388583adc40b613c35dbe63ffc63a75660df5a12e0806ac2f3d352cb4818c2cb53ff4d49d519924d231f98ebce4af1dbb5085e5
 DIST todo-2.10.tar.gz 56509 BLAKE2B ec89d12506b5025bab8d05bab1122d48ef2e9edb811c4091c1ff96b4b18c2ced54026d3d908a565278804c15c6fbde8aef3ae5a0cb23d4b12bb36133fce5bb2c SHA512 b14d9d13948836d971f72b941770e8e2c59d171d35f074205900619c5c3efd7ca0a482887046c1865890afb6595fe27c69677c54ea5824163d291e16fa5329d3
+DIST todo-2.11.0.tar.gz 712455 BLAKE2B f9d0fa53712a49c2f6ee94c02a62c16b8184734f7bb0c9354db9d640e2f619c75e3b3468065cb51204c7872f1f155bda51b9e3387f62f0f478f80f6a99f199b4 SHA512 5500ed1aa10eceaaa3e5116605eed4f4228337fdc0f2ceaa5b889753a60576918c0953adbfbf80c40008d6dfdf854e8a538103bfed4d1015aa1c5a9876c2e47c
 EBUILD todo-2.10-r2.ebuild 1406 BLAKE2B a1bdc12885d8b93370373adae8be4d86bb12db6b2d845147d7a15c75267e570fbd0a7b386306a712ebed2c3d052ad6065a822c578148f9241c8e7104847960b2 SHA512 8b8abbfb387d5a07f8929560e4338fd64db09a57e36cfefd60e1d1dcfdd6742c09a8f0ab3576da4ac3c040336b5e2f35c43c2ca9516cb54a58728373799fec74
-MISC metadata.xml 340 BLAKE2B 8102ae5fb34dd55116c96b815406f86d08345c3e039d5c2878b8e7f8e0e4d6a60543ae7cbf9d2ba877230b40175dcaf6e7eae6d7877ee536a6ff30786e660584 SHA512 ff000ddeb9f4b80721053c17a66f5d9792b601c4710a3577ae86fc09ddd3456b934aecad94297b5985338a87ace1b59288394fcef05bd002cd2180ccf6f59a84
+EBUILD todo-2.11.0.ebuild 1739 BLAKE2B d4470876d6533fe1fff3ed60fed423730b4c894262e15b78d4192d34cca6babfd506ae125c32b7b28a1608568b91144e8ba42083dd95b80c2f83a1136153df03 SHA512 7244f131a1dbff7d77dc873647cc7cca1fe22873a10af853a6c4169e8757b68ebcf602430ee411bdc0f20bba19f7fbb342bfb9e60108bafe46838704e529da62
+MISC metadata.xml 565 BLAKE2B 854d88ec5a9d76fba34d2feb01a36d5a9513433f1dd3301883e3213eeb1e24e1e4db0876c0b26d4e0ba68acee07177eed06912c3ce285e163f8d287510338825 SHA512 052553ce06e888905ddd230bb40e59039a42bf9e9f6684812231cc9f21d478d0e7e44d7e4ee44896258852a6778bbb507b4824a6b70150c7314b507a652e9dc7

app-misc/todo/files/todo-2.11.0-fix-bash-completion.patch

@@ -0,0 +1,15 @@
+diff --git a/todo_completion b/todo_completion
+index 644be6e..964383e 100755
+--- a/todo_completion
++++ b/todo_completion
+@@ -85,6 +85,10 @@ _todo()
+ }
+ complete -F _todo todo.sh
+ 
++# Gentoo bug 614400
++complete -F _todo todocli
++complete -F _todo todotxt
++
+ # If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
+ # completion for it, too:
+ #complete -F _todo t

app-misc/todo/metadata.xml

@@ -5,6 +5,14 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ginatrapani/todo.txt-cli</remote-id>
 	</upstream>

app-misc/todo/todo-2.11.0.ebuild

@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="A CLI-based TODO list manager"
+HOMEPAGE="http://todotxt.org"
+SRC_URI="https://github.com/todotxt/${PN}.txt-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-shells/bash"
+
+PATCHES=( "${FILESDIR}/${P}-fix-bash-completion.patch" )
+
+DOCS=( README.md CONTRIBUTING.md LICENSE todo.cfg )
+
+S="${WORKDIR}/${PN}.txt-cli-${PV}"
+
+src_prepare() {
+	default
+
+	# fix version string
+	sed -i -e "s/@DEV_VERSION@/${PV}/" todo.sh || die
+
+	# TODO_DIR variable is bogus
+	sed -i -e '/export TODO_DIR/d' todo.cfg || die
+	sed -i -e '4i export TODO_DIR="$HOME/.todo"' todo.cfg || die
+}
+
+src_test() {
+	make test || die "tests failed"
+}
+
+src_install() {
+	dobin "${PN}.sh"
+	dosym "${PN}.sh" "/usr/bin/${PN}cli"
+	dosym "${PN}.sh" "/usr/bin/${PN}txt"
+	newbashcomp "${PN}_completion" "${PN}.sh"
+	bashcomp_alias "${PN}.sh" "${PN}cli" "${PN}txt"
+	einstalldocs
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Before starting todo, make sure to create'
+	einfo 'a .todo directory in your home directory:'
+	einfo '  $ mkdir -p $HOME/.todo'
+	einfo
+	einfo 'and make sure to copy the default todo'
+	einfo 'configuration file in the same location:'
+	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.todo/config"
+	einfo
+	einfo 'Alternatively, you can use XDG directories instead:'
+	einfo '  $ mkdir -p $HOME/.local/share/todo'
+	einfo '  $ mkdir -p $HOME/.config/todo'
+	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.config/todo/config"
+	einfo
+	einfo 'You can then edit this file as you see fit.'
+	einfo 'Enjoy!'
+	einfo
+}

app-misc/ttyrec/Manifest

@@ -1,4 +1,5 @@
 AUX ttyrec-1.0.8-flags.patch 591 BLAKE2B 25a29be68f318dcb0604c6b3bf982f24d806f889f86bfbbe3795e6999763951fca64f02d82ac0a82e720c380e8432eb7d9e0cd6f9e7d1b193699fb614867e3b0 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c
+AUX ttyrec-1.0.8-glibc-2.30.patch 695 BLAKE2B 4ecc457b74f9fd5ec1df2db0d99dacc09a9ab5b5a6d3ac6b2ee4a1acea98102662b473a95e316d49d245508cecb238b1603e35784435079e34551a0c32b3d75f SHA512 ba57f0b388c5fb686f54669e7e1dcebb83b4cd40e7f70003c6798fd2e62cc4c0089f0674a6b6a21e916a57c573e2c558be4fb26aba9f8314079fc9733bfe72c0
 DIST ttyrec-1.0.8.tar.gz 8528 BLAKE2B 8b0218cb7fecdbcbaeee9da2b7982b880bb6f0092f65f2c730c5942eb3ab6dd9978b7168ff537b81503c697c5b948e7a0e2a267c35de1c0038d85277c6610a74 SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611
-EBUILD ttyrec-1.0.8-r2.ebuild 685 BLAKE2B 17fa77a1fc5c76ca4851756985880fcbda04255b1f8819bd1b350a0608ee5671935dbcf06c233bd35dfc0906d3a1de271f4bf4cab6e2017070408fd93cca7d64 SHA512 ede299542ea9c2f2b027dd7b52553cc68b8bfd2a037c999919efd319482127bb5df37952e2b47dbfa0e0958429f4fea787db3a3da209fcc8f2f122ccbb0e38a5
+EBUILD ttyrec-1.0.8-r2.ebuild 723 BLAKE2B 82a12c8060960a0f24f1b42460c58bee08c6e3618aa8f3d804a0eb68bfe8adfb38f8df92efbaa3becc752ffb8539dfbc7c2317d45b3531ebbd65939ce8e10368 SHA512 0cf12ef0fb1d5a103b919da0d3488670f6bae949098f683dbaf7ca367c05b494b15614f3ad76e4b0c7b15196fe3161cf0f297b07c8d7e4d2e76e0bb2b52e2cfe
 MISC metadata.xml 575 BLAKE2B cbadaa7de1bd014a8b4d0fdce081ec4f078febf7a0884639762f714fadab3adbf6603475b331a2a07a17c0934ab0f5262bfd1191b5face6a252f7d4de8d06054 SHA512 57adba15d5ac7ae8f49445e81c7aefd99a840721b8636505908493e3e76ed12c24eb5ae87970de701395415c096ca360ad81fe27139fb4db79cfc3da1b7784fa

app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch

@@ -0,0 +1,30 @@
+diff --git a/ttyrec.c b/ttyrec.c
+index 3392f70..86a59ee 100644
+--- a/ttyrec.c
++++ b/ttyrec.c
+@@ -57,7 +57,9 @@
+ 
+ #if defined(SVR4)
+ #include <fcntl.h>
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__))
+ #include <stropts.h>
++#endif
+ #endif /* SVR4 */
+ 
+ #include <sys/time.h>
+@@ -449,6 +451,7 @@ getslave()
+ 		perror("open(fd, O_RDWR)");
+ 		fail();
+ 	}
++#ifndef __linux__
+ 	if (isastream(slave)) {
+ 		if (ioctl(slave, I_PUSH, "ptem") < 0) {
+ 			perror("ioctl(fd, I_PUSH, ptem)");
+@@ -466,6 +469,7 @@ getslave()
+ #endif
+ 		(void) ioctl(0, TIOCGWINSZ, (char *)&win);
+ 	}
++#endif
+ #else /* !SVR4 */
+ #ifndef HAVE_openpty
+ 	line[strlen("/dev/")] = 't';

app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild

@@ -12,7 +12,10 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-PATCHES=( "${FILESDIR}/${P}-flags.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-glibc-2.30.patch"
+)
 
 src_compile() {
 	# Bug 106530

app-office/calcurse/Manifest

@@ -1,4 +1,4 @@
 AUX calcurse-4.2.1-tinfo.patch 644 BLAKE2B e304953d56dc8891138e909f0b7b31b85b89a16800a1e8efc64a199cb884b730c3123f902ffe2095d392c41cbf0f65b88d440fff2133816b2763ea74a5e44770 SHA512 099ead1b288717e9d9eff331c2fbb9ff8deb19b1843109549ebdab30e8e59cc9cbb01a89c87e84e9283003ce70fc595e2305936a8a0918b0996b5fab1854cb5f
 DIST calcurse-4.4.0.tar.gz 620263 BLAKE2B 8fbe875f5e757ec3c11b9c23a994260403ee990bfcb3d4c41eefbf06a6db9e76cd5157e32b11c3fdc049896d5db3a9856862724902dab1cb48e0b00ef5df6f73 SHA512 43d30ad68bb39aaa9460644a691e66cbb15b9930737581583da65d00214c70fb1148a0edeca4430abb7a5cef2821b0f4c6fdbed8188d9ea5da5fedc4f95fa07c
 EBUILD calcurse-4.4.0.ebuild 719 BLAKE2B 4e3a19a737f86bfcbdb2dc4979e6b5b0ea0e88b37cb46cf927a429dc330441b62e872c4cbdef60d091e631cb4af93a3d8a2b649b64acc8d345a7e4f4841e4331 SHA512 fb7294eeb49872818406a1c23757049f1de57853e7157022326d3c813e53c504616f5eba20f6aeb15151b2ab784e798dffec3b599802919ef3c18a17600a8048
-MISC metadata.xml 593 BLAKE2B 313dee286f4f73406dc3a9a00c8bb59df524df4ac3ced089fea16522d22d99580972c1e52822df1d4c7b527b3c48dce3b825d662458e6194343ec66f2024f73b SHA512 41f0c2a630723427fb5f4033b928c1dc0e4c7bd08f301240458129b08e9baab02141e214b73a393a8c7af58ef1b6f785f701407e111a49b825e5006078caa9a8
+MISC metadata.xml 542 BLAKE2B 3b8858b3784dee744d56a735c20ca5faf165a5e9ec1ba4789206aa112b6dacfbe7ae563263eb24fd28da6be5bc02573f9ebfeadda96a9378f577d31a022f623e SHA512 6dcb0459490f73f429bb62201b0168f87c841b66d3e14671628ed6507c57704c16f26fe1ed5a7a0b896087a6847eb76c00680bb76f801d2220c64506d4ba1d2b

app-office/calcurse/metadata.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<!-- maintainer-needed -->
-	<email>monsieurp@gentoo.org</email>
-</maintainer>
 <longdescription>Calcurse is a text-based personal organizer which helps keeping
 track of events and everyday tasks. It contains a calendar, a 'todo' list, and
 puts your appointments in order. The user interface is configurable, and one can

app-portage/prefix-toolkit/Manifest

@@ -1,3 +1,6 @@
 EBUILD prefix-toolkit-4.ebuild 18535 BLAKE2B 836627d06a4740707af1e7f31f1cc6e0e280f1eb1a3e573621d471038e6470a9c599eb2d4ff37120636a395d5db7a1d20b88d204302f9a8772522ca2b551c6b9 SHA512 97efb29fee5db4f6442847eddf0ca9ec975887122861a6faeb55950019cb2c4dc128822e253adfc920f7dd96b0877f70fa35eda54dd8f1da750c5baffc72a99c
 EBUILD prefix-toolkit-5.ebuild 19268 BLAKE2B 541668fe2a2e61ce4c5e0cb58457a57a468b470fa39e55cb4232d4920e4b9c99855d15031e251737e5c24096395ce7a0f2c83057fc9f4382b35e1741e6aa281f SHA512 87b7d304843460e9f5186641a9e4dbc16ec69271cad386d33c93821d93752db2eae8a60f3c432465f0fb1d2222d8b945f96cbaf1adf99c1ea0faa48620cd82d9
+EBUILD prefix-toolkit-6.ebuild 19713 BLAKE2B d100582c77a6cae781ee193d087b872d7f5566d7efa722f81cd8d0467a3ed003bedff4a29a66215c53c45daf1f0bfad82f2481c7f91e649d32f4aa8303037a01 SHA512 ad842621bc4fd54808f5d0079bc9ac6a87a41bf62cc3f2b53d4d51a42fe108c81d090263c76e96ef505f99a833687b36228d6ae7a9616a3bd2213c4d48a70b74
+EBUILD prefix-toolkit-7.ebuild 19918 BLAKE2B a1acff8bf9b7bd961d5441f557baafb4d5e3fd5a5b4b2a32010d14472c3bcc3ff481c11a146fb81ef60e45a3e9806b16ae8c904d03503f7ffe492f5ea6f38773 SHA512 89438c6f0a2e38b97190f52915b3365ade4816bc67fa6c9970ed32b475da2c12bbc0a5ec5a7304bfb41fcd8c4eab0e4b4f8ff804c7018d0bff2c291ef32d6645
+EBUILD prefix-toolkit-8.ebuild 19947 BLAKE2B d32f9ff7edb08edf8d236c92037654fe68ba1f2b263e2d8bef3a6065fd242fadbbfab0fbe24300412c81d4915221183171520342d72e2c35643624fdec734730 SHA512 fcc6df990c48b7b7508493b7aab82bd578df5fe6d06fa8cfb100264b8fce6b268f5e2770f5dd88ef9c44bd504180ae67b8fb3c4a66b4e73a17d75da3a7f39560
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9