Sync with portage [Wed Oct 9 11:43:59 MSK 2019].

2019-10-09 11:43:59 +03:00 · 2019-10-09 11:43:59 +03:00 · 0b703f3fba
commit 0b703f3fba
parent 0ca92e54e2
727 changed files with 5321 additions and 5066 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29667 BLAKE2B 7e3b389b91be9df34230d52039fceda91c174ff53485df7fab57794cb38f823f3e6a2bddec52e02020b0a295403c60c5159352663a8f149510e3b7fad5a2ad12 SHA512 c8bd797a5e50d0a3554e5e87a7409c2146be2b7aa1e291799fe543c95e6b5be0adbfd1cf8123bd1dfdbec8a1aefd60a6acacc9abe1e2789e79b9d6188dda9e3d
-TIMESTAMP 2019-10-07T16:38:55Z
+MANIFEST Manifest.files.gz 29646 BLAKE2B 34fe4c0241b40b6c97425f83a00c0d6a0ac2894098b2f880ad86e1965f867506e68ac6a7ac650f224f2bac79d236ccd1d608822b7a48b3c5c23b2009d42c599b SHA512 0b916fa1299fdf42f88b725801e83a1f42182fa69e86503bf1adfc3432beee4f7e837193fa692960e50581ca0336c35bdc37bcc8755c38aae31e1a35d88fa14e
+TIMESTAMP 2019-10-09T08:08:55Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2bah9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2dlZdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD2kA//Xhr0Hx9aQBepHdBMJgAV1UYOxXT/zU30m0hkBDdB/nZ97tRz3bhQ6BSH
-Y+pf8ghgapFHwzjaDcm99oqwCC+j04MEPW3FlvA5bRJ78uGiwO3iRir6GusDixuA
-45c9GrqAm/OQ6TknwVnxS1zaTpiK45PDBBGrcRy6LAogZ7fDCETG2wKa5jC6cf0G
-sA27a6KwxqzSlZzdP9e8IvZOEklK9qnw1W5WyZbtLg/i4HnfdZyyZjumPA3gu1vh
-tkkbR4UFl7Gm0Q14GA0zvtSgwYYQH+3PHN0JO/Pd30AFXVofbckOdmo3KGAdeqGw
-CUjNtDUeO9lRd4ir207TnOsA9v9VDO0ZSAIwwMfNdNc0H8+2s+ssDGa+LLXHvzxr
-3O8xIG3lh7TdXxb8KFEauhM6HpQGjiBIQ8BMqLy50LIFH7ujS19WBwe9Nr2s5rDe
-GJlbcPvuSICt2yDy/DM6vXwC3BQEx8Pd/2+g6wpv2LP80kRkqRlXUW347BMYPHi7
-YD69n8t+BHGwe+gPeH5+OyG4vWk7zVrBCzRyDOsK08wnBXqR34FjVZsThztyE5pU
-mv6I3sS6gC6GCNb+PUZiHSXOcHm7y3TvSK56QGJPmc3Llid3taer7rgINp7iwyXv
-ELe/oChw0yqO64xRt7BAMw6qH6MSFmJVGD9FVN6eUmVPzHV5im0=
-=TLY2
+klCcLA/+Lyy23PyHDZrnKlgKufDwh20WeUDsuKdwFUQsgnuVS6gWI/5oVTLdxCQg
+baYX4719O/6LuFvPr8hlNMybUlGfp1tWvr5TeSXuyDtwYtECHz95eSb7xLuSIIBB
+hsnL99oGAP55aYYvzIU/A5hTvnVjzwG4J1uvre83q+qZg6BmJvGGaTvxD1C3GD2
+HEHv9b7JXj/kzMgUO9bCbXASGuAdbUhcNx9KP3jCafyl01ZaZsCeNcewzfRtg8FW
+DLpHJl9R4PqaH6uQYajIN1+P9pg1bYWDC1bbUSGouU8NptEW8zM6q6+qY96hv94q
+CvfG+elYMH6NK4wc4SPdKPANqPzkHL6uJYKLXIEerCUh/mhAwmFArjUuWNdnOYi9
+OcLZnYJ2pJY/IOZIx6Tak7Z/ipv4eDrwVmYTPt/dAh+G4ALxKNj4WBXvX9uPCu18
+pokxXJzZMMSbGQxA5lbbqyCBlyDmod5LUpzqnDAobAdz6wBtyjSa6Oiau/gMrP3d
+BwGMHC9Gd8xUzrX78iq+NtG1oAcOLcHviSHzPPeWH8poZs+hqg3PEqEe9lJUMauc
+QGSI5vw+2FD0/ptPPJM9ZIpTxxtu/PS5xeMaVxH3p744UBEn6RqFiLOu96Lx4a3z
+wGx2izbXEcWohfGoDzrH9ZN9OW8RV2hJ4nlUW4FvcHcI5FkKxRk=
+=WWOf
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/netdata/Manifest
+++ b/acct-group/netdata/Manifest
@ -0,0 +1,2 @@
+EBUILD netdata-0.ebuild 146 BLAKE2B 557ba0409e0365ca7cda97ff671224e0ec7993d3887fbd66edbd94d9b98a5c786e81d23595e371e5f2795f2426630bbd380baab6a2120fb7fa816f1725c5523e SHA512 2f227c12a83609e0cc5c2a7608bbfbd4a78ebc01b503a11a0cd9868e1b5562e8d5572254ae29141383c70ef7bbeaa961a9d18a0bad9348770275e28cf9488fdf
+MISC metadata.xml 254 BLAKE2B 28a36c4387e6a38145f39cc2a77ecabf1754b29efa32b7a3400b699432011196162823ee23a043d857a182fa32959a83c04fec021a151168d951687a65e91997 SHA512 953a590c431a9ac1ef877b81a589da36d36c396f06dc689bb5d62bd12e9a4e89175eb0a3142981df00ced8a50e08e6d122a734e31937a334176b782f17368d50
--- a/acct-group/netdata/metadata.xml
+++ b/acct-group/netdata/metadata.xml
@ -2,9 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-    <email>naota@gentoo.org</email>
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">shingetsu</remote-id>
-  </upstream>
 </pkgmetadata>
--- a/acct-group/netdata/netdata-0.ebuild
+++ b/acct-group/netdata/netdata-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=290
--- a/acct-group/opendkim/Manifest
+++ b/acct-group/opendkim/Manifest
@ -0,0 +1,2 @@
+EBUILD opendkim-0.ebuild 179 BLAKE2B 4f4d30a2e4b631c22fc0be6e66a5cebeb35b42e970ebc329bae530e8566fe06388a7d1378db79b66bf0ee54016f3246c466654024705ff7c37cc13295bd9e6c2 SHA512 7e2f700316c3ef11f04773fcf9fbcb85c59f28ca5df598588e71b3f483e3df2ee38119d7265b6662aebd2623e46d6a11c0530a396722d679a2fbf40df8022986
+MISC metadata.xml 355 BLAKE2B 5e3838161d4f925e539a0f45d59ffcf03a1ad78f0ca3febe415b3ee1a4308038af6b0912efbdba4d0cadde5bc68dbb0cdbe48f9cb9733454f28771a4a657c5cc SHA512 c3929342f23009641741f498ec0f5c6931b9f964f871b94722c872a5bbf0a15800f9c79e8186b021f2455980efa02996c37d42da1777daae4bac2e1abf6f8087
--- a/acct-group/opendkim/metadata.xml
+++ b/acct-group/opendkim/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="person">
+		<email>mjo@gentoo.org</email>
+		<name>Michael Orlitzky</name>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/opendkim/opendkim-0.ebuild
+++ b/acct-group/opendkim/opendkim-0.ebuild
@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for OpenDKIM"
+ACCT_GROUP_ID=334
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/netdata/Manifest
+++ b/acct-user/netdata/Manifest
@ -0,0 +1,2 @@
+EBUILD netdata-0.ebuild 224 BLAKE2B fd2f464d9ed1ad13a7db141a4821825b7b665d1c7bd909e70c1d0a0a56b45a5b9b25a8f6ac18bb7120f0336f1f71613d9ee5991d98a10df50db41e53fb9801d8 SHA512 8d038c3a087a461f353cac9adb95c3a14c3a4cdbb1800a81900ae71650865f55f5539803a2c90605c7725aef175be9ac4e28f47831aeb57165d0e758ff267a80
+MISC metadata.xml 254 BLAKE2B 28a36c4387e6a38145f39cc2a77ecabf1754b29efa32b7a3400b699432011196162823ee23a043d857a182fa32959a83c04fec021a151168d951687a65e91997 SHA512 953a590c431a9ac1ef877b81a589da36d36c396f06dc689bb5d62bd12e9a4e89175eb0a3142981df00ced8a50e08e6d122a734e31937a334176b782f17368d50
--- a/media-video/maven-poke/metadata.xml
+++ b/media-video/maven-poke/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">
-    <email>media-video@gentoo.org</email>
-    <name>Gentoo Video project</name>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
  </maintainer>
 </pkgmetadata>
--- a/acct-user/netdata/netdata-0.ebuild
+++ b/acct-user/netdata/netdata-0.ebuild
@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for netdata"
+ACCT_USER_ID=290
+ACCT_USER_GROUPS=( netdata )
+
+acct-user_add_deps
--- a/acct-user/opendkim/Manifest
+++ b/acct-user/opendkim/Manifest
@ -0,0 +1,2 @@
+EBUILD opendkim-0.ebuild 227 BLAKE2B e792375887b5acd3bf5e763c7279fb8c1185d913fb7d42be01cd73e20bf8840722d2b264a74e1bbaa7977ab41a0d4369b224ef19ad9f0ea59853e32ab8fd42c5 SHA512 8f04205aad048eac1dce025a0d255f237a70ce6e508cb3b324ca910630a2a8ee3074111625b725d39052e6ab5ac15a153a038e32a0ecfac1949e75e434f8c609
+MISC metadata.xml 355 BLAKE2B 5e3838161d4f925e539a0f45d59ffcf03a1ad78f0ca3febe415b3ee1a4308038af6b0912efbdba4d0cadde5bc68dbb0cdbe48f9cb9733454f28771a4a657c5cc SHA512 c3929342f23009641741f498ec0f5c6931b9f964f871b94722c872a5bbf0a15800f9c79e8186b021f2455980efa02996c37d42da1777daae4bac2e1abf6f8087
--- a/acct-user/opendkim/metadata.xml
+++ b/acct-user/opendkim/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="person">
+		<email>mjo@gentoo.org</email>
+		<name>Michael Orlitzky</name>
+	</maintainer>
+</pkgmetadata>
--- a/acct-user/opendkim/opendkim-0.ebuild
+++ b/acct-user/opendkim/opendkim-0.ebuild
@ -0,0 +1,13 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for OpenDKIM"
+
+ACCT_USER_ID=334
+ACCT_USER_GROUPS=( opendkim )
+
+acct-user_add_deps
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@ -3,6 +3,6 @@ DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d4
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 EBUILD eselect-1.4.12.ebuild 1623 BLAKE2B 6d8d236b4b11ec808ab1f95c0a1c295fc4ffff17f85151dd176354a1a1bb7459eb9d64f59411b7a7e3905a563884865c5dc23973f5d6674f13ebafde00ef3d0b SHA512 398ca70365af9bb0aef6807b8d797fe55c10afabe25b2e7a4657aba39b70748f04a5f94b24569701042399e9c4ffea1c48b824f7b179608d080981ff1159f2da
 EBUILD eselect-1.4.14.ebuild 1627 BLAKE2B 681b9aa31b4e3e7cc0857c9ee13dabeeb78936f3c6a41f8ae43a44526086bf8e52ef047ba9543b0fd14280abf0025164dc6fd5b22da481b1009cdd7a9f65c4fd SHA512 8028a79b110b47c0b75ec0621729cad9be30a103ede0d0e6c3e07220fac775704df733da7b64304db2e882e3aacf310750338f9ee224baef602cf1100f96da06
-EBUILD eselect-1.4.15.ebuild 1634 BLAKE2B 41355200b1f813750fe89d5f0def254439c82965cc16368653831f3c38f54aa7b064ee9218b81b17262140c77fca7bb3fcab003a29517549c14f67c601741bf7 SHA512 e3b4bc4aa76ccc4010ba5c7bf65b6dfcc1651dd1e9cf8faa79eed4793cf2a2b99318ec60ecb5c36b13cc3ae9a38969b0597181744c1fee6a82e1022327c9c29d
+EBUILD eselect-1.4.15.ebuild 1633 BLAKE2B 6951f4aed76e2abf736044cbaf2bec65c06c8a8eca7b57da42e79ba09280d9f30aed66aa536bf7d801165e52935728ef7fcab9cd7967b9a14d84b811c8da9670 SHA512 98b098cf6796d68b631323523a0b6eb47469582c0571b07149ce84928a639496ff7a3968130644a488df8666c35234af4eb49a42067aaa29067ac613bce53d42
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
--- a/app-admin/eselect/eselect-1.4.15.ebuild
+++ b/app-admin/eselect/eselect-1.4.15.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"

 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"

 RDEPEND="sys-apps/sed
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@ -1,3 +1,5 @@
 DIST puppet-lint-2.3.6.gem 87552 BLAKE2B 0a2f4b9c2ef76c06bc4fb6eb0f737af406bf3949e7c9001685c6522714b550c0f2c5680d5d39f5d3994496a497664e912eadc44bdb7aa4c27635d23b36a90776 SHA512 d162307e66bb5f1dd923f2f9fab55de7b4c5fad6264d7a1bae8df20bd45c5a786b66d9f5b3bd235230fea959c67242462e711212f65807040048f4c0be7122b9
+DIST puppet-lint-2.4.1.gem 92160 BLAKE2B 5bcdf14cad8cbf90e69c6afaa6935768db3cd9023175a8d5632951c7ff0d5b91362988c0e667c0f852eae705920a6a570f582db394b89436f61eda50f314dc9b SHA512 39d872350ab9ad276c346a7020269f246889dfb00eef020f93a5b53a93e4ae8fd5cf307ac057d6129edf52974ea71af0abcf422e9e0be0ba570d029ffa7011bc
 EBUILD puppet-lint-2.3.6.ebuild 624 BLAKE2B 4ac251b1b01aca51123969199c9dfe49aabbcc7318e06c78a197299542ce5ed54a2bbdae8831d8349c58342b2bed43580b4b437417891f01e5c53d7559304267 SHA512 af8e5d8e726bc773053a9cfe5a4d0615db3acd67395762344dcc48a88ce5ca9c03124e4ee59ad0270c9d600299f1c812ab8884f43221b092fb8c2e8714f0ce2b
+EBUILD puppet-lint-2.4.1.ebuild 586 BLAKE2B 60d694ebd57c1112b3a76a4da7ec2efb3e72da48ffad9eb0fb284db50fa7185cc885bb19c3cb6f69b15c6f2ae24fdc1ee0078c570bd4d5a39ba2afcad29ffef6 SHA512 241c69280163c708f3c251d1f840aa851db3fb90ca0a5c433a95ef6b04c7f78b57d4db95ccb17332a8122cf80644d1b0de893998851b4992ab5b9587ace3be5e
 MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
--- a/app-admin/puppet-lint/puppet-lint-2.4.1.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.4.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec-its:1
+	dev-ruby/rspec-collection_matchers:1
+	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@ -1,7 +1,9 @@
 DIST r10k-3.2.0.gem 206336 BLAKE2B badc840ec7e6793daf205f1352899fa909e9a922a353a52841809dc80fd03758a865e0cb8210e58bb5c25968207d537b3f19c1903fbb519c50b6af2dd27eb5fb SHA512 7ea00ec28ba631877d33fa8b00b25e1c69346b787499ec7b26118c16acecf6bd39fcdc4618af016ebf5b62850b6d984510f7e9153dd4e99771def299b7d0703d
 DIST r10k-3.3.0.gem 206848 BLAKE2B 92fedb9871c6e22df3a3f8c4cf18feac1bf3ef51e2e67b3001c811bc81397eda71bc9da94ef860d6e39b989fd1c1a3b9dae402142496f17c4427ff2de62188fd SHA512 674c5c386885dd1476264d8bc047ddad0411b6344350662021ede8a5352e95fd50a72f62127b00bf6b2bc8e6b3835b017128788707610d510a64eee13b9f4d4f
 DIST r10k-3.3.1.gem 208384 BLAKE2B 81e7de3d2fabd038240478ab7ace4fba181a4370544f964b438a6b96de34a741f653aff018ece21453b119ae6b12f06934cc82be8a6b78cd5a72277195a5fe81 SHA512 20f9c92fbabed82521d452f339d9d2fd8cc438cac1cc11385a6e2874a5d55fe6425ddfcd281d8e63ee043adec5fbbfba0c37ef0c6e15d498c64ba550740ccd6e
+DIST r10k-3.3.2.gem 208384 BLAKE2B 8d5ce5d7fb2497b701fdf7cd0a742db7b221a2b327464b553b9dbd893ecfbda2498302fb14cda89df7030c6b48dfb048d23d5c271773a3974e75b115ad0e3c49 SHA512 ccc71c856f204aafe9f15b497c3881aaa3beff50c36647e06590cbbaebaed58514eb30a5d57bbee4ba071e3586083c0b07decbd68c859667e6eb6bb57a40aef5
 EBUILD r10k-3.2.0.ebuild 933 BLAKE2B 6e7df53cab2a25bb5bf6fa4218cd670b742a68aeeb5402dd09d1f34861d0596250b915965a06b4cc8c157009d671046c00758cb576223d108e6b8d40067a23a6 SHA512 66c0c7e12e9f934c9e5f3024021e31ef4dce674f3eb27763bdc60413c9ef79dd101ed5cdcbdeec6cab9332fcbb60454754aea7c05f251b23327fef6f227eb7c8
 EBUILD r10k-3.3.0.ebuild 941 BLAKE2B d66e537eb1478ad0acf777d35efde0ecdad4594c5032ce01cfcb873eecef8e9fe65f237a0465ecc2f2368fb3019e728f54c7eebcfd06f461362f65ebc9cceb4f SHA512 eee05605d5294656c76a5207b25ced88a7162cfc15308660bb51fd9d22d13ccea24c288d21d540b8da108bcfe18e6539c589f0f2d3dd420ec1050850d7f19365
 EBUILD r10k-3.3.1.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
+EBUILD r10k-3.3.2.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
--- a/app-admin/r10k/r10k-3.3.2.ebuild
+++ b/app-admin/r10k/r10k-3.3.2.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	~dev-ruby/colored-1.2
+	~dev-ruby/cri-2.15.6
+	>=dev-ruby/gettext-setup-0.24:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/multi_json-1.10:0
+	=dev-ruby/puppet_forge-2.3*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+}
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@ -1,3 +1,5 @@
 DIST stow-2.2.2.tar.gz 579324 BLAKE2B fc4ab7f386e8245b361cee5fc0decd91caec543ec6178c82720866c33a974ba9d68e999a68c3b7357d873ab1b58bb8b022bf02dad029972f42c317ffc288bd04 SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5
-EBUILD stow-2.2.2-r1.ebuild 621 BLAKE2B 5cd0b3810fd8d2bde5dc13cf5e80639d463bd17a51ed8750d11aaeb75a4ed4983938d3e4faffea30adf08da2432ebf2417fa6b6df071f9a09d290877fedba27c SHA512 0ad9daf266d7a2163a778569d74e45c1cdc506c455ae7ba783ce07b5f4f32f9fb99979a188b770566c8d2e72a10bd256d5900333b8d3bbc7566a05cb828c82f1
+DIST stow-2.3.1.tar.gz 654191 BLAKE2B 9fd54fd3ff76aa7b72ed973cd6d70b8dc747fa3bb1ecc6bedd221b308d7d141a21a2f077c67efb432f2c7c4fb6bd126639038b196946206bf4a7f95040477ab2 SHA512 e9a7de1a6f10eaf7cdbe6737e0a8be1498e2eac46b6c57e65b83759b061efd1c0db45f7cba123e35428307e3aebe5baef9ea8bd4b5eb6ec5e1b159117a760441
+EBUILD stow-2.2.2-r1.ebuild 620 BLAKE2B f6041e927a8c7369cc96c3afdc5ba4778ee9dcddd672a339fb369eb70a24d34ffc21d711ae36f004c3d65797bfcdd1a010cd1180ace4b4d14bc9d640bdf820d8 SHA512 51bada943c05c6ad71ba8ca6ff6678a51fc37c9df063977f9478403604acd7d9993b288cc21c3556922749000a5d34276d6df6575aa107378e8a5aa20611bc21
+EBUILD stow-2.3.1.ebuild 619 BLAKE2B 474edc9a9f6c99ff99bb2f7192cb83973b7d6d92d44d08f30605712856840901c0cbd99366ae5607f5d3af9dfed0c695afb48741ffa729805e1377dbb9483e91 SHA512 6c77dbf6b120b83e490d3748e0aa6c4a864bc6b512e0a7c0ca46b4e5dfeedea2d0e4437ca137124f09d34becd33700408c3f00cce54e22557659065256c71b46
 MISC metadata.xml 469 BLAKE2B c09f5d5ad52c89661d6c2b43f1762584cf3282ec9812233df01900ea4b738faf2c66b4405f0d5b01f33016b7c98714cb14fb503f84ed2332596d65ad676217f1 SHA512 d2dedba051ac4de16316392a51e87ea36f435c7f568523ddbd06aa620f4d350edafc6bc996954d9982dd1496951c22731fc5cb5df2725414986281709dafb126
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ b/app-admin/stow/stow-2.2.2-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/stow/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"

 DEPEND="dev-lang/perl
--- a/app-admin/stow/stow-2.3.1.ebuild
+++ b/app-admin/stow/stow-2.3.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-functions
+
+DESCRIPTION="GNU Stow is a symlink farm manager"
+HOMEPAGE="https://www.gnu.org/software/stow/"
+SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+
+DEPEND="dev-lang/perl
+	test? (
+		dev-perl/IO-stringy
+		virtual/perl-Test-Harness
+		dev-perl/Test-Output
+	)"
+RDEPEND="dev-lang/perl:="
+
+src_configure() {
+	perl_set_version
+	econf "--with-pmdir=${VENDOR_LIB}"
+}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@ -3,9 +3,7 @@ AUX burp-2.1.20-no_mkdir_run.patch 238 BLAKE2B 44ba927f8ca97386d70d52411f2fe5ca2
 AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610dd918b583455fda6d13eef6292a7eeaac0d14266bf21f97caf6dba65f0a46b1534695e7b72b91c6958d86f70ac63e356b5e05691 SHA512 249a426a76a81a2582f824d2d767695bfd848a04190ee9a2f1d4296bed03f93d4eaa86c13b4b755700b1b552bb584f9b0031ec60a705f2b27b20d62eb58aef8c
 AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef3fc3d42249e23a97555f9ce67d13a94565d0f3f61a7f4fd5c71300e7988b9d666f220122e0f1 SHA512 dc06be1e5433973f6bbabd86671ea20f12bf57d91871b4664bd7fbae32a561967f139b99674ac93a3a9ec56380e090500c118b45917f884b69395e3f03f9a311
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
-DIST burp-2.1.32.tar.gz 591737 BLAKE2B fd525bff32348f1dbc37b1c065d262ff8af1d999d19f63711ebcff3fb55e90a7440cc6cfc0b7eefe6f8e250672c799d86e65ed599f0b8d7dd80bebcb99888987 SHA512 2477b7a9a2123b227a27519f7f3d9facca7173a9e63d66f6a8fb2ae5408d8af4ad5bfdd0a14efd6cf80e7bc8e91907f7c293a3d621b86bafdbf163bfa08d0c81
 DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d
-EBUILD burp-2.1.32-r1.ebuild 2841 BLAKE2B aa96c385aee446cb39191f067eb7896bed961a0711372a8db1aee2209a692286d64ad63cd6cf9551497f00cba8e570b9f46f54d1fb39b08b3982464c8df47457 SHA512 b5405cae46b2991827adf6fb152a12cfb8ef382f07575882f81f73e88a13ab0af93f122fc551293e8e5fa0d6063832eef0cb30dd8f3b9b8cfcfb8082e24780d9
-EBUILD burp-2.2.18-r1.ebuild 2806 BLAKE2B 1cea6fda2ab3bae884f149ed1a2e26cfb8715eb010390d8b264bbd318e44eb873df1bb6c96440b0f01191eff3613117f2be486948dd11ca3699b3fa31195cb01 SHA512 5c331c155b0a807e18ebc26a8c0bf2847a39b0d65b1dc2a08bf4e338500e026f7699ef7dd3f735d43ce70186b14105ab33148522f0becec500f57e0e34f98b2a
-EBUILD burp-2.2.18.ebuild 2846 BLAKE2B ec0ad61b2b7502cf0462315e7e515ff285a0d231ee9d4fe98adc0fe38f1397bace971c12f48e27a4205c42465da3993fa8bdac3836b98105c378713ac8f5d411 SHA512 f8b0235a5e77ec0f4911b699dff22c77f022acfc2d2931f9723aff2974aef6fbe4cfeed4e915770306ff819d77a2ffc40c7d624589fa2901d639895de4f294ed
+EBUILD burp-2.2.18-r1.ebuild 2834 BLAKE2B 43c82ad416be2cfa689f037d0c61dec3fd88e752f2697653e348f57a2875af09292ad46f4bac9c7d0f7d45e7c4d6c37b47c38a70635df881b7be8b540357e976 SHA512 012a20f640b6999d91e47aec6d85da3cf9146b826a91f4f06a450a229eb7b1ba6c02a52983b919b531386faf34750c2c75fe44c39797d5362a440ff2072d26d2
+EBUILD burp-2.2.18.ebuild 2874 BLAKE2B f6c253a5adfc5e945a9f9b8e919556c124fd0205b269409680f3ba3b7aed79ff420859ab574fb69e2364071232fd87eeacdf73263c9401bfc617284b40be9d29 SHA512 7b4b21657a6cc4abb6bee9bd2e86160e7620cc4df4ab9e42c502b26df265eed89c7da2fa7f10a26c80b7913f7261e754e9802f1842589f59f1491ed9f9a33477
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
--- a/app-backup/burp/burp-2.1.32-r1.ebuild
+++ b/app-backup/burp/burp-2.1.32-r1.ebuild
@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd user versionator
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="https://burp.grke.org/"
-SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="acl ipv6 libressl test xattr"
-
-CDEPEND="dev-libs/uthash
-	net-libs/librsync
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
-	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
-	)
-	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run' \
-		econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	fowners -R root:${PN} /var/spool/burp
-	fperms 0770 /var/spool/burp
-
-	emake DESTDIR="${D}" install-configs
-	fowners -R root:${PN} /etc/burp
-	fperms 0750 /etc/burp
-	fperms 0640 /etc/burp/burp-server.conf
-	fperms 0750 /etc/burp/clientconfdir
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "Burp ebuilds now support the autoupgrade mechanism in both"
-	elog "client and server mode. In both cases it is disabled by"
-	elog "default. You almost certainly do NOT want to enable it in"
-	elog "client mode because upgrades obtained this way will not be"
-	elog "managed by Portage."
-
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
-		elog ""
-		elog "At first run burp server will generate DH parameters and SSL"
-		elog "certificates.  You should adjust configuration before."
-		elog "Server configuration is located at"
-		elog ""
-		elog "  /etc/burp/burp-server.conf"
-		elog ""
-	fi
-
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if [[ $(get_major_version ${oldver}) -lt 2 ]]; then
-			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
-			ewarn "the server config file by default. If you use bedup, please"
-			ewarn "update your scripts to invoke it as"
-			ewarn ""
-			ewarn "  bedup -c /etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
-}
--- a/app-backup/burp/burp-2.2.18-r1.ebuild
+++ b/app-backup/burp/burp-2.2.18-r1.ebuild
@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl ipv6 libressl test xattr"

+RESTRICT="!test? ( test )"
+
 CDEPEND=" acct-group/burp
 	acct-user/burp
 	dev-libs/uthash
--- a/app-backup/burp/burp-2.2.18.ebuild
+++ b/app-backup/burp/burp-2.2.18.ebuild
@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="acl ipv6 libressl test xattr"

+RESTRICT="!test? ( test )"
+
 CDEPEND="dev-libs/uthash
 	net-libs/librsync
 	sys-libs/ncurses:0=
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@ -1,8 +1,8 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-2.7.9.tar.gz 110323 BLAKE2B 244afad17ddf17fa95a11d5af7943a153ed37e67ef304511787767a5d769f9cd22fb66875d637f2d536cce8942e4feee0c442af8349a32a91940b1fbbc2e879c SHA512 24374783ca52835b400b84316ffab5e9066805362f02082f8ef409e21ca590d837b3dd11401633947f9fcc98dc977b0e8b6076d5deecd02b38478f257500a052
 DIST acme.sh-2.8.0.tar.gz 127638 BLAKE2B b5ef10c40da4b77c7f1f3175b7cac0cc19bff135959416a97b3e8443cf13bb92d9e0b86837fd3834351412a19f25e92a4ffa146815c146f2e91cd94bcbc655a8 SHA512 99f86866f7bd1426e9a8b31dd09206685ad4aa01a3d723d366681aae4ea2087f9437496e0b3da947766931493c9d94305da1906eadc7005373327342ca94ce23
-EBUILD acme-sh-2.7.9.ebuild 1016 BLAKE2B ea5aaea6f1e4049aa316bd7c57c73adac4f0b77578c3fc9eff1b8efb39beea322f7122471c5efc436283939667f1d5c439802b0cae9dd00b3d9f55df36b31b9d SHA512 40804c6d3692b955247a9c4790a11680c2985418f58a1757feee4931a53db67dec873da4c12276eec421176260d69d76e2828a93feaea44c7d1a7fba801b017d
+DIST acme.sh-2.8.3.tar.gz 163573 BLAKE2B 7436932d79e732b8c419a588f4677ec0338c63d0dfc227e7410b151731e2fc4c028df81f459f7ad140dab857ebdebddab3173095e3efcfad0a971ff6762c8608 SHA512 15e147d0f07af91eab7274df50e274ae41a411c30ee7f6ebc8bcbcb601b66094fc1d8126bfb816caa27dbeb5222da20a25d1c79227bc70ddb6b5d0ce0dcb389e
 EBUILD acme-sh-2.8.0.ebuild 1041 BLAKE2B 64edc40dea7933044c8aa67932641089eafefe8bd595759fd0e357113631a738c0dde657198c73771307a189e1a2dbe731beb85901abbcc6548a681a99d76e62 SHA512 98a3f2221395ff77e9b8592ecf4361b71cf6807a4e789fd7f7dd4ef31944aef3db11e587c649201438d925df6c86c04b399e50e930d1a3c450f0bc4a9c277470
-EBUILD acme-sh-9999.ebuild 965 BLAKE2B bd273468f5c1689fdb2fa75743502f232a0d9080a712bb5f951dc30a14dddcc0fdadd2a59e71b2a664a59565620d3345acbb9fe48e4c0ae756bccde0a18ed80e SHA512 77c0ee3b1214fb29e93714b91d0b1f6533c7ea1094ed2a72cf4268b41f890d71e2d422c98b57ffcb5f2b8759edb6c085bcdb4edebe6c55737881eff3f54e12e6
+EBUILD acme-sh-2.8.3.ebuild 1098 BLAKE2B 79aa3b8955df9308a800da0dca7bb97fdf48190a06b205faf85d15ab6284c933187f2bc6ddd0e02fe4cc5c380de910ce15c341e86c7219e6e8ffddf043363331 SHA512 667605c0213706ecd3c8cc95ed98fc322231196ac676ee95f01ec4114e73fa8f226a14de870d8c67569daeb0b6bf78cb9edbe3228bdca36b7e0c10cc65660daf
+EBUILD acme-sh-9999.ebuild 1022 BLAKE2B 0e439fa8bfb6365f24aa4181acdad1af2ae1d0ab55abcb386348180d3ccf03e00bd9f395a96dceb252b56e29bd0a5711d027eedc7e3e23c67e9c491a9d75b66d SHA512 d370fa4197af017c61faf8b89b71e195920ebf6e970e51f86c773027fa95189491e75d94b1fe8901f02562ffc1ec9b736d82a0a21a64e31203bf6e841d2a4021
 MISC metadata.xml 597 BLAKE2B abf8574531170e1bf807d45682c5a394e3ef11880b23a297b3a440ab1b3eaf2c283d5afac51ef7fb8726203b6303f626e5883f4a258897794a3848e4ade5980d SHA512 f45386c5ef271f698ce540ae61b9dad4ae6d7c624d13310daa2adc353a6145f4abdf19f7a0fc5120ca661668673efa6536297e25a374b65ec06dd8b41a7ebbb6
--- a/app-crypt/acme-sh/acme-sh-2.8.3.ebuild
+++ b/app-crypt/acme-sh/acme-sh-2.8.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -17,8 +17,8 @@ IUSE=""

 RDEPEND="net-misc/curl
 	|| ( dev-libs/libressl dev-libs/openssl:0 )
-	net-analyzer/openbsd-netcat
-	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 )
+	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx )
 	virtual/cron"

 S="${WORKDIR}/${MY_P}"
@ -39,6 +39,8 @@ src_install() {
 	doins -r dnsapi/*.sh
 	insinto /usr/share/acme.sh/deploy
 	doins -r deploy/*.sh
+	insinto /usr/share/acme.sh/notify
+	doins -r notify/*.sh

 	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
 }
--- a/app-crypt/acme-sh/acme-sh-9999.ebuild
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@ -38,6 +38,8 @@ src_install() {
 	doins -r dnsapi/*.sh
 	insinto /usr/share/acme.sh/deploy
 	doins -r deploy/*.sh
+	insinto /usr/share/acme.sh/notify
+	doins -r notify/*.sh

 	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
 }
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/myspell-ru/Manifest
+++ b/app-dicts/myspell-ru/Manifest
@ -5,6 +5,6 @@ DIST myspell-ru_RU_ye-20060316.zip 984889 BLAKE2B 9dffaa2479e2307964ae0227b07af1
 DIST myspell-ru_RU_yo-20060316.zip 470326 BLAKE2B 4538db16a39dc2c7607d1bb3a1150c1021b5d567f11695d838abffb2896124ba0a207761f1044d541af1613383554927a3128d025083430e53b8fdea54c28c38 SHA512 4a4a85d9dff96de6fbc9b78c74f22fafae3abe143ababed7041df3b06bda3127c6fc44631cc2bfa33f4672b06db2871cf3062acb8355524b926716f1db639b19
 EBUILD myspell-ru-20060316.ebuild 688 BLAKE2B 72c7b4e51a423d5b1b60dda71f6b424c0892e93eeed287901c4fc18b00fb1bcd2b783de192035fa9d91e4093f5034154ae962b39633dcc00aa2c767f09031aa3 SHA512 aea38dbfdb4f0e7d116dd4750ffc8af1a7ac3fee7c11b0d8173a9f65e585bc8c424dcdbcfe09dc4d976d8d40b8c7880984173d44aeb43c5106c5c8e17dd863f6
 EBUILD myspell-ru-20150711-r1.ebuild 934 BLAKE2B f88c7a020b75261f71285d6de7ac1f3609235680bf99426f1b618f5de28897e9cafeeceb253f15798ab657885feba21ca8a5d4759bf0e9289530f2c593928c1c SHA512 4ef4d289ffe1fb3763b84b24e48cf329892c813bbd646f0e899b60ae2d2b901c4d97337f3fcf2d6a817471b33092547fb493254aa5a4290de40e74f72e158c2d
-EBUILD myspell-ru-20150711-r2.ebuild 853 BLAKE2B c84912c304f5df764fa3262a408b0e3e88a3f28e7416ed200249fdb9be9b1bf5a5f1ec5ef865dc4a8d3d345f34f35e2ab456b02ab49e46877abb76b562449389 SHA512 9310457cd4536ad140cb3fffc924fa7ea1a50687c79b0aaaf0350a56099f14ad0b6eeba8c1af501f6a46ffa1244b3bbbd5a776ebed1588e4defac0f4b3276074
+EBUILD myspell-ru-20150711-r2.ebuild 852 BLAKE2B 9eca67d3ebb940406fa5b6362b697da4ac204902d163221ab40b3f7bca919383ce3cba00c5eac0a57f6b2a1b7d4091365432fc7ec4b7f765e195dd5a0fd2b621 SHA512 a581c86a88907d429734cac1890069e96326038b78eb0504591b930bef26ab4de5c362239443c9df04a605fd43f04e48e2d73abfdd6c9e90f498c7c47f18ba55
 EBUILD myspell-ru-20150711.ebuild 753 BLAKE2B c3d0a699c6ce550fb84402956543072b1fb670cb26c2a1a56419d30c13211bb60326dba1e7b8e8c9f0655c29760df8dc80adb7057b4e3f6979a0bebbbfeaba81 SHA512 3faac5b08b42c3732af5950eaec8d9c1b005a3f548a11852dd6fcc34a5cb50f52f62b3d37694daa2237ca1ad950111eb550c2a1ed26851aa2548b5129e2702df
 MISC metadata.xml 379 BLAKE2B f35e408ff77d8701d7a57652c11b991b9c44c6e49bf9047ae732ec5cba0ceba6003a1fe35ab295700b6a144ec112fa55361fd4c9b1779925ef0dd783c3253058 SHA512 07e5293f5bd387c07b78f995d74e4839bb34bb18b38337cf46f866381961f4812e7bd6dda51d185efa281dae08d0a166b0d909eed2bfb60f235cfea2ae54b139
--- a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
@ -20,7 +20,7 @@ SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/${MY_PV}/@@download/f

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"

 src_prepare() {
 	default
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@ -2,6 +2,6 @@ AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58a
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 EBUILD eselect-mode-1.4.14.ebuild 569 BLAKE2B d7e4dd474ca2ba2703d8a84939f79da3cfed9b942a8e44f4a26f742ce0b54cc6473ccff07172df91d528132e404ffc14adb5478402d6f4bc0ceff8919690926b SHA512 1a684d4e547c7da81bd62f723cd03053295119f664543f50ef8edcd69c8ad6717aaf616868d0ab56dc9a6b639822d17d56517b8279b7f1a2dd879ab94ce97b81
-EBUILD eselect-mode-1.4.15.ebuild 577 BLAKE2B 4464011d44373c9a55b6ef683597b03a3ab7b1e77cb8584def842d6796de156aad2a4e72b971e883e0c3e5ca5f29553af65b0d408154c47afa56bb5f092905ef SHA512 94f3dd0eadc75edda001fd10bd7133ae026faf137969b988cac35fbf7cc93f073f27857d34ec22ab7d233f5c8726ed24c72398c8d8dd4456ff5147532c6544c0
+EBUILD eselect-mode-1.4.15.ebuild 576 BLAKE2B f810256590a815bb0e4de009913044d8008f655b11f7757c7b985ea68c56a47b8abdc93e92a3af276c7ca3a063c14aeb3d6acfffaa2db42c02f4da2de3d4bcf4 SHA512 d81213d5a0f31806dee6c2c782df5630a70d0eca37cdd032651f71f81b19950cfabed7e696a4a3ae19f41869b02640eb268438c97d609a6ba58e67ac47b82a56
 EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
 MISC metadata.xml 449 BLAKE2B 711e97a9feb5a464b81a738024f1f8b1ea4dcf2dab78f1e814fcb30569df5a3192cc6e72308687bffd9f7c806f3ce37ef62856f86737d3e8aa4334f721a2fd7b SHA512 38b645859453423cb80be836dc712364d5650f07f071c44d07ad7f5f629b8efd0d26535ebf61e8c38281e8426109ef5828015e01b3377486ab28f942163d155b
--- a/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/vov/Manifest
+++ b/app-emulation/vov/Manifest
@ -1,3 +0,0 @@
-DIST vov-2.0.0.tar.gz 510667 BLAKE2B cb138fd5c1c28f958d01dbb7a717fe21595a57d06fdf2b7c18b3d68b9adaf4a349edc94a7d54e36e7367b69b9a92af5feb8fcc822a011ed7518a4113a255ac3c SHA512 67a3b552dc768dff57ed2b7119ff288f4ef120a5f48279a4a003ff39add051b7fec9f22c3278449c6e96b7b5da1cc40a5fefef7a320fbfceadddf73b317a57a7
-EBUILD vov-2.0.0.ebuild 1007 BLAKE2B a7006d4903ce0db53067d41cc9277f610558f9bced854a09415f6fb3873ad0bcfc1c6394d34a302a92a1ce2f602e6a738402b363757b4035de737371d3497eae SHA512 2912134a33c836d4a41ed1f45a18ded733c8a9eb1cb112bda3a84baadaa5d95329a75b22c8c5f81c4964ffbac92700963638484883b58b3e4f42ae55f8da3c0e
-MISC metadata.xml 739 BLAKE2B 0bf78d3a36024590426aa30d0e5cccdd6b31d44dfe332fdb12ff3bc26d6c8a3e223c3f9f43ca2048270a6da9c7f19067efe7944a848b55691fd2cfbfaac5568d SHA512 25a9a61adfac2afd4ea78a085bd0af09d6e160ee98fe172cc94562ced220ddea0523ea4087a8885fc602dde5930f867d6a7e0834ac1f61f498a284b62869e83a
--- a/app-emulation/vov/metadata.xml
+++ b/app-emulation/vov/metadata.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>dlan@gentoo.org</email>
-    <name>Yixun Lan</name>
-  </maintainer>
-  <longdescription>
-  vov (Vov's Obsessive Von-Neumann) is a tool that emulates the behavior of a Von-Neumann machine.
-  It is basically an interpreter, which reads files in the form of memory assignments and executes
-  the encoded instructions. The vov's instructions make you able to perform simple arithmetic data
-  manipulation. It is a very useful tool to see if your programs work and how.
-  </longdescription>
-  <use>
-    <flag name="gprof">build with profiling support</flag>
-  </use>
-</pkgmetadata>
--- a/app-emulation/vov/vov-2.0.0.ebuild
+++ b/app-emulation/vov/vov-2.0.0.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic
-
-DESCRIPTION="A tool that emulates the behavior of a Von-Neumann machine"
-HOMEPAGE="http://home.gna.org/vov/"
-SRC_URI="http://download.gna.org/vov/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="debug gprof"
-
-RDEPEND=""
-DEPEND=">=sys-devel/flex-2.5.33-r3
-	>=sys-apps/sed-4.1.5"
-
-src_unpack()
-{
-	unpack ${A}
-
-	# do no install redundant documentation
-	cd "${S}"
-	sed -i 's/src scripts docs/src scripts/' "${S}/Makefile.in"
-}
-
-src_compile()
-{
-	local fp_support=""
-
-	if use gprof; then
-		filter-flags "-fomit-frame-pointer"
-		fp_support="--enable-frame-pointer"
-	fi
-
-	econf                       \
-		`use_enable gprof`      \
-		`use_enable debug`      \
-		${fp_support}           \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install()
-{
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README NEWS
-	doman docs/vov.1
-}
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@ -1,8 +1,10 @@
 DIST boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 55907 BLAKE2B 16ac81094457c80b418109104139c1604e38ec58d6065474cc512668601f12896c4d470fe15c9a366a5ec63d50135265df71f28f4202fa283231879fafb0efbc SHA512 382c7f8a94059ae9816783b12c2d27ee6ca69e23ef7085bf2ee5a31109e6ab0c3d0b0042a3dc290b89276b6315d767aedf073dca390fa688a9aae07e837f83c9
 DIST ibus-libpinyin-1.10.0.tar.gz 1693440 BLAKE2B 5e0d9debddfbb81fcb45ac86d1fe8fb1220a50c527222fb3c3431149231f41dcc59ae87da9ae9485e2585f0e3051ac4d1792407ba62d90e5e0323c482d52318f SHA512 c9fdc28562714bddc889805e1d439a7dd425f721a8236b8f8ec4727ce24e5053693b3e5bd9b06ced22ceb66bc7621715f7ee52e00af3b8b113503a5ce6963ca0
+DIST ibus-libpinyin-1.11.1.tar.gz 1728202 BLAKE2B 6e2273c4ff1be76bb8b0e65b915e039c0a181981d20ed94662184e161e8639ad3d548de981d7bbae950ab8b5019bedaed9593e03282e2f9d207f831929d422bc SHA512 48691952a10f4ab545d8e233dc3cd75fc54270c03a687820048152636df26d233ee0fba89e4ec2ccd5a6e410b41e556872e3dd2468d59d44b3440e904b93528b
 DIST ibus-libpinyin-1.9.2.tar.gz 1693247 BLAKE2B a887be2a11406420e86cf1e7f76f8d8c06cbffa62a0ab42d450015965c24accab51164ed18cdc8e24f26edf03676603a691c907e00722efc24e947919345570f SHA512 008390049b0186b7163cfd8857806715dd78235fc1e35a89d4b58a38eb7f292b643d48f502c0c924512a9f5a96d2581f577d6a9ec3b660d05d9a4adcde970430
 DIST ibus-libpinyin-1.9.3.tar.gz 1692251 BLAKE2B 6f23a8838f90c082a43fc2922bcaf13ecf287fdfb898f1ba213739f8e2f65ff9a68bdc57cf8f82e73e2c5e1569f1209b8294b45c30c5c3b7e32287b73394ddc7 SHA512 cad3d8415e0c206cbd2eb606ea04b5861e10c3a5f614d90bbba29b751fcc978e2ce1a8a000ceb8cc98de1afcc145ea62b5ee8e9d34e4184bccc487225b34ab1a
 EBUILD ibus-libpinyin-1.10.0.ebuild 1504 BLAKE2B acde303e11eb1247070b722c3091e345baecc52c2be979282f08fd67533df15bf580a203e9def2632ffea5f55e0415e6974822242e8b37894417f3999d485529 SHA512 8e4ef404686546dbc1087ec72ae8869cca35e124a39d1d2b507b922f1e455ccb98485b59066df271d52215ba4ba5f591893f92152b7eb8bb80bc81216cf66cd6
+EBUILD ibus-libpinyin-1.11.1.ebuild 1168 BLAKE2B 61ff0f1bdbde3e2b3457daf7305f26426e22c9a5e8662d85e19b98fc87a1688051d5d77777b65d01464bcfd3dec6e0ec21b9de65cb43932d4c7424c70c9a1e90 SHA512 c0ba8a5cd462971fca1d4413b4631550dd3920599dfbc6339ff3be46cd32a82c81ce8cc1ba2bff558f850cfff309bb46ed24866b9a5ea9bbf4e9e034356d0371
 EBUILD ibus-libpinyin-1.9.2.ebuild 1168 BLAKE2B f6df3141832f86f0efbbde6d92a4f692795b585800f9d3c24eeacbe15300be61996b6d029fce6ac8e02ca8253b9cb6c8e3ce5b21b8d688eb2bab860a157d2cb1 SHA512 ace4d4f847d87b9c44e061457f040f744463a06aff68e762200700913d0f54fcf9d8150c064a44245ef95c31d9ca653c6807f6003620788a5962d3a99370e414
 EBUILD ibus-libpinyin-1.9.3-r1.ebuild 1407 BLAKE2B 9b2424d1fe2ea8f1488909831ba59f6920ca7398aa2810a6caa67dff4ab0a9ac0ab328e03a3c629a2b44552fbd3b758909d5101f97f696dc3cd99dacd2c191fc SHA512 89ce99b04ee1dadcca556f73943327df5fd26b8210fdbecf8fecd899a83c27a92fcac49254c41c145b000e4f84d2eef65fddaa95c7d3be20ab0e2a83f761658f
 EBUILD ibus-libpinyin-1.9.3.ebuild 1065 BLAKE2B 7d8ce41d0bfa9faf82d7651a72b6976953da94e0baaea2abe557cdb931bd667efac553cf8ebcb241ef385b8c55dd237f533a5be6757fb6ab507283c320f9eb3f SHA512 12ceebfafbacb494efee3e90ca78e9c6845aef202b5a432828fbcbce1a0b688294861151324d2e75ccd7f67ccc84084cb2a4310290b975c350011fd422d34457
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools gnome2-utils python-single-r1
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+DEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	virtual/libintl
+	dev-db/sqlite:3
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@ -1,8 +1,5 @@
-AUX gramps-4.2.8-uncompressed-docs.patch 1261 BLAKE2B 48ebdddf13e9f29f01a3f5456686fce3d93e89437264c96918b39800f95a0bf65ed05802a74c6061aa3a375d710fdfe484c8a8afffd4a6805487453f4ebc96b7 SHA512 422338a2b6aa7865c59c5238728be95e7852097a464d328fc5d75c93305c05a1a05dc077c0a20838d66d67984d1cb9d9482fc92763f022f08a88d2dc414c5b0d
-DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
 DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
 DIST gramps-5.0.2.tar.gz 16706686 BLAKE2B 006c8d10d574d7fe92b661400c257f6f1bc2b2e9e27d788ca761a5d51aa8593f9d26fdccdeeb0fb2860bfe1b08d937e938b3fb21094a42de0fb306d3c16dca49 SHA512 abbf885189bedcf9897bcb3216df86af41498c94b3b9c133350e84a8a61057ab4ed4823c3923823ec99fe0be92648e9259fdceaafd31f968c7d1560a0cd859da
-EBUILD gramps-4.2.8.ebuild 1601 BLAKE2B 45868269d9ba22e5a62f44cf3e87be2e50c1cababffed858e27fb828cb7c1ed4fe54cd955932ffe24921672e68d7ac67cdbbf6dc212dceaff88b779b19b390d7 SHA512 751c5b2fc03b4b890531d756ff8f3c09cf33eb63eb56c0af80412f58abb5f84f4d9a0ebabed06f50828665aaa19f47e8bae081436a9e02603486615f689a6ddf
 EBUILD gramps-5.0.1.ebuild 1990 BLAKE2B 8012d40f4b7a242b1b7bb925182806af27551f537c495e2da48f6b79af71948260719e2ea9bec01aeb62d499e57938fab418c0d2929b2a25a091b1b934132ca2 SHA512 278b9b856616bb6df57807ccdfb7c89d801ac8d0f4b5e8c8cae5d6aff29ad6ab0a2ac4d8bf9f46142a0af5a8bd3ff4f3c01d8303898643f279dab34a8484fc04
 EBUILD gramps-5.0.2.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
 MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
--- a/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
+++ b/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
@ -1,33 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0177ce7..7aaa681 100644
--- a/setup.py
-+++ b/setup.py
-@@ -160,27 +160,8 @@ def build_man(build_cmd):
-             subst_vars = (('@VERSION@', VERSION), )
-             substitute_variables(filename, newfile, subst_vars)
- 
-            import gzip
-            man_file_gz = os.path.join(newdir, 'gramps.1.gz')
-            if os.path.exists(man_file_gz):
-                if newer(filename, man_file_gz):
-                    os.remove(man_file_gz)
-                else:
-                    filename = False
-                    os.remove(newfile)
-
-            if filename:
-                #Binary io, so open is OK
-                with open(newfile, 'rb') as f_in,\
-                        gzip.open(man_file_gz, 'wb') as f_out:
-                    f_out.writelines(f_in)
-                    log.info('Compiling %s >> %s', filename, man_file_gz)
-
-                os.remove(newfile)
-                filename = False
-
-             lang = man_dir[8:]
-            src = build_cmd.build_base  + '/data/man/' + lang  + '/gramps.1.gz'
-+            src = build_cmd.build_base  + '/data/man/' + lang  + '/gramps.1'
-             target = 'share/man/' + lang + '/man1'
-             data_files.append((target, [src]))
- 
--- a/app-misc/gramps/gramps-4.2.8.ebuild
+++ b/app-misc/gramps/gramps-4.2.8.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+rcs +reports exif geo postscript spell"
-
-RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz[postscript?] )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-"
-
-python_prepare_all() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	eapply "${FILESDIR}/${P}-uncompressed-docs.patch"
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --resourcepath=/usr/share )
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@ -1,5 +1,7 @@
 DIST grisbi-1.0.4.tar.bz2 6965398 BLAKE2B f53b5cd7f2e4b0cdcf14732ba7e03315ec7d419c7f6ab3a290fd30a9dc9f7c0dde69b473dca3873aeb90b793cd90287c516f2fe4b7a50d71368abc3e12ce16f6 SHA512 9761ed94db563c39cab793ee076b6a729470231e3111d7ce57d188a6f1681cbb715174f67c15741320f295d4efdf0784f6e3d4d4d58267759efbad56561c7064
 DIST grisbi-1.2.1.tar.bz2 7314316 BLAKE2B b34aaaba79608561383e09fa1af7749f8c3cfa322f47a6d9cf350af1a3b96c575140246ed65b33127d92f84a57d959f24c99ef748ab80097ffce2ed8f16319aa SHA512 0193d5777ed191f7f3dac67fc9754f5588f35b9486567f3a7e7f9dd998865ff2130ad04b78a98dae1e1164fbd400a58328bdee777e9d0ff1100d1fd189a5aa2f
+DIST grisbi-1.2.2.tar.bz2 7325947 BLAKE2B 559ffc8c46edc629fd17aa38042a7d9a39dd9c1866bddc86560bae2750a53916a6e0a451dc6e482b9d21bc1d8d493701d656dfa85b131f5f9b5b3c014249dcd2 SHA512 7d627f9ae588c0d5a8235bb86f3ed160a572114ccfec1dce9c7137296e5525411600033ca4e42b242004edddc42f2160e95c18c0c0cd13516cf62486e081acdd
 EBUILD grisbi-1.0.4.ebuild 848 BLAKE2B cdab027ce150b2947949f4f3ffb4d33b7229fda1c92a5e18eb80ba797600afbb75c998be877856beaaa167dceaba9a6a243269c4beb709dd5125e914d0c2e700 SHA512 473f2bf7f32edf9305263604682c296159695aa964a9a70428884a7cd3f0a885f5eeeb67ef26b76751d03eb1d674ab78814c32e137d2eee06aff245f56a959c6
 EBUILD grisbi-1.2.1.ebuild 985 BLAKE2B f21a415e2b3163150acee52ce18c3b73eb0960cc5c624e5bca607654fb406089f7d2be162468bf29b819d73f0b304df8d84b70686121170fa6af15382f9ee25b SHA512 95b72ff46513a35ff80d1da97850e2dc830b0e537e5fad69c13de0e731062d8ff645c88897b38a589888575601b891060a6c34655ad15f77b857cbd5efc8f741
+EBUILD grisbi-1.2.2.ebuild 985 BLAKE2B f21a415e2b3163150acee52ce18c3b73eb0960cc5c624e5bca607654fb406089f7d2be162468bf29b819d73f0b304df8d84b70686121170fa6af15382f9ee25b SHA512 95b72ff46513a35ff80d1da97850e2dc830b0e537e5fad69c13de0e731062d8ff645c88897b38a589888575601b891060a6c34655ad15f77b857cbd5efc8f741
 MISC metadata.xml 711 BLAKE2B be72967e4680a341903aa29e9f2627beb6a9084696d6b0f8b5048e2902220b5ed2a1fee71e7458f7a2df8639a532b554fe437dbabc2a055ab8ce05dd942a699e SHA512 f8fca475d676c5a4fd504f045471a767e67cc397d4ecb5a6d6e2b89d0532d3e59e12a693f56adb12101283b7614e8e62eed269c9785ffeee5b7ab9c26e568230
--- a/app-office/grisbi/grisbi-1.2.2.ebuild
+++ b/app-office/grisbi/grisbi-1.2.2.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Grisbi is a personal accounting application for Linux"
+HOMEPAGE="http://www.grisbi.org https://github.com/grisbi/grisbi"
+SRC_URI="mirror://sourceforge/${PN}/grisbi%20stable/1.2.x/${P}.tar.bz2"
+IUSE="goffice libressl nls ofx ssl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.5:2
+	>=dev-libs/glib-2.44.0:2
+	>=x11-libs/gtk+-3.20:3
+	x11-misc/xdg-utils
+	>=gnome-extra/libgsf-1.14
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( >=dev-libs/openssl-1.0.0:0= ) )
+	ofx? ( >=dev-libs/libofx-0.9.0 )
+	goffice? ( >=x11-libs/goffice-0.10.0 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--with-libxml2 \
+		--without-cunit \
+		--disable-static \
+		$(use_with ssl openssl) \
+		$(use_with ofx) \
+		$(use_with goffice) \
+		$(use_enable nls)
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@ -4,6 +4,8 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
+DIST calibre-4.1.0.tar.xz 36231016 BLAKE2B 85987b8b8b37deb40f9ebb7d918e15e9a763cca00cf26eab841d0035309bd066f675d50d1ca94cb65e512d1964bac4241b3006aa38cac14ec0cb5e2d6416d2a8 SHA512 9a4766ccec830e553b5165f9a3b1111a6b4d0dbadee8b6a6547fef1dc3ca51adc886d9c3d751af23f4ff3a30a0fe03606c70ab57245ea38bfb486c111fd0e82e
 EBUILD calibre-3.47.1.ebuild 8350 BLAKE2B d59300c7f0fc9a85c5a2862b0ce844c76e83a30cec434351e1df98d3741cd0a21dff80a52548903d25da29421121e220d8ee02a3f629f56bb11f7b3f9f5873c8 SHA512 53f70f860b5e8b9e33ac49a598c03b6e3a075b03377461008ca77a0ae2518d0e899c1af19fca611850e3e16c6efb5cfce1241afa2cdce0cba82c704fcec05d9f
 EBUILD calibre-3.48.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+EBUILD calibre-4.1.0.ebuild 8407 BLAKE2B 1c2676acccdd917817f09adba8993131e087f15cdfe838f297ff593408b9ce0e95f0d10dd648dd818601ffa30b11bdc2f3dee374f141e6a46d3079ba70dad22e SHA512 57cabbae1b738b57e09ad559afa0dd1583d96a614a58634fec4d8219e247062cf96abfc06309218586132e336003fe9bb0f0e356d43cfa668859b8a48f94ac77
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
--- a/app-text/calibre/calibre-4.1.0.ebuild
+++ b/app-text/calibre/calibre-4.1.0.ebuild
@ -0,0 +1,270 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.12[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
--- a/app-text/freepwing/Manifest
+++ b/app-text/freepwing/Manifest
@ -1,3 +0,0 @@
-DIST freepwing-1.4.3.tar.gz 129499 BLAKE2B d21e6a6e84fff368a6b483dfe68d46f0955ba234e924a7b7c1b50d4124404c3a274d9a6dbe439cc476e9eb146d1c9039ede7b47488b7a7e514a0ca0915f288a9 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734
-EBUILD freepwing-1.4.3.ebuild 574 BLAKE2B ee43c2269cdae54c4129b8df7e9d0d162a699273b79374c3b6988476891d6a4fc7469f4cfe246a70eae6ced27e8051b48927585b6ef3aa9abceb71abb4512370 SHA512 1fff03f46f665315ab53cc7b9657673c9481b54eed63adefc5f3a86e085561411b563c29ab10489ff99a51808ac492c7b326b6a992d1f8bac7098794f936e05c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-text/freepwing/freepwing-1.4.3.ebuild
+++ b/app-text/freepwing/freepwing-1.4.3.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-DESCRIPTION="FreePWING is a free JIS X 4081 (subset of EPWING V1) formatter"
-HOMEPAGE="http://www.sra.co.jp/people/m-kasahr/freepwing/"
-SRC_URI="ftp://ftp.sra.co.jp/pub/misc/freepwing/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="dev-lang/perl"
-
-src_install() {
-	emake install DESTDIR="${D}" \
-		perllibdir=`perl -V:vendorlib | cut -d\' -f2` \
-		pkgdocdir=/usr/share/doc/${PF} || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
--- a/app-text/freepwing/metadata.xml
+++ b/app-text/freepwing/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@ -1,8 +1,10 @@
 DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c96660c2a34137a425f879688822ddc8bbc19805444bf2b49369c3dccf8a5303748ff9e7cbde3910d6ba501652 SHA512 9e04e6a2009cc134f74410d8c8349831467192e7524287e23cad0b68232f2b5dd04f5d98505222d71eb3441e466bccec1cafc7f6e3c6bfcb4c5e57e4ab0fadda
 DIST pelican-4.0.0.tar.gz 1314626 BLAKE2B 18924209949b43063416f2e2c6e22a5524a36bab79a801f7cc6953c0822beb1bd5b05e715f5bcdb7c4877aba8d7a62cf4276e8abc43406f3c6fd7af8ef0c7c2f SHA512 5d98f5e13e6dde6b27cc299f9fb166edec79efb3fc53b29567218e0d0ba164989ce51830029ec8359697bc039661f6b0ced8d4155105e29098c038840c97d253
 DIST pelican-4.0.1.tar.gz 1314716 BLAKE2B 1fbe01f5df7f1c730d7a45429369311f77c7e8e278a05cc037e03d8193dc2ae9075ee1346fea072a08ee5d73baf9aaed8c1f8f210fd4331754accca9ebffa4da SHA512 26f91046124bb92de6fa31d17ab89f743cf9408c15b9b259875e2378342133313368418da083d1d4abc5de0537806a9dede327719c8fcf89d135805c47618a4a
+DIST pelican-4.1.2.tar.gz 1329126 BLAKE2B ec6067b9df2bf37877ca23602228b2eff035221ef16ed1f185e2806fd661c8b733603506f3f1d9516422bd8009a0712f726d40559a39b0d100224ee56c3e706c SHA512 9a20e3a16e2caa15b6a47281d4acd6ada344292f011d4fd30c6ac786aebbccffd9cd0b2fd80471d3a383d4cb0ba779c51653705572760e62f6c2d3d49a862a67
 EBUILD pelican-3.7.1.ebuild 1468 BLAKE2B 0fe9e784ad7514b9d92e35c2e6f07bd5d8b5a9fc68e83c7e1367968c809b0f90566f7109789b142cb56c7090e6d4060ea0b754bed7614894848ce18829ef6678 SHA512 f6e81e8e93d6de41516b6e0b018974e8bd8174f10b0bca7047859644a1fbac3b0a199da331cce29a0e205362a0f935000178f4212bc27692a34f592fc8a9cc8d
 EBUILD pelican-4.0.0.ebuild 1486 BLAKE2B f4359af3f68b0e9e05d7238d3b3cf4efe58bd494b059f13d8e0af92d65f55bbb924b9cb672fcc4651e7dca101051bca43073353895cd6a2501f3d91e3c80a20a SHA512 b87631cf9a40de695173e114cf3fc347a8d7ea876174476b997c7ae9e49d2c7d5906ad90e25c72af401d236e62ee3d653bf88029ca3ab333e743bd3ef82f7a0a
 EBUILD pelican-4.0.1.ebuild 1486 BLAKE2B b1f81ae6d9924380f7181c0af735e3436fc727a14f1a7604e61bf70e7698b73865801cc95bcab17500f91a52150b1416e1a019bc2742423a9144176fc0ae5f32 SHA512 676cb7c561ddd1770da789dffa866aea2725b3eb3c9c0436758aad7c909c8d1fe26b8c7d6a739e8cbcdf3400444d0c217c46ccf2973243ad48b54cebf14c0843
+EBUILD pelican-4.1.2.ebuild 1486 BLAKE2B b1f81ae6d9924380f7181c0af735e3436fc727a14f1a7604e61bf70e7698b73865801cc95bcab17500f91a52150b1416e1a019bc2742423a9144176fc0ae5f32 SHA512 676cb7c561ddd1770da789dffa866aea2725b3eb3c9c0436758aad7c909c8d1fe26b8c7d6a739e8cbcdf3400444d0c217c46ccf2973243ad48b54cebf14c0843
 EBUILD pelican-9999.ebuild 1545 BLAKE2B 7571deb70118ea2764b71544a3adcbf863be67713a68f5a71dd336397c69fcc9bb0c285dc7ea7a533f72547be398fc5dc43c7440348b1a386e55a583c4d55d6f SHA512 f7f9c00e6905be764bd93a2612460a9db99d5e57c2bbb8d3df5f4164085ce1455a41ff42541e24ad6cd5c1afcc3bb5d38761e3362ac7f4f9d4fdd3287ec3670e
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
--- a/app-text/pelican/pelican-4.1.2.ebuild
+++ b/app-text/pelican/pelican-4.1.2.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples markdown test"
+
+DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+RESTRICT="test"
+
+DOCS=( README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/samples"
+		doins -r samples
+	fi
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@ -5,13 +5,15 @@ AUX gtest-1.8.0-multilib-strict.patch 1126 BLAKE2B 9b7835108dec3c05025762e7161bb
 AUX gtest-1.9.0_pre20190607-increase-clone-stack-size.patch 565 BLAKE2B 6960b5318aa450f9309811f7cd412a652203404dbfb0cec7a2e308f3dc5ae1cf6a1225caff4a60d9e70468339e19e95abf50b5aa29cabde5960eb4f1f2571714 SHA512 7a9f65e93feca436791541378d1c5b740b3c111724c4075ff1f23ac616ece50aa7beb35f143df39c93184754331666b294fbab39cad189a8da1c3290846933b3
 AUX gtest-9999-fix-gcc6-undefined-behavior.patch 463 BLAKE2B d61c3a735ab5ecc8a44b5b7c294a25be86bdfb8bd589df954862b4ddee60f14f04b0b64e4be80b6ed9e191429d640f8fecf4dac3667e9c9d875feb494bd64bce SHA512 8ee1fe3ab2b9352f4a34ea9e2813344eb507a2c7d519d67d647dc511c280f2a4609eccebc2a122d8431989b4a8e43c6cb9c5650877a257681f2d37672f446227
 AUX gtest-9999-fix-py-tests.patch 820 BLAKE2B a6a860b6935bd5f0bbe720f5af741448dd29878ca16d4187b84a40df4ec3ca216951ab0dfb1a89bebe2da1ad89f975e22ef6cdaced488de72b06953e185fd0d1 SHA512 4a059704303fffe508bd099544caaab5e4c819c978d6c104dce302e82348dd41fd63390459828a5f6161624dfd47aed5dc9cb466d36796904d598e0b10427949
+DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
+EBUILD gtest-1.10.0.ebuild 1735 BLAKE2B d3ed7097e6f74049e76c5a9f384e279ebd720d5571a62df58248c56d2e22247d6df152a02b8bcba2ce27a9a8160c14f3dee9da204bf63cff5baaff5dcd98ba29 SHA512 8e7569b8a052db6b0fd4f75b07b56c1dc4d5ab5c8b57ca9529a26ab79eeec27fbd729f73ee7c1632f6cd5dba89079ee18052e47e98ada31800bb593479b01207
 EBUILD gtest-1.8.0-r1.ebuild 1670 BLAKE2B bd45cb2ffe973a6a856e858b5087177dc4d6d52c4cd955e93754165cef7d9960ef2d6d9e034f97030ce070cecfd94313c03de66604fc11918242a2567f54c410 SHA512 b7e04a98c1500109a4ecb4e02308d5fbbf360df70013bb4ccd8e1b1f4fc1b2539413dc7d658246593ce02562d17366540304658dd1b13f0e15ee4a7fbe484d6f
 EBUILD gtest-1.8.0.ebuild 1633 BLAKE2B 7d3c582e4b941c9990ba6a3cc56ae3e7305e89ecf86b8ddbecffa901047afd2783ec98db90cec9fc3f2d53349faaa992db4f3699a07529adc8f1f9319a2def68 SHA512 7335e0f5a0783c242468ab0fc8741dff517d72eb3523518aa5276483096fedce221c8f9f0933692410525ed9a24d709545e89ab8a8d6c9d8e55d8478322fd82e
 EBUILD gtest-1.8.1-r1.ebuild 1662 BLAKE2B 824a4ac0704705b3685c6f6b3b334b191537991454c68876443057fea0c2c74ad546f11b6214627994caa3a6c8cc10b2bb1139a559175bd2deb903697eda27be SHA512 ce9bf485877cbfdff5ce449af52e2939807205ec5c7348a0f56938796ae84d1778807c33300ab6d61c1babedea3095954398d12d44233065c853babd733c8bdb
 EBUILD gtest-1.8.1.ebuild 1686 BLAKE2B 7c6053a0f3d8d5f97199dd8a36b14739bc3db47a103ef5476bf46924c984e6e60745c073bd3fdf75d5a45ddcbacb226dafbc9dad2f373d13322a643a2238253b SHA512 edeb30abe53c77ec4797d9a15188b988c1981a2ceba3779c3014685c6c4a03e760f117b92264117562b504694aacfb3a9c42a9c934ae3c6c0f503edeafa7e510
 EBUILD gtest-1.9.0_pre20190607.ebuild 1754 BLAKE2B 4741525b9b87ba5900ff3fa83620476cbafc55b51e94792ac9d599217036e9e47c7b7b5851fe2ddba2abc8991b7c1c9c4cd343a18c6d0c321fddcfe638633da4 SHA512 058df528b487b3121bdcba9e59b3298d0999ebc44a97ea7a72b5a137f8be1606dca6d26d8e2073ebdc3e17477c056dd55abb815561806527ed706530bba2d2ce
-EBUILD gtest-9999.ebuild 1705 BLAKE2B aa0d763dab6bd0fcfda58b5ba1c267cc2a7d15d0fc33393f80c4edc48e1a3e412cb2004b155f54c2a865817d0eb073ea27b12ee71ec92ed11f5b0e84d319c203 SHA512 1c38c52e955bcac5c967514fda5612b52688b0237ba50d75b462000ab42bebf1f129a870886c26b5722457e2e617410824a4bdedeaeafa665002fd6838aaeedc
+EBUILD gtest-9999.ebuild 1721 BLAKE2B 0410d247a008ad972a63309a3994b978f2ab72240f400fcd023f7e4ac8a895e492137a7c18eae795a55787ca32a307568c50152dfb7063ca04d803b8d8f6f8bc SHA512 e02e367211774c5565b153cca7cdf2cf0b8c9e51f9dca93054b1df322249bc73e43f5e955a932739249502a061194a53618a68e1b2d4325251a02941f02622ef
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
--- a/dev-cpp/gtest/gtest-1.10.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Python is required for tests and some build tasks.
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit cmake-multilib python-any-r1
+
+MY_PV=1.10.x
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/googletest"
+else
+	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
+		URI_PV=v${MY_PV:-${PV}}
+	else
+		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
+	fi
+	SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	S="${WORKDIR}"/googletest-${MY_PV}
+fi
+
+DESCRIPTION="Google C++ Testing Framework"
+HOMEPAGE="https://github.com/google/googletest"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+RDEPEND="!dev-cpp/gmock"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
+		googletest/cmake/internal_utils.cmake || die "sed failed!"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GMOCK=ON
+		-DINSTALL_GTEST=ON
+
+		# tests
+		-Dgmock_build_tests=$(usex test)
+		-Dgtest_build_tests=$(usex test)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use doc; then
+		docinto googletest
+		dodoc -r googletest/docs/.
+		docinto googlemock
+		dodoc -r googlemock/docs/.
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc googletest/samples/*.{cc,h}
+	fi
+}
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@ -13,11 +13,11 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/google/googletest"
 else
 	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
-		MY_PV=release-${PV}
+		URI_PV=v${MY_PV:-${PV}}
 	else
-		MY_PV=${GOOGLETEST_COMMIT}
+		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
 	fi
-	SRC_URI="https://github.com/google/googletest/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@ -1,6 +1,8 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
 DIST phpMyAdmin-4.8.5-all-languages.tar.xz 6026176 BLAKE2B 6fea778544d266ea9950a5764a6c31806bfcc437edbfd190780218d841e55a21cd534fceef9309d2e1d6acbd8a780cb1d120aeb47e2e35705118ceb9d5ae1266 SHA512 590efd46f4ae5a9cafd3b33f3565d74e4bfd535e3de8763e72da7bccea06fabb2f9fb90af3fe144846573507c5eefc20ee412bf6b51adfb494402302dc81aa2f
 DIST phpMyAdmin-4.9.0.1-all-languages.tar.xz 6066680 BLAKE2B fc949684e97bef1be832968a9c0a3a893e0a81d7984953e694f41ff15deb82bffe3116ff7ec3c832bf2cfd4e24cefec4ce703baa9404bc0740b7231480165a4f SHA512 92fc032ba44e84f6c6a62bb658c2c7ea984bfd8c963b18bf19c26c3991cfe635771376ad8aebf90140bb1bd723b62a5adaca35d88f7bb68169fd0d07c3995356
+DIST phpMyAdmin-4.9.1-all-languages.tar.xz 6146368 BLAKE2B d0a4fdb9bd995f807a0f88c3572f67ddd1df090817b4d32606025b6e7d08c6e05fbcbbc9b3b7edbe5492345c45c454797c9ba0f59498fe5e01d0979148c070ad SHA512 c2804bdb9d8501309e46d66fe4c27c3618de9cbd440928bf6335b3623a7e71608bb02fda17c5f1715b0cb32ecd68e2bbca86565f240b138c3630084225c56f83
 EBUILD phpmyadmin-4.8.5.ebuild 1558 BLAKE2B 5058ee85e899e6ab6ab8e7b98f7c8f2f22ab2467ccf110aa460b36624c767c3077a450ecfd854e6af6701d78770ddc5a754e7bb4d5660d0055d70091f8f8cf57 SHA512 b4d91d971cce9d4faa672eb76bcf0b465d2d1f86fec478215fffae22c55a30743567d621018de697d4c1e07650c9f575ac96b06f56382806be292e4a37ec105c
 EBUILD phpmyadmin-4.9.0.1.ebuild 1564 BLAKE2B 1b62fb393cd9c248fae68ee72ec9e9172f3ffbd386c11e5ebe87cb00155bf2b38b92746f6a6a6568525e01dec80f4116a7b0c784a00f2cafa1955555ab8cd62b SHA512 0545942949e94db25359418a96ca50c640357e149b030fba0a12d9577bf6612cabb1b03371f41f9e7bfe614cd0b07e79767a259dd11070bbdd9a3e1cfc994266
+EBUILD phpmyadmin-4.9.1.ebuild 1564 BLAKE2B d9722ff40ee20251e612886c61b6fa37bb7c61f203953cac186a814dae09210474120a1d97e6f1c042ae0cb5fd265cfae1df9a0bfe3241083b8aaec7306d2212 SHA512 a8777efaa5cf8561cc852bb29d90d433e1a9a338cc014d5b1d0ccf6e391305e48eff2638ba969b026e7cb4a49da3db27a530fe0507cf522bd37dc6ef57d65fdd
 MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
--- a/dev-db/phpmyadmin/phpmyadmin-4.9.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.9.1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils webapp
+
+MY_PV=${PV/_/-}
+MY_PN="phpMyAdmin"
+MY_P="${MY_PN}-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="https://www.phpmyadmin.net/"
+SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+	virtual/httpd-php:*
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
--- a/dev-db/vbisam/Manifest
+++ b/dev-db/vbisam/Manifest
@ -1,3 +0,0 @@
-DIST vbisam-2.0.tar.bz2 342184 BLAKE2B 64bf3dd3e44dd0ef19345d39605d09129e9d084f4d291ed8b6c94a04cbcd2fc69a94b2a5c58df88f61a5c5b1d843208cfdd4b354e22fcc056fb2be5a185e5ca4 SHA512 f329b9e35a8d912776342414cd02bb144c359ae316b5851b6fc49e0e13cbf4870ce2a445207fcdd8c1141ea7e0d5dff74f92f19e9b42597c16625a399c75c00c
-EBUILD vbisam-2.0.ebuild 478 BLAKE2B 35a6a924bbcd39a8717931b4fab1377948160d3bf4bc0f1edbfe993a0ef414c40a62839689e9ac91f48db3f74f52e3f4db7992fbb6ccba6b9b9b45b09c8bce7c SHA512 2374c88be40e1d7552b110215ba63a991cdbaa7eb2a2c1aad144e333e73e82ebb802f30e7743a5ff8937a777dedc5880b5c90ed355e8d39f42e4e97083cfb6ce
-MISC metadata.xml 247 BLAKE2B a5c4e16111aae168c06471594df9b2901bb70e48f1475657825b40cbb2445b72230c6f4b004e9bd0e5b061bc6e546ea9270451498098dd2bf1ee4291781809b4 SHA512 2649cac2764f9196000ccca028398ee0db1f992d8e2b35a3368a84a5e01f9b9fc95d5a2c8f05d57784e873a3b53b457a7520673353e8999d0d8892315c6385c1
--- a/dev-db/vbisam/metadata.xml
+++ b/dev-db/vbisam/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">tiny-cobol</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/dev-db/vbisam/vbisam-2.0.ebuild
+++ b/dev-db/vbisam/vbisam-2.0.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-KEYWORDS="ppc x86"
-
-DESCRIPTION="replacement for IBM's C-ISAM"
-HOMEPAGE="https://sourceforge.net/projects/vbisam"
-SRC_URI="mirror://sourceforge/tiny-cobol/isam/${P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install()
-{
-	emake install DESTDIR="${D}" || die "emake install failed."
-	dodoc ChangeLog README NEWS AUTHORS
-}
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
--- a/dev-go/ed25519/Manifest
+++ b/dev-go/ed25519/Manifest
@ -1,5 +1,3 @@
-DIST ed25519-0_pre20160420.tar.gz 107323 BLAKE2B bfa47f1dd34e04e59e29e5ca04cf66beb69b560e17a4f92385cbd75b5d50da0f8958b8bb05f499eead088d556aa115fe881fba4b1bac01d65338797cb1863dcc SHA512 ea93a0919521a6aa83d5c880651bbc9706f34ed3a33c5368f7709a552b89b2e0b098c64721bbd89e84cbaeebbcd050364167a9d5cef72a5395903877ee03ae33
 DIST ed25519-0_pre20170117.tar.gz 107312 BLAKE2B 80f073417f9bc09249e58d724c0396bd79824f1921aed427bcaefca2f8108a490c2a566ae45053ef226f708ab7a8f6185de40323fe746b51e8795f8e3c8ee256 SHA512 b801d205d6ed9aaf07a567b4919ca072e34e1872388cccd1f5ece30c6cbd5d4907eff167e24fe5b4f8fe46c5746dbb0d1ef2a4ce4f1082682a022fbc652c0e78
-EBUILD ed25519-0_pre20160420.ebuild 538 BLAKE2B dc6aefbd62253d6ac7584ff135a9bab0ceeee3f98e71ec6a8ce21a1476cb4b8b07847f27984a600977035fbb1c0af82e8e91b4f3f635e90e6197ee00ec008b98 SHA512 63c36bd7c224c1217576b470d56c60df4837c4bff7e63e90493d380c517c6a5016e33ff42c0910c1fcc93b372c252ad7dba7ee1c10524604feb25cc9bafad726
-EBUILD ed25519-0_pre20170117.ebuild 535 BLAKE2B a6bbb3664e7a71ae86a0507a9bff361623cbd1aa86e3cfcc9994995592a737dc51a72e6563e7a6140fb5fbf5f042770e2e3894949aaa4fdc772744d2f3a4f44f SHA512 345f82f42dce9b4055adac605f21f72291035930d438892d8f6f402a07ce5fd934b7479e7d03ae7927d7eb545fcb0214b3559eca6bd529da665459335a1d8e89
+EBUILD ed25519-0_pre20170117.ebuild 563 BLAKE2B de6b4769f1be8b926466eec5f97363d5ab9e2262c93e7550076581a522815d7ee0b4b5cfede76414ae5b45b611a5eae1161f923bb03781b79bf463c5af9a9731 SHA512 fb122c843afe032329842033f50f4a63065b3cab8012c7d5c73cd05ab30235a37c363c1e6a4f911139025465ab5caf1ad4081056626fcfcca3be9b0d2f285405
 MISC metadata.xml 434 BLAKE2B 6a54e188d6d0a22bd92bb6448cc9bdf0affe6bdcaf1f194f1f8dcfc38bf565418b5e4b84ff15396bdcd68b4fdc1864e8f2d0eb78499a32a48425694fdae459a6 SHA512 4ab999478fc1a8f4c0d74a1f7ce97713133c5e52dedd5df8a45454e64865e0eb969b175eff67dbfbcefa13a08fa176072063936cc968ba683f1a52b620c9f1fb
--- a/dev-go/ed25519/ed25519-0_pre20160420.ebuild
+++ b/dev-go/ed25519/ed25519-0_pre20160420.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build golang-vcs-snapshot
-
-EGO_SRC=github.com/agl/ed25519
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="278e1ec8e8a6e017cd07577924d6766039146ced"
-
-DESCRIPTION="ed25519 for Go"
-HOMEPAGE="https://github.com/agl/ed25519/"
-SRC_URI="https://github.com/agl/ed25519/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( dev-go/go-crypto )"
-RDEPEND=""
--- a/dev-go/ed25519/ed25519-0_pre20170117.ebuild
+++ b/dev-go/ed25519/ed25519-0_pre20170117.ebuild
@ -15,6 +15,8 @@ SRC_URI="https://github.com/agl/ed25519/archive/${EGIT_COMMIT}.tar.gz -> ${P}.ta

 KEYWORDS="~amd64 ~arm ~x86"

+RESTRICT="!test? ( test )"
+
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
--- a/dev-go/get-ego-vendor/Manifest
+++ b/dev-go/get-ego-vendor/Manifest
@ -0,0 +1,3 @@
+DIST get-ego-vendor-0.1.0.tar.gz 3889 BLAKE2B 5399984876b253a5807b581e813196250e977a12c95692208cbd4cb6046322650c1a400c219fff50a4535c6f6fafba0d4bab713443315f71f1b65b0b616a4a31 SHA512 83e0ffdddc26ac3778becb8c3272e5d455b6b0ac401ca5b0c0b55a4053b8bc103c3c0a013cb3a1a75747f9bd80da85f38e7b91eb51dcdb96406d06ad657ad80e
+EBUILD get-ego-vendor-0.1.0.ebuild 459 BLAKE2B a7cbcb4d24c835e8c1e6478a594a9233fb0aa5fa7a174481f1f9bc94d053d40afe0ba521d60473a0b993ba933026fd81f4ebea5d60e43d7e30c5a0abcce58f9c SHA512 65bd8ffd564bf04eb8b4974e95b30f8acf5cc20b956a7e86fac609ed7e0c750f69e10498f40a179cb245c97ffd9550f31b7b52aacb462c4e7c7a18d4a0413790
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
--- a/dev-go/get-ego-vendor/get-ego-vendor-0.1.0.ebuild
+++ b/dev-go/get-ego-vendor/get-ego-vendor-0.1.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Utility to generate EGO_VENDOR data for ebuilds"
+HOMEPAGE="http://github.com/williamh/get-ego-vendor"
+SRC_URI="https://github.com/williamh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile () {
+	go build ||  die
+}
+
+src_install () {
+dobin get-ego-vendor
+dodoc README.md
+}
--- a/dev-libs/vanessa-logger/metadata.xml
+++ b/dev-libs/vanessa-logger/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 </pkgmetadata>
--- a/dev-go/goptlib/Manifest
+++ b/dev-go/goptlib/Manifest
@ -1,7 +1,3 @@
-DIST goptlib-0.6.tar.gz 25544 BLAKE2B a313981c968847337bfa9e784d964fb145aaf82348980563b374e590267ef211fc54013a6a4d9494165d9bcfbf6cc9ce1b329637fafb8baaed0a6183c2a87662 SHA512 233aa4434559d64e5d5ec5a8e243ab44157e5e467a3d473adf65f9002440d2584c8cb6cd4b69a2224b33e21703835755e2a91eb3e959acbfad5052f64ad7bfbf
-DIST goptlib-1.0.0.tar.xz 23256 BLAKE2B 252e73484359d11c1dceb0f202d9d8dbe59c80c662681c778291984ce6846fa38a5f7776e86c63d2947217393da873a170ed3ae17bb8e28bf51fff5cf2baa3ee SHA512 6f3efe057aa994437782353297b094e06f407d683211fce49c8bd9a656da0f9f3c04a61db4e831aa766d564e91ee53528012136e5a090ebcaadef03885affe5c
 DIST goptlib-1.1.0.tar.xz 26204 BLAKE2B d8f16646ca167d2b7d83aabb0f9ea1bc3d211afe96fc6e088856734c3b7efc7eec5ba3f0885e5cc3a73cafe3e760fadc21a0e9f3f64d9ff7f39077c13c63aa7f SHA512 28dc9a2c00e7630ca1712172ab155147e281c3527bc95d826cdfe818f89ef5a7ab47b392a90a2a59378b47d842a375773a53b26c9fa389d62e7919fbcb025b43
-EBUILD goptlib-0.6.ebuild 648 BLAKE2B 420a5f9d2cf77b799c37fb9c2fc24a356cb88ed1e0f65098e56cd5e47188d16b1840b79b9156e6f944a8ce57835f74c46d22baad603e343cd9defafe666b74be SHA512 593e397a5f30da50d3d265343a749d4f21e2bdb8f718e04ce296cf88619d8746cff9e85a56ff0dd96b3c07bf930192d3670d26a549b8aa573e09473cc0e2727d
-EBUILD goptlib-1.0.0.ebuild 580 BLAKE2B 419890bb0b9ca5053fe0561335a10c8ea72aaefc2ce3330c7db5833edf08923edd3faa42237aace53133df11bec29d266bdb610517b6aa5f6eb97b5636251ea9 SHA512 5f33922a6bc0df6282deaa6737a272eabaadf9a20765ba1d242f7ee2540e1758f5e874fe8ff15f139158788fe9301f5a65b52cc438720e7442df378a85992796
 EBUILD goptlib-1.1.0.ebuild 580 BLAKE2B 419890bb0b9ca5053fe0561335a10c8ea72aaefc2ce3330c7db5833edf08923edd3faa42237aace53133df11bec29d266bdb610517b6aa5f6eb97b5636251ea9 SHA512 5f33922a6bc0df6282deaa6737a272eabaadf9a20765ba1d242f7ee2540e1758f5e874fe8ff15f139158788fe9301f5a65b52cc438720e7442df378a85992796
 MISC metadata.xml 358 BLAKE2B 330c914b403f0d5a41e538c333484f974330039b62d2ac7df08b1871a0ceb63edb391f38dd67b9286f054c6e26ada560405c92ea48433dccafb4d71b84fbb9a2 SHA512 e4ff5460265f6df156ded881294e4755b34fe2bcb0ba57836a137dfe80606a58b7c79943e46e4b4eef4197422512b06590ec041dbb451ba9b8de705417cd0253
--- a/dev-go/goptlib/goptlib-0.6.ebuild
+++ b/dev-go/goptlib/goptlib-0.6.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build golang-vcs-snapshot
-
-EGO_SRC=git.torproject.org/pluggable-transports/goptlib.git
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="${PV}"
-
-DESCRIPTION="Go Tor pluggable transports library"
-HOMEPAGE="https://gitweb.torproject.org/pluggable-transports/goptlib.git"
-# No official tarballs; see https://trac.torproject.org/projects/tor/ticket/18504
-SRC_URI="mirror://debian/pool/main/g/golang-${PN}/golang-${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
--- a/dev-go/goptlib/goptlib-1.0.0.ebuild
+++ b/dev-go/goptlib/goptlib-1.0.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build golang-vcs-snapshot
-
-EGO_SRC=git.torproject.org/pluggable-transports/goptlib.git
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="${PV}"
-
-DESCRIPTION="Go Tor pluggable transports library"
-HOMEPAGE="https://gitweb.torproject.org/pluggable-transports/goptlib.git"
-# Upstream does not publish release tarballs
-SRC_URI="https://dev.gentoo.org/~marecki/dists/${PN}/${P}.tar.xz"
-
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
--- a/dev-go/siphash/Manifest
+++ b/dev-go/siphash/Manifest
@ -1,7 +1,5 @@
 DIST siphash-1.0.0.tar.gz 4462 BLAKE2B 2939eee829189db0939e2a0ff15701e7bc20b34213a5ea7b0e268a19d8eeb4618b26c11c537fd2902ce7bf3d573845a899f002155274a5172b67472879768cc5 SHA512 e52dc9857974ab362f2d7b2f7389644fbc07e7bb5507a93f138b3f692c1065303846611bb51b3d9c637d851a4d20cc20af146719a553801a8f7e17ec900a736a
-DIST siphash-1.1.0.tar.gz 10543 BLAKE2B 50f1125024d37c0692616271c60d48c10584fbf1ea52cd6a7d48fba127d0d34561898ef0c507d62570112419265daf98c893eafd93f0c4f19de04a4facabe469 SHA512 f8892d5638417c610a1e06a4f3417438a4cc87f9ed8b432540a1b2fca8fe2a2feed395538f8cfc2b9663b5870a0f91c645aaa68119db603fc05e769d5f3e102b
 DIST siphash-1.2.1.tar.gz 10729 BLAKE2B 445e7839565224045ecb920787b7b75441fce6b028c22af6cbc498820e53c174f81851aff4e390f6d318557b720b4f32332b82f9ce4b4ba3a8725d74866a635f SHA512 bb59a152322350ce4d88f3a8795fcb319621f0c5b2e535f251e7c159ea574b22678f0e29c6dc0fde08ff1be628cd7c76534e902e3f1d332009031cae01491e11
 EBUILD siphash-1.0.0.ebuild 493 BLAKE2B de02b406f85f9ecabad4b53c49df28cc246ea3ff407ab4c83ac9079440277ff6ea313db2bd98deb73a6ee32674cedbe6b3ad04dd122c3123a309901b48794a1e SHA512 0271de702cf368f63a0e99362822528ee7a1dae3ad2cf791dbc52e69079321d0a4dc2558aea5e4108ee3ec112c7f5d52fb8fc38cb15c50889a0a6529c2e970f1
-EBUILD siphash-1.1.0.ebuild 496 BLAKE2B 0bd5f36e0b21af7921d70ff74a6e182599e29543db3929dfee2f8c3244c62fc57aaa4846b57c80892b616d707cc874c9430c1b5dd3fd46aafc3ce1399331b833 SHA512 116266ce836ae52dffc1931cd4ff55af65a8da19a2891155e3def3e3de31abc038350c201356fc27dc8b34c02dce7705c30495316afa88f0e751691047643347
 EBUILD siphash-1.2.1.ebuild 493 BLAKE2B 4390b3761ac8016f2bd55b181a12ff11e8f77750c175d3141d836a8868ffbbef5989bd9af2a1de23630d2e19588dac80ad86217b85321a60a7b0977c8f41f0ec SHA512 2d65599894d129290aec1c82163ebd090c26c31f516f38f8fcb00a57630865ff02eaeff3f3e8d1d69985b87734869259ce5b2fd62bdaca5b6112eff2a6e3b327
 MISC metadata.xml 437 BLAKE2B 9591ad8a9a8e98166576492945dd18bb0888975ecab6d9841a6095f9463886192c05d90d72ef3dd19d0c816c85daafef0c9878b248244197ac7cd06dfa091718 SHA512 078b666523821ec3231d88835c2416e52c7da6fc5f07ba80d04b8cff7fc3208fb97851146d7f529c85f8d7f9562e2b6cced73dc7571983bd3dee0a4b45ad883a
--- a/dev-go/siphash/siphash-1.1.0.ebuild
+++ b/dev-go/siphash/siphash-1.1.0.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build golang-vcs-snapshot
-
-EGO_SRC=github.com/dchest/siphash
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/dchest/siphash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Go implementation of SipHash-2.4"
-HOMEPAGE="https://github.com/dchest/siphash"
-
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/cfortran/Manifest
+++ b/dev-lang/cfortran/Manifest
@ -1,5 +1,5 @@
 DIST cfortran_4.4-14.diff.gz 23084 BLAKE2B 8e760b3697869c12e94925c4781318fbe7640f0563a2464bf5d9f51a4afcb4bf9c281bab189542f2342d6dbc6f5524b4a48d9f844459d190e9182a96ebefbf9b SHA512 1e0b267efc17c2ba30ca1108d59ef87d1a401e6b88bea2c7045458f8cfad6ec9a05f6bf4a08c1d6cb314c790a4969a1f0fdf0c7b6abc28bae544928aad5b0218
 DIST cfortran_4.4.orig.tar.gz 120119 BLAKE2B df4e0650e2718ed0c2009fb1b85330266308b0b584fcdc85e08cad0913bf063ab38824724b43a005a63a6e6bd5152b35115a68659487a992b96d0d38792e6d0a SHA512 969d0db566ecd7ed7945cac7f8ceea1cbd94ab427734ba83882acf97022c83b1417e32515d847fee89144137f58f7041cf5164fc397f3d7526f3aa958f8b038c
 EBUILD cfortran-4.4-r2.ebuild 1077 BLAKE2B b74276d8a3e2db15922e3d2970ed0f984e63a8842f44a95917f07a60823d2cda914a5bbe5f7d996c628969d344e7a66690904ef3a94f0bd36c3f731bd99e366a SHA512 5394de879072217a8f481aa5f481d14f283517551663d58578612bc63e6279a3b4a76561a30fe4d22206ee5113723c27f97b5acc3dba8d6a933fccadfaaee48c
-EBUILD cfortran-4.4-r3.ebuild 1141 BLAKE2B ae95a733fc1eb13f77252cc2f71b025c65e18e3340b69efd79e38968831c143405a09c56a249d3a93d08fbe3d709de0547d4ddcf734fb50450ae5d3ee779dd46 SHA512 2bb00cc2ba99823d1e893d56c7b2226aa3d6d08cd4b606faca0b6fabd2554236881380e1667f7c9828ba60a19e4c62a650626b364c24206805f86962ae0da302
+EBUILD cfortran-4.4-r3.ebuild 1139 BLAKE2B 496cec657130eab1ecf62f0cf46ad03574d99038a772708a21e3802fb8e2b80917b422e28cc486842c2d111bf381710e45ed484489f87bb7fe7320cc038f9ac6 SHA512 d34b06baba5d707d5f107b621e95a15510b62df248bf9e1fad5dd09dc3b28c27ed0ffde7240e319c2682549a05d05cfb89baebe9048449917b5a8e0183499190
 MISC metadata.xml 588 BLAKE2B 9e2c3b0818a3bbc250153d807eb81d08f24d5568fc34eb83aef2a9344c59ca998fe488d27e8d23bc1381e21580015df60519698369394c17361111e470a9313b SHA512 4cc9d7ec3c44afc7e8ca2b43c04ea67c88fa1be09f9c594d83d1d011823566efd4e6b889fc4e95b019885be4223de32d94e0126acf70fe5e7cabf753a9923d40
--- a/dev-lang/cfortran/cfortran-4.4-r3.ebuild
+++ b/dev-lang/cfortran/cfortran-4.4-r3.ebuild
@ -15,7 +15,7 @@ SRC_URI="

 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="examples"

 src_unpack() {
--- a/dev-lang/gwydion-dylan-bin/Manifest
+++ b/dev-lang/gwydion-dylan-bin/Manifest
@ -1,4 +0,0 @@
-AUX 20gwydion-dylan-bin 195 BLAKE2B 83192dc8c2af47d3079d313155a6e4a88b4d91b5cb41ace7e4f78b700bfbb1f954a34d893d594b29fbb6135bedc036dc4c34068048eae825f131152588d968ad SHA512 28c3921fab8d8aec4de4ba902609c4500fb8f60a7b9ac6791ad7f139a2ad4fe991680cdeaa485fc7b7a5791cfa516559ef3d53d21fe9085c72cdf4421557e9af
-DIST gwydion-dylan-bin-2.4.0-x86.tbz2 5846864 BLAKE2B 51ed9364636fa1700fe2fa26e5075b02cb376ced9fc568fcb3f2e2635de301b6cd7207d09715dafdabfd1cca72c9e47eac3c292b9c235825b78bc2335fdcd6f2 SHA512 878c68f922fd02a2f5d6a64d94706d878502c143a02e34dc325e68f3881fcbea2a71a81f000ee0d40d494f6e7cf3f4aeef5208ea2efb62b24e6b7afdf7d87070
-EBUILD gwydion-dylan-bin-2.4.0-r1.ebuild 550 BLAKE2B 9f7fc407c59a3f1d1d88b4d0f26034029f552f5e65ebaecfa864cc957d49f9bba803c32568c7afec8b7f9e8bad85e22d12685d3fed0ac991d0fe619edf593bc1 SHA512 cec1119bcc18664ec0e8719d2cd953ced4ed17096d5189f90d17bacad46dd75f85cdbb8aa7fe72443756c2fc1d45bdbf59b4462d215b29e8109479947e27ca6d
-MISC metadata.xml 746 BLAKE2B 49684c907257e83a8d256ff661675351716f55888e529abc056dd3feaff0f6e557666991af10a87e1da2a2d2cb0e760269c20799d1ea08fed0d57ec6596dc2af SHA512 8c778a1e2b36af09213a4af64de7a301ac043f4e6e3c51825619ff52acf46f0f585f01db4280383e1366d35031bb9c90b0db12b7338fa1ef6843f3b2bca05fa1
--- a/dev-lang/gwydion-dylan-bin/files/20gwydion-dylan-bin
+++ b/dev-lang/gwydion-dylan-bin/files/20gwydion-dylan-bin
@ -1,4 +0,0 @@
-PATH="/opt/gwydion-dylan/:/opt/gwydion-dylan/bin"
-ROOTPATH="/opt/gwydion-dylan/:/opt/gwydion-dylan/bin"
-LDPATH="/opt/gwydion-dylan/lib/dylan/2.4.0/x86-linux-gcc33/"
-DYLANDIR="/opt/gwydion-dylan"
--- a/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0-r1.ebuild
+++ b/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0-r1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="The Dylan Programming Language Compiler"
-HOMEPAGE="http://www.gwydiondylan.org/"
-SRC_URI="x86? ( mirror://gentoo/${P}-x86.tbz2 )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RESTRICT="strip"
-LOC="/opt/gwydion-dylan"
-
-DEPEND=""
-RDEPEND=">=dev-libs/boehm-gc-6.4"
-
-S="${WORKDIR}"
-
-src_compile() {
-	mkdir -p "./${LOC}"
-	mv usr/* "./${LOC}"
-}
-
-src_install() {
-	cp -pr * "${D}"
-	doenvd "${FILESDIR}/20gwydion-dylan-bin"
-}
--- a/dev-lang/gwydion-dylan-bin/metadata.xml
+++ b/dev-lang/gwydion-dylan-bin/metadata.xml
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-Dylan is an advanced, object-oriented, dynamic language which supports the rapid
-development of programs. When needed, the programmer can later optimize [his or
-her] programs for more efficient execution by supplying type information to the
-compiler. Nearly all entities in Dylan (including functions, classes, and basic
-data types such as integers) are first class objects. Additionally Dylan
-supports multiple inheritance, polymorphism, multiple dispatch, keyword
-arguments, object introspection, and many other advanced features.
-</longdescription>
-</pkgmetadata>
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@ -20,7 +20,7 @@ DIST ruby-2.6.3.tar.xz 11904360 BLAKE2B 8113e5a19b967cdf995a3c8d3c83aeab3bf89e97
 DIST ruby-2.6.4.tar.xz 11727940 BLAKE2B abeff89d50612d6426e1dc5fd7c15c83ef9714ddb38c64ed14bff6331c619b0a55d4a64bff49177576c3fae8cfcee30127e808f49d11b3e64a2230a043e16bd3 SHA512 930a4162fdb008d2446247908c14269fd13db4dc80bd2bb201a65a69c03f5933f97b4c5079ccd2a12db4934ff97b2debaa10a6c6f5c3060e55873f4397747eaa
 DIST ruby-2.6.5.tar.xz 11553580 BLAKE2B 07739a92ff17467fe6d31bb4dce56ae35fd9c67bb697ebc00b4845474c75d8377c77916e6e129512cfffcf76bd60e6327e818e899b6160f3222912654d5eb118 SHA512 e8ae3b5d4d23a93d0ef6057235ad0e573665a8b4b6544e1c70b4cce9c4d2fb9094e5c8fe8a9ab7b9996efe3ada603f9b4ef1fd08fb5a83253c1ae2b5e3f202db
 EBUILD ruby-2.4.7.ebuild 6669 BLAKE2B 04466b35fc3df4aa868273b135d76620d933b0bcfcd7ccd76478ef1d8f2b2b3070d9699e75f3dff8bcb7681b23bd594a44079667e22d1c9f513485c9505ce83b SHA512 77e44ff48795f5b55b074e2ff194c19ab4ab0ce3ce11dd96312ed3c8041d995e4f4a036e29fa483d3666cf59f08c7ffc3e645f8d37fc88328035f83e368f0d97
-EBUILD ruby-2.4.9.ebuild 6672 BLAKE2B 6719ca836731c06e121747dfab773dd56cae8e1619f09eff78a293221919a6e99672608fc3b594d30a54ad62e081eda5c919c4fd9ed6bd6fe5b50186ab92cffe SHA512 75195c98890c19a7918eb2fcaf6a69498888f0b51d096b9dd1139b050acf60ce678902661114f6811a057548ab97baae0ebd77bf5ece686eb6e9dcc208e69633
+EBUILD ruby-2.4.9.ebuild 6671 BLAKE2B e91abcdf4418f3180618571eeb1ff21192d403cb3a06e4a490e8c9857157a8668b198317900ea1e7039b978fea84bdaae92d638b00ae8072488019948f0ce7ae SHA512 4f55c6335dc4f2d91daa1d998e74ea532ba6319658661c330f1586311e50dc4b7afdca0838fd477318c16dc998808e068e86a8cc6c0c991e1328c0c46faee718
 EBUILD ruby-2.5.6.ebuild 6459 BLAKE2B bc214a67bb8372032cf76247575bf5efe6b10a19e12c7c0ec05dd7b6244edf2539e9d2ae249a3126d722e902a6705525c90038592ce486f75cd913b39918c520 SHA512 9b0caff9f2e29bd9bba14447e21ec7e6520e8ce57d3cc37c3dbdf7cda9730a1601ab068920558da1bdeaecbcbcda85702402ca229e5e5b3ac47d648b0027f5f2
 EBUILD ruby-2.5.7.ebuild 6460 BLAKE2B 6649f3d3267bcdbeb693510e602c352df470301a5f596f1d52f847a7246457686ba062b7e2ba1806afbcbcaf20cf729bf928a766ff45311e3b2ef0b16926dc91 SHA512 44f0b52389f72bd49ea55a053c7005139ae349831ed5c4d502f92a30e7b78503e53d21cc0f3d4d8c13dfce583575c6835a0660476da2dafce828556dd3dac27a
 EBUILD ruby-2.6.3.ebuild 6914 BLAKE2B 75299b5781c9c93ea06fe98632cdf54d75ef597a83e46d71bbf9da4aed62911486daead68da899c09b1d0a2161b20379ccf0926a59f845f8f1d677e41c466fa9 SHA512 3cc42f2d09c4880ae435d5611acb7f1e4c31ef62afdbbb44aaa197668e85da47fc2075f4b35754dbcb63251e8dc5c304ffff4e93080bed5d72cf5d557a2683dd
--- a/dev-lang/ruby/ruby-2.4.9.ebuild
+++ b/dev-lang/ruby/ruby-2.4.9.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"

 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"

 RDEPEND="
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@ -66,6 +66,6 @@ DIST rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz 279859784 BLAKE2B 40dab0ac1e800
 EBUILD rust-bin-1.34.2.ebuild 5612 BLAKE2B 773c5c632c9752ea2395852539380c77e8c94efda82529484e63bedbfd8830f68ac0dbebae74680af76fad3ebef70088b09d96e8fec75d16fe756f900115b8bc SHA512 4adeba33d77bb9c1e048a8565b035fb29100d21ab81cb068b93d969b27cb20ac631a12a1a9ba632cebc8dfe7ee4ce6684f0717e87573f9b90d74d410b239022a
 EBUILD rust-bin-1.35.0.ebuild 5228 BLAKE2B 4b252f3a7b14b078e88ffc6e7502353809f5725e09ca87499726ccd4844ebfef00296ad3353b047b9259c84f701b7a7937e266a45cc7981f22abc640ed5aeffa SHA512 fe14cef8eb6564201d1784618b436ebf27f23d445a39146d1aa0ebcd6d958c5ae97ee5954cbbb8d59b91bd8d4f9d9ccda26cf6db121e8c05e620173a54ba95a9
 EBUILD rust-bin-1.36.0.ebuild 5100 BLAKE2B dc636c7c3db969f5836bef453260e4535ac61b5156c1eba62c2051ca33b098fc7b19316ae95a9983e0f4b95170d1e309eabce393a2d7a19654694d0a2d336b80 SHA512 03ed9dd0a85b9dfb7574b3b02051406e4716cf142a8bc6fca19f84b9758a138b388078070d8a83aec1fb0a484fde9ef9e1b86d69b4d055913ba9dfa486e1e1a1
-EBUILD rust-bin-1.37.0.ebuild 5097 BLAKE2B a140af6f5079264fe87ed7a28b0f03f83d9d930c1cdb56273f4d4cab4f8239a271850abd564829ad5cd488aee71a98ec8ab6c3087a8312405524f4cb1428582b SHA512 95ae859e1a1490bb5d9c5c6c616f693ac92f3004a0533bd25cd5e7545f3930518a2f46a73c77fe2008d59fa03a0dcc2e2a9599c874c3709ef676bcbc09aada3b
+EBUILD rust-bin-1.37.0.ebuild 5096 BLAKE2B b47962073b9391002e37bd73595221218a7c45f5cfe9648f01272f2da206cf1c2b3987044a2dce4498d7f3f506d2f6f92ba761b2dfce063bd6571f68018cede9 SHA512 f5d182e548a78ac4b48fb0b4cfe10d691c390a6c6d055f1e4197ccc5159f142ebe9b8ad618853f2b419fd057f25d2944471a72252db25285c1ef25d0374a044e
 EBUILD rust-bin-1.38.0.ebuild 5100 BLAKE2B dc636c7c3db969f5836bef453260e4535ac61b5156c1eba62c2051ca33b098fc7b19316ae95a9983e0f4b95170d1e309eabce393a2d7a19654694d0a2d336b80 SHA512 03ed9dd0a85b9dfb7574b3b02051406e4716cf142a8bc6fca19f84b9758a138b388078070d8a83aec1fb0a484fde9ef9e1b86d69b4d055913ba9dfa486e1e1a1
 MISC metadata.xml 381 BLAKE2B 2a378d099ea6bb4ebe56493d1e7196c3207c54212e3c9ef8c0d020a360240cd3a5867b30e1fd3ac0a4da10de11ea6010677cbe63632e97a03ba480496a968cfe SHA512 573b793a11a2f3b7fee167fadc0c4135d16b9452642655fe3e217d6196b4f046afac281542ae361749d1d84c67a4cdd6b4944e364045d9e46e39d69b81fbc92c
--- a/dev-lang/rust-bin/rust-bin-1.37.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.37.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"

 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt"

 DEPEND=""
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@ -79,6 +79,6 @@ DIST rustc-1.38.0-src.tar.xz 96163304 BLAKE2B 1e900b44db64727477ccf8e58e0ebb9ec2
 EBUILD rust-1.34.2.ebuild 9619 BLAKE2B a6507b9f69ba43063616cb36647d752b13b39ee11b3b522b5df211760d9f6e467c1ddeb38623b6c366d8158e6e9bd24f8280cc16267d7035c3e13b19c519a6dd SHA512 460328d7e6d228e24f849f44e705db6fba483a0038026a71e55c3c4ba1a54bb1f9b41a2571faa54696d9c6758f12a22cdbbd5b2e2ccd7ccb0c46780249bd79f3
 EBUILD rust-1.35.0.ebuild 9867 BLAKE2B 58de6eb2d6178caf33dd494ce9bb9e51a4c69407aa5bd555e7dbdd50ff5f4703f163646d8f73195dfd03983dd469ea16cb640aa81bf8c30df7f9ec2ebb77e65a SHA512 24810fb45f8615a1cb19db451cc02dae3187448a339d13a511497658efb162355a812b6781304f594f823516ccc6ee857307ee6ad63011e060e6c73fcc082aed
 EBUILD rust-1.36.0.ebuild 8933 BLAKE2B 30f4c5bef8337244f6452245cddff17c9472d108f4ca022603c0f410597639543e4316aea7921e5d3f054b4b526c55bc044959bcd5e792936a69aba211c33dca SHA512 4f941b3722fbb4debacf2095577eff60a3b7b40a9affa74939e1f78c8cf53abc232435ea47acda8adcf6943ed223900b26dea90c84f6f1c81f8c24cac0e3a6d5
-EBUILD rust-1.37.0.ebuild 8926 BLAKE2B 883af40bd4d98c46fd74d87a32333ca843ae325dff352976be8c3bd2fce9ff62fcd157715e0da42e479d0287c15d33d68cebfd2b54bb1cf3d20ed4f77a1dd6a8 SHA512 f378e5d2c52c9f2f3edf803c9b0cf9dde3aea7eb53d4755deb1d669dd5c34df121e5e092a69c5745072be7bb0b053aa390887845966223bb850d3d28181e28fd
+EBUILD rust-1.37.0.ebuild 8925 BLAKE2B b2ea8d88b2514bb141af417589b073b44c8cebf4aa4522c3f6d0983ea32983214882f019fe4080af34e345302c4b3ca700cd8b0524328123bb8f59443d7367dd SHA512 595484513ce5aeb6dd98d01acd2ec3f40f63ec557fff0cb70258d604d158fe0b03fdef8fd087ac810a39cea2d09146813e7c70a93055abd580a9fc18f799c6e2
 EBUILD rust-1.38.0.ebuild 8878 BLAKE2B 1f21e03b7bbf616021c9d9512558e29ca76efeeada69c5b780807f46eba6f608faf4acea054704368218e486e2a503ebe203a33ba00cbfba5acada45cb18b1bd SHA512 2e05a65745acdd15469d13d79899522a31907b0f4936234479dff2e0ea0b2d32fc5a3fe3ff18d4b809e15b048b2da71a8ae3fe03c34ead461733e4d7487201d5
 MISC metadata.xml 560 BLAKE2B c2d499593b39271f1185356988667d0d04845debf6d963adde0874c0e22a4e6958d987da7983d8294b74f6ab1807c9f74b9a79d82f00e6d77f294107d0e30b67 SHA512 621ecee45168efc07d8e6584977c9a0ec3bf870a1e4af79512ef21c34c1ddc4563979cd0c47f3d198b27952741f8246e38893d0c137e72c57a2793901d9f82fe
--- a/dev-lang/rust/rust-1.37.0.ebuild
+++ b/dev-lang/rust/rust-1.37.0.ebuild
@ -18,7 +18,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm64 ppc64 x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi

 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
--- a/dev-lang/snobol/Manifest
+++ b/dev-lang/snobol/Manifest
@ -1,5 +1,5 @@
 DIST snobol4-1.1.tar.gz 677333 BLAKE2B a6ccecaa66657438b2c05dfca9f7db95270b4d1a3502ad06c8d217d50d54ac33b0195eb8b2e045ac0b6c49c19a5bf3ee46e4a35b45555d67fc669317c7a5db2b SHA512 ae8482bc64f3d9020dc4d7e390296114e7498ef2764ebb69b6c4960d0c1b01daf4d77dff1aa583231a7f50d4c54f7f72cedc3e4744b03f4b2370fa6de837a3cc
 DIST snobol4-1.4.1.tar.gz 736837 BLAKE2B bb86d2cd3788ad66b7246d86ebd9f289189f5bd059238d2df3fb621aa4a1e910a8ad029f482077eb78916a84c3a28d868e8ac6eef83b48d7f09a8964c57a855d SHA512 5413af10018141e93f05c9ea637711bb3981f2b67557691d05dde8911178d90900f0fdef6c1d2416ebdda6afeeabd21b9e371b6711b2d093df629cc865fc61f9
-EBUILD snobol-1.1.ebuild 1418 BLAKE2B 23431276ddfcb476dafca64bfe424f1be1d5571467e022bc1a7071e6178e60479f083d6377070e4c0b4bde181615d435d71c2ad843b34926879476b3fb947e8a SHA512 f0ca27dd442231cb15fa95ea8d43ac0937afa8715defd4f6506de072b9a3a0ae74ffa3af8ddac7beebb6612775479a90f80fc045824a273e8b011ec57df8ca54
-EBUILD snobol-1.4.1.ebuild 1286 BLAKE2B 7476a992fb502c100f60ee90b1842223dc789e98ae8b2b30ba02f84b94e79b9f61325ec1f90ca5dc3aaca669e153a02f154029ea6d66a8a6952f39025ef4dd25 SHA512 f7da5f8ada4660b6d746cae936d959d26a0170d01a7791ffc68b3522ebd410eaa22aec5d20fee457726ffc4b11bba391d25ffb447558c0f5dbaa11708f632bac
+EBUILD snobol-1.1.ebuild 1434 BLAKE2B 77b38c81c661e550885fdb8cb7fb9f07e84cb30be582f8032733e7de30baf384f665334ed5006a4ed5b940c8c4431555523def324c931d36a14f083d62a1c431 SHA512 151cc5ab28dbe1ebbfe2fd48ac6e69ff6bcfbc51a90ea311a2031eb86ac91dd9f0367a728ae33d719b830116fbf776a65d5c74157fa56dceebfe7af7324871c2
+EBUILD snobol-1.4.1.ebuild 1302 BLAKE2B eb28b53e6a4071bbec2f66f850413175095d045b9e17b8366ac29b322b5a87563a678797f718ca83369a7cb8e9e76c8e23aef7f4a658d905f037fa517fff0a55 SHA512 bcb949cba285031b7c4198b84c8db713305aba2c02640c13b802e4a624a837999da0c21d29f79afe50e406ddb6543ffcfd698bc74dda05f1ba79b3c3eb30d14a
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
--- a/dev-lang/snobol/snobol-1.1.ebuild
+++ b/dev-lang/snobol/snobol-1.1.ebuild
@ -8,7 +8,7 @@ HOMEPAGE="http://www.snobol4.org/csnobol4/"
 MY_PN="snobol4"
 MY_P="${MY_PN}-${PV}"
 #SRC_URI="ftp://ftp.snobol4.org/snobol4/${MY_P}.tar.gz ftp://ftp.ultimate.com/snobol/${MY_P}.tar.gz"
-SRC_URI="mirror://snobol4/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.snobol4.org/snobol/old/${MY_P}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
--- a/Show more
+++ b/Show more