gentoo resync : 25.12.2017

16 files changed, 29 insertions, 33 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ebf3285c5971..73a63ccc4832 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 3631172a5df7..dd9ab4964e49 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -2,6 +2,6 @@ AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f9319
 AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae587e982b4bae1932d3c8a23d0c4ad43639710576a9b7dcc53a93d47f1965166b271e93c4cee5309be03a05bc9 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2
 AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92
 DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
-EBUILD esearch-1.3-r1.ebuild 1554 BLAKE2B feb5cea21bf122326dbd1211f47160a683142ad8684f49ab52d4f6c42ab7b94b68980680699fada5634842376ec1bca8a3b4e8ddb9fe5249d6caac85776e9819 SHA512 6e156896e3b0f83f8312e26ee8a23191ef576de5e892038e25d3399d15d6f0be59e1c242d394a547635b1a7a84770037ecd0ce18d18338b6997a907a57c3740d
-EBUILD esearch-9999.ebuild 1134 BLAKE2B b663cf3b42d8e7a258d3ff1d399b34c03532fb0bd03283d4531201403243c18596b44c0b70f8a0286b64bfc5e434ad42964c5e6c76a9ff261d763d66b4f5580c SHA512 52e1430d598fabc4305f4449e43e1b6fb2fb2a23e23ae874e0e6fb6c865ba7a5ae68c69f1d9bc850340d85d3db1462c656498b7c42b444399a7f8754fc892025
+EBUILD esearch-1.3-r1.ebuild 1553 BLAKE2B e27fbaecafcd95bc91155f39771b3c274d33a91e93a1cbe4a6f8fae4c3c5242ac26e343709af74d060f0fc335def23a064aaffa0cf2400415f76079baad77ac3 SHA512 8f2b39595e3f5ec6c29c4c62ba37307a174980458ed8239e3b3b72a552e6e716c83d734ef26a75d23f17dec3d0a3e3ace23de1e695a8529fd649681a44a9a5b6
+EBUILD esearch-9999.ebuild 1122 BLAKE2B 8a931f648704d3aa42e16f3776eb8c801868e6e7438d549d52bc6eda7615ab54a9bcd794986c5f7bfb60430c3662afe009f2d1ab62f629da0f16176c4d92d1fa SHA512 4ba2477d613039e0d11befcac9b120a520f48dea7f4ec486a181f2d675730175ed5ab6c22ad14da56bb900e3edf3c632781b5173b43b40d21bb33f0b6664b200
 MISC metadata.xml 357 BLAKE2B db12b57347ce8c8f1e41c64bf0a94c80509e27964353113c40d4c49aee85d3ab747d3ac2a05b1a1314b141feef9a014a3b475bad5101a077da803f55cc853098 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f
diff --git a/app-portage/esearch/esearch-1.3-r1.ebuild b/app-portage/esearch/esearch-1.3-r1.ebuild
index d8d6dfbd071c..554008616644 100644
--- a/app-portage/esearch/esearch-1.3-r1.ebuild
+++ b/app-portage/esearch/esearch-1.3-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
+
 PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 PYTHON_REQ_USE="readline(+)"
 
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
index 114acaf455e1..9a9ca40fa2c1 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
+
 PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 PYTHON_REQ_USE="readline(+)"
 
-inherit distutils-r1 git-2
-
-EGIT_REPO_URI="https://github.com/fuzzyray/esearch.git"
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Replacement for 'emerge --search' with search-index"
 HOMEPAGE="https://github.com/fuzzyray/esearch"
-SRC_URI=""
+EGIT_REPO_URI="https://github.com/fuzzyray/esearch.git"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/euscan/Manifest b/app-portage/euscan/Manifest
index 8edee153ff4c..6ed9c2346a58 100644
--- a/app-portage/euscan/Manifest
+++ b/app-portage/euscan/Manifest
@@ -1,4 +1,4 @@
 DIST euscan-0.1.1.tar.gz 441780 BLAKE2B 7c0603cca9b9da1f849999b215db2d397656ffc1e8e87193174e6ada548497f1ebb30252f83d0fb4dbbfa92000480947b1731f1792d8612e1ad56fd56daa2b54 SHA512 2f55f8f4b0fd46b13c981ba94be29a62f16fe2890ce03f99ac14b1488c2ebb59abdaee12f671d679b934b4fd875ee27e751d2c305420f7cfb08e69ec899a75ab
 EBUILD euscan-0.1.1-r1.ebuild 807 BLAKE2B 5e25da8735311675fdccca536984a5cf1a393dcc7423d76218aaf297c1d4073cce45a1dcc3f150e7c72c33ce088266e9e67e6d386de238f720ad838b629328ab SHA512 7c6800d0e92415790e0dd61814ac14e40278dbed98727ba122bb90f46a053ec1e4c6884395e635f167ca927a5338f42b5be50f2c7f78d58421ba7568b4cc2218
-EBUILD euscan-9999.ebuild 770 BLAKE2B cc0e11536212d8212630e3219f41e617604f6c4723e1f5d205073d21354508da3c1c46b7977d341c39329cc698f2f6a359564caf7b2dade23c0cb298c5c38c8e SHA512 836aa85797ce81df8c38bd42096900cc0406b3b85aef2b125c50e10d920bdc57ca6e98e51d18514006753e71c5c7674951a46cf202c29f3a192944c4b7d46926
+EBUILD euscan-9999.ebuild 760 BLAKE2B f8d46d6943b818abd28a551c6733e808a773e32e8b2981bf499ee0cb83c488ff0b1792f07ab6d6890df51274949dd620b8f1847267056efd0ae24d34bfcd2421 SHA512 b18756fc63adbcb606faecfeab2864661a370bd093ef5d471d43fdefe5aaa9d3259d950fd0102c70576b071cc619be972a01b67787545b6cd43f89309825140d
 MISC metadata.xml 340 BLAKE2B 9429176a710bbd82a9c4bfdbf3228422807daa00564201eec1d8bfa2a1b76f65b84e16e6083cb0847bed08745262f0b95b8563b7449e69be95d8bc2ecdba6d1c SHA512 de74198fe372171f19b6486164e81b3f256ae6a04451ce5c3c789909a0a3bff6ec15a42a3cf3387f227cef33f8dbb32eb9872af95d6f962f61ecd2fa64ad0b5d
diff --git a/app-portage/euscan/euscan-9999.ebuild b/app-portage/euscan/euscan-9999.ebuild
index f502a249b5fe..2cf8630bb3c3 100644
--- a/app-portage/euscan/euscan-9999.ebuild
+++ b/app-portage/euscan/euscan-9999.ebuild
@@ -6,11 +6,10 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Ebuild upstream scan utility"
 HOMEPAGE="https://github.com/iksaif/euscan"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/iksaif/euscan.git"
 
 LICENSE="GPL-2"
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index e0e1c6a3e099..b079f5199380 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -5,5 +5,5 @@ DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20
 EBUILD genlop-0.30.10-r1.ebuild 768 BLAKE2B 4ebed55f9ef1e0cde53dba5737dc4efb703df271fd51abc762bab1e5d3a800c0e6b3ceeaab3afb301a6cb30c6e8000d3accaeeb85b1621d4248edb4c6ee6651d SHA512 ea1e977c546be4a1ae9af37dd8e70ca07c4a35e6e1eab5d9b07f57174b75a4d31595597935390449610d9f158491fea5c9b852165635f418f417f6f76f85633b
 EBUILD genlop-0.30.10.ebuild 651 BLAKE2B d81b28aeb5aec942da39a344a9555c5971f33065d2f3a4a774fd3e3096a2d4f6e53c90f10d92cf0aa8e9a2fd36dc2b72a1ec57f1df5a0b092b0f465bb381b24e SHA512 d0bf745a31bf0151622e0e919e40a48fda8edf39998e396a37f6d259bdc6db361bd0a42f0c20e1c602e48ec28e0d4ad6a7fdb83a56a1b9341e638c05ee17692a
 EBUILD genlop-0.30.9-r1.ebuild 773 BLAKE2B cfccd4ab36b55323bf320928c7c0e8719b92c00e1254dbf295241287010913768865b3428ac0130db3d93ab6fc12f5d60e50a4e417280c21a630a83cb1180711 SHA512 c53494d4d127c4b54d6c8a8897b1ff76d3bb0f6f2ee686042ad18422570802b2ca0d8a9f4e22fd1076342f48409182a9d72f196a3f652757c312f3c9e42d84fb
-EBUILD genlop-9999.ebuild 562 BLAKE2B 9f0d15cef9f10506d29e8ace40f1a0dfb55ce511669905fc90892bde9ebf57e926da780ac80ed96cdc228b08ac1dd3bcdc8e17705c0195e3d89a43d5f376941d SHA512 0a4f6c106834bb4eae2bd9231f1ebf3981a68d75d942a47989a218a95d828fe382d590066b804fbce48da169648d70f8dab47f388c7da4d6f6ea74218d5f5625
+EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/genlop-9999.ebuild b/app-portage/genlop/genlop-9999.ebuild
index f4cc3925ba6b..a11d4f062d6b 100644
--- a/app-portage/genlop/genlop-9999.ebuild
+++ b/app-portage/genlop/genlop-9999.ebuild
@@ -3,16 +3,14 @@
 
 EAPI=5
 
-inherit git-2 bash-completion-r1
+inherit git-r3 bash-completion-r1
 
 EGIT_REPO_URI="https://github.com/gentoo-perl/genlop.git"
 DESCRIPTION="A nice emerge.log parser"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
-SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 22cf78d3bfde..b4ad46371ac0 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,6 +1,6 @@
 DIST grs-0.4.tar.gz 34212 BLAKE2B 79790e5fc3930336489d43a96236c953e50c875c78e3dbaa99103459b4e62235dd4fb43b205e653066d795999d1034b7fee93c58f7f9cdc34f4680dde48de883 SHA512 e24879aabf7d9d029f584693dcb5e6578d5e14ab9e2588143883b7a27174184a2e2c30d08bf140a1bb45b7ab80c10e73f5ccf96de0bea8185d326ce0ce83fa11
 DIST grs-0.5.tar.gz 34213 BLAKE2B 3745d68db8da65f72e3b82ed2350d8a8696848d451aa3da5c941174403be7fea9a4b7536cdf532d0d89b6014817c14f874d0dbca3408bdd8326e88396767f119 SHA512 85cb78d898c266fe4f1a5298d3add20fb127d43469cd00d32400bebf0c7350c07b581f9e8714a32db62c57f5a92fca0cbe66f0e2812dab86f57d9e8c66aaab7f
-EBUILD grs-0.4.ebuild 859 BLAKE2B cf87057d22d0eeaa47611ba8cf90656664f47609583b494482ce0108c9689d13d3ceb385bf4c922e317da1366a8420bace8f573fa0258fc3bb6571f5c8b163fa SHA512 a4121e207a4f94b9f4356cfc4ccddc3612471ee2a892d2edd3c3aa9daaeb61809230c428977866cc6332f3943a24536036d38bd196622bf7dddccc746ee449b1
-EBUILD grs-0.5.ebuild 1031 BLAKE2B 62d24a6c87eae29b243022f8c5190c1166b917f59d4711771aa4c42f8b210c73cfdd530c8f14483d1a086b356bc0db2a72066ac10b422c066be7df2dc22fc413 SHA512 c526b0394b0058a515dcddfa4ae88bfbae9eaa399d556b29a765cad51a7f7013b0c732ee2a2624fbdf2e344cbf32a4ac7214853a42763fbc1f5a54cb0bb263d3
-EBUILD grs-9999.ebuild 1032 BLAKE2B 897c354a65006979ae6c5e1813f3e712b92fc2242155ca48a673678e5ffd954fa2ff24453a22cf7d5f8ea66c03aed6994e4c0c69755b3726cfffcdc6682d8068 SHA512 aff08181f410d55d2b2e0cc767b7183b56f72c779bf129a3e15549cfb3077e31706637c2614c242e340f81c02b28a058de112197d69957b85130a915e0c4347a
+EBUILD grs-0.4.ebuild 865 BLAKE2B bf2a1ac8e61147521d22fd9cfb006f16bbe6f5a443eaba02c875d752f3deb2c408d3924d8b6688830b6cc7240177f3fb7b68b3da22f37cafe1a043d4fa574dd2 SHA512 4e1680c830529eb34eb8177e0af3d9e8367a7b1ec5d0c604eebf75efb5fb0c342a5b5d8c46b067b2c3dc22b64ea90cc86dc55754bb45dd3f77c1c45ee853586e
+EBUILD grs-0.5.ebuild 1037 BLAKE2B 715b4ca9f91d01a445de5bb151f30704db2ceceff33d24b35183c9d42b881e7c9336608956e827face1068059d594748bc9ebfcbfc1b3c604f1f8f2558cda123 SHA512 bd97ae2e24f527e13138fd6b9bf00ac453c566e10ad0051c985fc78ff4b26a205c71e36e0f98b691f8bbd9b90b3db5af5b3521c3715f4800cae43cef5327d04b
+EBUILD grs-9999.ebuild 1038 BLAKE2B 6ab0f60550bdba70fe3b0841aac2fbbbda2781c8366c5a38930e1843e9a0357795bb450bd7b3f0f425730916a22bffd3c9d67ebbd1ac9c9fb7a8730ddcbd6837 SHA512 7139767a7701a5ac52433c8635155db0332266f233aafe7d32cce984f062b1a8ebc0cfed4ef3b89b61d6334561e757651a1a6ec4bd5cafb781720119e66bd38f
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-portage/grs/grs-0.4.ebuild b/app-portage/grs/grs-0.4.ebuild
index c80a026859f5..6b900fbe1c49 100644
--- a/app-portage/grs/grs-0.4.ebuild
+++ b/app-portage/grs/grs-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_4 )
 
 inherit distutils-r1
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
-	inherit git-2
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64"
diff --git a/app-portage/grs/grs-0.5.ebuild b/app-portage/grs/grs-0.5.ebuild
index 0ec4143b9139..ef064c9ea51b 100644
--- a/app-portage/grs/grs-0.5.ebuild
+++ b/app-portage/grs/grs-0.5.ebuild
@@ -6,9 +6,9 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 linux-info
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
-	inherit git-2
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64"
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index 864f7da9b717..9b15694e76eb 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -6,9 +6,9 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 linux-info
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
-	inherit git-2
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index f3b7e736dae1..d3309f96ef10 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -13,5 +13,5 @@ EBUILD layman-2.0.0-r3.ebuild 1668 BLAKE2B 9132c3dc910abfadf07e6fd9b3a69ea6234bd
 EBUILD layman-2.2.0-r7.ebuild 2178 BLAKE2B 2b3959e9f03c436dd07d7db4cc36b6d0a147cc0e3d35dfc9363e2baa1e869b9092c4eadda6a5424ea53c50667add23622065222ac4ade7142bc34cebc2e08f5f SHA512 04c77e388d73a53034fce76018c09d79ff67e1ece9719afb381bb79a4566b45873ba3acab4040f64b4012e0a442f72d9bb534f1cfe19840a461e5b607678b255
 EBUILD layman-2.4.1-r1.ebuild 2116 BLAKE2B 4f16a3e6aa26701a653c3b2e103085edd6420676f0667db18ccd87cf3aba8a858827f85f5fce383c379c658faeb82b736a77f17790a5ba95eaeafea72a1aa9f2 SHA512 5ecb7a7786ca0354090a20f4fc63def960d27a2a47b77d2d69742f905109a06f693154694967229ab3dcfbb52ec4ddfbfcee7260c426afe2253011f329035b60
 EBUILD layman-2.4.2.ebuild 2169 BLAKE2B a39ff01536cdfb08eb8ce50255b07ce29b0ecd780736796a8dea774b4037e3529192cee223e665588d797cc2fc1595dff54eae7de242e996663304fa2070558c SHA512 4019a22b5535b9539d206a3c586581b29e068f8dc06c474d4278a2d91997b348f454177027ce2d63a05ab8aa0caf0f482e1bdc164f43b7f13607a67462521d4d
-EBUILD layman-9999.ebuild 2114 BLAKE2B 8d4a003ae42a8cc78d90cdbe28ecfe27f1fcd010f4bfe762faa068eaddcf31a6aeaee1522d5caf6be9689e36452864cd2932ca77c30b8e150a3e915328946182 SHA512 0baec4eef589dcfd53cd7549f383159f543a08986ee955ef3e668cbf1fccc8a9438e09173957aea7664a9ef9d55d6bbcb26d2ba56706502e9fa5cec4c5c3c758
+EBUILD layman-9999.ebuild 2104 BLAKE2B faac34ced24e00f4e7ab24c2199711184c802a28820a8db4dab4515d3e7e33ff6be56fc3efadf426dde8b1305c3726c57dfea44ca4e14b3020dcf84a76fd2c97 SHA512 125bae3ff55719296ebb215b2e4a346afa529a828114c8c107ba8f1d795fdbf2ad246ffc5eb684d4fa7764e39e5d66f3da4f6d2ba693ef94ebb0fb6355be9ab0
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index c5419f1102ff..c7ff3068c986 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -6,11 +6,10 @@ EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
-inherit eutils distutils-r1 git-2 linux-info prefix
+inherit eutils distutils-r1 git-r3 linux-info prefix
 
 DESCRIPTION="Tool to manage Gentoo overlays"
 HOMEPAGE="http://layman.sourceforge.net"
-SRC_URI=""
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
 
 LICENSE="GPL-2"
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index a42807994bec..6960cec15d44 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
 DIST tatt-0.4.tar.gz 23397 BLAKE2B dc6efaf866b059567d11c2a91929b025e74f73ae5ad81a98a632c3b2393025e2e35320ed223ae84b28a8770c713536afe73289d66f7c1396118a975867a56161 SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6
 DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
 EBUILD tatt-0.4.ebuild 837 BLAKE2B ed3e6b5953fe0f5276336d2ce7d1e809220b56bd1a5bd9005041145879702b96c7540114790962e7d3bc5361a919ef2da5d6990ad0808cbcc0b63e8d11f5e1b8 SHA512 61bb3f55c1c2dc18ac9549decd4257d14a2d7c500868843974c3fe6e5f05fce4550f4e2b364efb355f31f78c53b3fad830051c444b179ac3fb9c79cfdfe2a7d3
-EBUILD tatt-0.5.ebuild 831 BLAKE2B 026f19dca17e10a4a201ae427130af71654c788532a31acdf8fc0ad9e443711e07dcbbfccc11a4e81d058dfc3ec260529bd7e95be77a737f041a3bc0ccf557d5 SHA512 549a0b0bc40da3ea5336551b45a40353d5f722de9adaf09b849670980cac6f7b01e889178f622d1a23fde37651e0b5d9308696a51d8cffffdc51a81d23ee1726
+EBUILD tatt-0.5.ebuild 838 BLAKE2B 3c1a9b2d0e4e87dcd7c97629007483a14cb6d2c4d4f9c3625a0da81de22315b92d233035f2c97a3bd9992026f1fbfdf32c1346e9d9a92e208c36d6b65a9865a7 SHA512 a6942c6076c9d0a25fc0dd006f7b17f97f5070269b68d0f7a2a70f49e7ccb6d9310e9e78371eb251f2a4dea82208b590d8b18c1aaab6280562ec259d827f2cda
 EBUILD tatt-9999.ebuild 750 BLAKE2B b7f6bfb81ebd1aa9fcf824b772f9e7a8dbbe540b4c2d838f4a24d4633502d18009ff3eb7f0141004e3908334df91fbd63b4e333a8a31910408597e0fe198360d SHA512 f2ba4af09dc1f83010883ac4d58790b38ad48fda09ee8b58b16b2eef8b428e5308ecf6c317c15b0a8934bd2deff3fe9834133d78932aa6ade4dd64deb13fd746
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.5.ebuild b/app-portage/tatt/tatt-0.5.ebuild
index 45eba8259de2..2043abb30acd 100644
--- a/app-portage/tatt/tatt-0.5.ebuild
+++ b/app-portage/tatt/tatt-0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+templates"
 
 RDEPEND="