Sync with portage [Mon Jul 27 13:14:50 MSK 2020].

4 years ago · a1ae0e1a57
parent 35d1eb5604
commit a1ae0e1a57
6798 changed files with 34499 additions and 40134 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29472 BLAKE2B 4a6a813ec44ea152d618ca3952e8f711bb90c36a79905f482897bfa48aead4077ac2440ac849b248c1fb5ccb47f5cd4166fb3b41670fa359df5097441b0f0b54 SHA512 404ebc1ef4ed48285f54efa599b8252d7de7bcc170cc20df23dde4083536bcd3ff6b9e09719058931a5f169167a62556294141bd5fcc9166bd14ad8781f95741
-TIMESTAMP 2020-07-24T04:08:36Z
+MANIFEST Manifest.files.gz 29468 BLAKE2B 57235e3420114efb894fc0d17bed2c8df763c7afe0edbfa520f12e40e918e6e4923b73886ccbe7207e1a3a677bf654ddb5bddbf3cea73cdd943dff69ba4d3a2b SHA512 f8ae66e56095002dbeb1022711dae9d589855e2d2bc778bc32504beaa156d6d218297fe2438173d8f57a7661faec1d752105f616abd3c86859e7d7b948cbc002
+TIMESTAMP 2020-07-27T09:38:19Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8aXsRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8eoItfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD3XxAAsxvy5oLG18+1Fr/tU//mi4nWMOoEcw4jlfvKQcby249hNGwHJHOdCAyr
-azaiDqyUJaJm8suF99FY0MP5T8uQOgGFHgLkindxNCAKNQ6B+woUopRwgtaqaDqn
-3uAQ9cLmm0S7fQYcEGwlz2UGN77IROZ8k/DFc3phcxotA3tHrX+6yStM3yiGz4Hl
-axJEy9IABk06m7LflcGA7kfmYUjdcn7l857fyAAQ2AelxT6aF6JImu02UCPj+OQ9
-VN9j0QqAgKLl3p+hSDajk8CM4NGIl0YEWWWoHZqrmCdNKG6JHdQZEl2Hq7qxQytQ
-7cx1R5YhTCHaYlfi9tNajNbYAZg05SP+Pbn4oSs6YkNBXwBZc7a1iyspouoHkGXf
-EvAHEH+ZIS/KQS2z9JBbMmo7uYNkQAiBjJ47wZW2hbANU9MyI87gzrz7uFR6xeqt
-SWvcTINXKvQ35IUow2dUmLxd0rq/kz3BSPfTkg7cno+BiZ2G40ktHXniL89KjrqN
-90tletKaEkw/K33pJMK7dl7UvKkMpJAJAlEqFSzkTgyjAD+N3qSCMg1dSPEgdNSr
-qdsLdiOq3wqn0TfOkluR5BhTLjehr55YvjG2E3Tm/e7e9nAhzYniSsd9f08IuoT4
-SO5Lqc7Zh21i8zkp+DNH57Qlnpmn7NFrS203+q/9LZCpX89IX88=
-=kYG/
+klBD2xAAiEypTlwqUOwi+N7A3SraS2gL/hY+KkXxPut+iKjxbAbyuo/ymbI5bgdn
+BmQo/HwbOnAjGTghKAwn0aUoDTZYqqmWNQ2fq8184uOLjvK6mQkzGLsfNccEj9/0
+65CcetUt3ewah/aFa0W047hzQcw+f80Y0MXGyb4ViKW+q+GJ1XeDq8+uO+jPsWV0
+omQl2KJBKMQB8PQknSWXCMk4Pg89VjMBBjE6bo/UT1kKcG/BanTUdO05y8s3hxAQ
+11fuWecvnx/5BoXexNaacXN74xxyfa7dKOZzh1ENg+YoJNNf7UkLzU5An6CAPhFm
+sw/PcIicsFQkfFIzcZK28+uKyEEg2bd/BORJG9RM+khNsWJjmslvjL3rVIeDx3ge
+Cmt2/abm5oNCdX975GJpoAsrCcWEJRbVkunxur/7vmId5rcpuGvYnCg9nqeeoSjg
+cuhoExyRRYl9Q1jqNRoJBIfQrMAZ8XSFWDXp0OtTm3MdSLwY843YgZMPIFomoUr8
+rbSopxIhpa+KgCTotPLdIBEPYUQthixSEfh/0D6j3CNryrgc2TNYtV73Tku7DH3G
+odohDbAoctbHpgAX3gu6lfCpS3Grf1VZ9Po3tvyzKbmVCJFKBSp4gYH6vxfPM90f
+XiPdNNAZWsRbdgFZI9+brQ0tMvrxL6QlMflr4hrqNzcKXSqZyWc=
+=NoOD
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/postfix_exporter/Manifest
+++ b/acct-group/postfix_exporter/Manifest
@ -0,0 +1,2 @@
+EBUILD postfix_exporter-0.ebuild 146 BLAKE2B 89d3e632d4468f3d79da5b1a0bcf9fe002e8f137daa8f700f66da69176570370b3f932e7f4304c626412a8ccfc221d31b03fde06e1e77607d6f7ddef3fc2f36a SHA512 9a2e42aecfcd2857eb81ee847190484bc4435b857348284452e0c0e11dd5efa9407d3e9c2175ad84beee35dae59eda383b1c4beefeb0a43aecce09b9157b46d7
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
--- a/acct-group/postfix_exporter/metadata.xml
+++ b/acct-group/postfix_exporter/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>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/postfix_exporter/postfix_exporter-0.ebuild
+++ b/acct-group/postfix_exporter/postfix_exporter-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=356
--- a/acct-group/ubridge/Manifest
+++ b/acct-group/ubridge/Manifest
@ -0,0 +1,2 @@
+EBUILD ubridge-0.ebuild 187 BLAKE2B d7907dd0015888404d921a85019b989e7a0f408e76a05cd610e6060d6a09b8fd77e0a7e7a0dd6302ca788e4ca5721bd5a60ad7268b60f4ab8b855cb08b0f79a5 SHA512 83cb6b5a8016b949381b1113c9d850e5590a8ca3d29e75c55ec79d25e94cf1a20377c7667d38a9c78fe75ce09d28e74002cd0f7902b83edcf5e33a341eacad34
+MISC metadata.xml 382 BLAKE2B 2a1952e7ba3806db62d8b3c6d1251af18707ddca296b137c786fb6713a75b472446f5b9f7746d51eedd58408cb429868886fba43bf78fbef5b33dc7a4897a069 SHA512 9db5772c5ccd05d53b3c6bb2fabe790348fa3933d95eae80e4347bb781b58bce870f4d3ea2fe9feccf7dccdffcaacca081231069774c345162d0d8219f8144d6
--- a/acct-group/ubridge/metadata.xml
+++ b/acct-group/ubridge/metadata.xml
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
+	<maintainer type="person">
+		<email>m.mairkeimberger@gmail.com</email>
+		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/ubridge/ubridge-0.ebuild
+++ b/acct-group/ubridge/ubridge-0.ebuild
@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/ubridge"
+ACCT_GROUP_ID=461
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/epmd/Manifest
+++ b/acct-user/epmd/Manifest
@ -1,2 +1,2 @@
-EBUILD epmd-0.ebuild 238 BLAKE2B afcf00914f22ccc239951ce48a7884ac11a18c7f699ac2952b709906d6441b93407bcd3dcaa8385bda7f68a99d3eb9530258c6aa1afeef02fe06a4a451f62832 SHA512 ef4c83cb7fb4fb61b5016637e16024a91c18b189922d29ae54a8fbe1de5089a15450d039395906335049e3e726de62671f41c51a7cb320f2d56d959d7ed4249e
+EBUILD epmd-0.ebuild 243 BLAKE2B b3e3a9017c4f13270152e28d36e0cbee4ac8e23acd92db2f2d24b30d48de55674784e375989a24c512d945abaefb3a3c56cc90d5a9cf1b5c62c30e890029a9e8 SHA512 6b081a1414029a714eab8a4a09d109126ad57362a0e37992b31b75705c2a81018ed5c211b86fba9e5acd006b3609cb96a3218df2bc3cca7c8143b804772a4351
 MISC metadata.xml 360 BLAKE2B a0241ba6a354c6f3c4c9b94626df161cfe76a321177eac75bab0abceaa927aef1f57f5d183baeb82cf5a306e94ed5bc9d29f9cc4e103bfae528ba831c50660e0 SHA512 4f51fa1327b78b09cf5b0a5c44abad4573948460261a7dd832095dbdfc1fa740a53ed64b2b0022ff7aa6b5c17f01c282d06748fba8f1d711e1ce1a61db456a36
--- a/acct-user/epmd/epmd-0.ebuild
+++ b/acct-user/epmd/epmd-0.ebuild
@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

 inherit acct-user

-DESCRIPTION="User for Erlang Protmapper Daemon"
+DESCRIPTION="User for Erlang Portmapper Daemon"
 ACCT_USER_ID=335
 ACCT_USER_GROUPS=( epmd )

--- a/acct-user/postfix_exporter/Manifest
+++ b/acct-user/postfix_exporter/Manifest
@ -0,0 +1,2 @@
+EBUILD postfix_exporter-0.ebuild 283 BLAKE2B b7bab64d7864d313f35304b21b4a58abf55517be2c2aa9ea2ca29a96c591e03cd549cb8faf53544752cec7e38ec39a3d7451cbe8352566bd4b8aab9a471ef78f SHA512 284da6b5b3f7205b9601feb657f441ae167f8fbdadd42ab9b58b6e5b17c1b9e560684b7620492df96e11761a3943907429d7f50329a5749869fe524c24e6442a
+MISC metadata.xml 249 BLAKE2B 4208690b25e4b18e7cf2970cbe66d780017d7ac7b6419b52f66347ee3fd8e26736fb7cb51739d920331664f0249aaaa641acbea475f582e686f0c3f21ff74bd0 SHA512 a2f1316ba5f35515c3dc42f57a6fa7ba7c8afc3e06332c480569debca4a30afa46cfddd803d8bb4a9a834b1ddb9ed91530061ca5813fb3ef2d91e78062e971bc
--- a/acct-user/postfix_exporter/metadata.xml
+++ b/acct-user/postfix_exporter/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>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+			<name>William Hubbs</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/postfix_exporter/postfix_exporter-0.ebuild
+++ b/acct-user/postfix_exporter/postfix_exporter-0.ebuild
@ -0,0 +1,13 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postfix_exporter"
+ACCT_USER_ID=356
+ACCT_USER_GROUPS=( postfix_exporter )
+ACCT_USER_HOME=/var/lib/postfix_exporter
+
+acct-user_add_deps
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@ -18,5 +18,5 @@ EBUILD checksec-2.1.0.ebuild 757 BLAKE2B f638f3ec54f7d6f7ed1d6b5affb2cc8801ea616
 EBUILD checksec-2.2.0.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
 EBUILD checksec-2.2.1.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
 EBUILD checksec-2.2.2.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
-EBUILD checksec-2.2.3.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
+EBUILD checksec-2.2.3.ebuild 758 BLAKE2B c304a85dd443ee37678c3b42378400ee8cd3d996359157787a8cbd5727340b7b78e8e94159b653f0080e2fceffe0212ae96cf99210ed280b783b650d84f01576 SHA512 b6cbd8b6b6a3f69f0efabed7760a4ad54b7aad60aa5be76df937e8ea8573ab6a5d9c48b9da74aacbc933fcd1c131088bf81493683a014c67fd06e72e3338e717
 MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
--- a/app-admin/checksec/checksec-2.2.3.ebuild
+++ b/app-admin/checksec/checksec-2.2.3.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~x86"
 IUSE=""

 S="${WORKDIR}"/${MY_PN}-${PV}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@ -1,10 +1,11 @@
 AUX zip-3.0-build.patch 923 BLAKE2B 0a8b7d8fb98f9bc8750c3bb6ff9a672db86481ca88349e5e08d2e96ae0cabac4ef75651a91e9b0fb8e70e1c075ea721060a3851bdd6e103b1f4c020a8b4f4979 SHA512 c9cf162505938a0200eed0333849c2c4a3b59088a6549377a3af9ac89cd7a26fd388d09df55a6cd117e607c1a2f2960bc5e85f7384ff30565c2be01ce4ff442d
 AUX zip-3.0-exec-stack.patch 548 BLAKE2B 3ded2568eea78c89422ea043bb68917d4a508d6ee6d8d65e9db6c22f6d5dbcac15836a94ad5d1209112cb73c1da4f266346e722cafcf3a6a91080261c4d5df93 SHA512 575516abe5ed633bdda22c3ee41109400360eef437671f9b658d7591bb8fa3b3854c1cd92d6396e47d91545b23ecbbc1218190192e39a60b00d6b7b5bb793eab
-AUX zip-3.0-format-security.patch 507 BLAKE2B f595179f8267fc2866e21b8a943323e2146e118e44ed4dd6b03a65a2c433940efd5ccc98f72f8d85dd7291f9b0bcb8eb5068ad22b9bd6fa040265253e54d4b63 SHA512 172e842e1cd43006713f570ceb8bd4998595282b973569d0e264bd9599375668a4045d691fc952a75088ad6f17e6ff90baf22606388f73ad2f2c0ac64d250fa2
-AUX zip-3.0-natspec.patch 6800 BLAKE2B 6363c941894d7de7611392ea3e883ad724093bf6fb090ce84a4c99d36ab8688ef5083d09a83431bcc1f399327e1071d4b2c4cc03cef2c1548b776699ddb4763b SHA512 67cf89ad016d51ec99e153cb05ee150318c18b3243b04daad0a9a0c0fce7e908bf7ed6fcd6361029bdd4da68759c22abf02dcbcca704b45a75367b1f42ebe964
-AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c14316992898c8f3451336a7f526d8283a57fff841c5b990374b0cea163723a25522f5ecd194b294e39bf137d4 SHA512 89a99e694fa2ad289ecc93a514e7b408e4b9e01778e622b2c2928d98181de3823446e91085f401e3478afce1ccbf8775fb227c1908144889dd0106c2d7029b83
-AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
-AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
+AUX zip-3.0-format-security.patch 511 BLAKE2B ca5bfe9f839b1fb0ab8a4785b4448fa346ba9ccfb0cde40a61e7a3442a70f06a4481c57d6aa995654d7ef4482d2f1f7022b7a568b5e47b1149f0430de8110fbf SHA512 6d3514b9df21b6f8a40b037f7d584a4b4a0a5364676bd2cf40d31e32545bc7edd2e5cfeccdc72302c4f19b607852d81ad568c4420750a8c78bbd325c5cf78b8f
+AUX zip-3.0-natspec.patch 6464 BLAKE2B 4c032896c5b331e235a9ea55c91e696aa37b192c46be5ff4c85f4809473a299ba06e34b3cc30b1e47dfbb091da5058c5babdbea41b74677788e6ef5b7b0f0650 SHA512 91472cf73c943a2fbcae7640ca6862f4ef9c2212cf31bd2128fd6e157d46db76b6882b08db2aea9d6d2e3631c56d1393e16f8e76628ea7812d062e6471a085e6
+AUX zip-3.0-no-crypt.patch 1116 BLAKE2B a4f12f492b3f844a0e822f27f1acb81d826484ddf6835941ba277eca8dc8a14c1051ae5362ebce3e9368fe3bd5b4f385712e6ff5ebb5d02acb28852d43b18ba5 SHA512 4146197dce4b536e116bdc1d5dade1486affaad379d28337338cf9663d6bc394422577c72b94dc87114c244ca73ca72c1c4bc60f2579f41637c1972f6088318a
+AUX zip-3.0-pic.patch 503 BLAKE2B 9cc9b41ebb1ed8382ac2702a33ca3854c0cd9f8c9fd39cdc99e16f4dff839847a3a9aabcd9849d7f8137260cbdc105e4c2f4c61286a9f2051c381be256ad80f6 SHA512 8b18f7eca67c214c3b66b2449c7862114c18463097c402de0cca907d90c0a6a853cb32fc7d9132d49a3b6ba1904bfbd68b36339e4d3ddd17ec7a935c19808e59
+AUX zip-3.0-zipnote-freeze.patch 1926 BLAKE2B 5976c4ad62d25f4ace8e17a85b77c99fb5ea75151d6ddd8fe27ee22cb7669d98281e26952c623b6e367fa880fce693d393a79fc619e13d8ba530b2aa38b8b70f SHA512 edd90964bc4f1bd3cc45f719905f3688ebd779aea5f10439b2331d668774ed55e645e025d9f408cedb8313848d4e26ba39726d019543e3533f79f1ef83620932
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
 EBUILD zip-3.0-r3.ebuild 1716 BLAKE2B baf91e89edf2f731c805627392d7a3eb1b8f8bff52ca73facc0dd861c8911e0bbae9036593c4a988fbd53b557e76c80276d51de93b742d14e88a65ccc0de6d0f SHA512 cb41bb9e9f782c35197156cde2a69d6997c35f5896bd7e8cbe402da7dff03313445cd14d33cfa1e51d6d2d1782d4774f51c29cc13510090a778fff85107e2e29
+EBUILD zip-3.0-r4.ebuild 1707 BLAKE2B f26dc236722599c5bf41abc19d2848bb7c09881a3c3fdaed7328786b3715ba582f4a6c46f86337e83647c7cb9cf5d3032e5a58b0be74d97b99045825dfca7cb8 SHA512 46f97e53557b546095dd79e9e0f14bde964c21c10abc34aa034334ff71c0a196ee5a3df2a12bc9da9ee7fbddcae63ce91e73d188219a00511f858e7a2325e22a
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
--- a/app-arch/zip/files/zip-3.0-format-security.patch
+++ b/app-arch/zip/files/zip-3.0-format-security.patch
@ -1,5 +1,5 @@
--- zip.c
-+++ zip.c
+--- a/zip.c
+++ b/zip.c
@@ -1028,7 +1028,7 @@
 
   for (i = 0; i < sizeof(text)/sizeof(char *); i++)
--- a/app-arch/zip/files/zip-3.0-natspec.patch
+++ b/app-arch/zip/files/zip-3.0-natspec.patch
@ -14,8 +14,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=275244
 pva@gentoo.org

 === modified file 'fileio.c'
--- fileio.c	2010-12-22 13:02:43 +0000
-+++ fileio.c	2010-12-22 13:03:00 +0000
+--- a/fileio.c
+++ b/fileio.c
@@ -929,7 +929,7 @@
   }
   if ((zname = in2ex(iname)) == NULL)
@ -27,8 +27,8 @@ pva@gentoo.org
 #else

 === modified file 'globals.c'
--- globals.c	2010-12-22 13:02:43 +0000
-+++ globals.c	2010-12-22 13:03:00 +0000
+--- a/globals.c
+++ b/globals.c
@@ -32,7 +32,7 @@
 int scanimage = 1;      /* 1=scan through image files */
 #endif
@ -40,8 +40,8 @@ pva@gentoo.org
 int filesync = 0;       /* 1=file sync, delete entries not on file system */

 === modified file 'unix/Makefile'
--- unix/Makefile	2010-12-22 13:02:43 +0000
-+++ unix/Makefile	2010-12-22 15:43:40 +0000
+--- a/unix/Makefile
+++ b/unix/Makefile
@@ -38,7 +38,7 @@
 MANFLAGS = 644
 
@ -73,8 +73,8 @@ pva@gentoo.org
 zipsplit$E: $(OBJS)

 === modified file 'unix/osdep.h'
--- unix/osdep.h	2010-12-22 13:02:43 +0000
-+++ unix/osdep.h	2010-12-22 15:45:29 +0000
+--- a/unix/osdep.h
+++ b/unix/osdep.h
@@ -78,3 +78,6 @@
 #if !defined(NO_EF_UT_TIME) && !defined(USE_EF_UT_TIME)
 #  define USE_EF_UT_TIME
@ -84,8 +84,8 @@ pva@gentoo.org
 +#  define OS_CODE  0xb00

 === modified file 'unix/unix.c'
--- unix/unix.c	2010-12-22 13:02:43 +0000
-+++ unix/unix.c	2010-12-22 13:03:00 +0000
+--- a/unix/unix.c
+++ b/unix/unix.c
@@ -14,6 +14,11 @@
 
 #include <time.h>
@ -153,8 +153,8 @@ pva@gentoo.org
 #else

 === modified file 'zip.c'
--- zip.c	2010-12-22 13:02:43 +0000
-+++ zip.c	2010-12-22 13:03:00 +0000
+--- a/zip.c
+++ b/zip.c
@@ -2025,6 +2025,7 @@
 #endif /* ?MACOS */
     {"J",  "junk-sfx",    o_NO_VALUE,       o_NOT_NEGATABLE, 'J',  "strip self extractor from archive"},
@ -183,8 +183,8 @@ pva@gentoo.org
         case o_ll:

 === modified file 'zipnote.c'
--- zipnote.c	2010-12-22 13:02:43 +0000
-+++ zipnote.c	2010-12-22 15:42:45 +0000
+--- a/zipnote.c
+++ b/zipnote.c
@@ -21,6 +21,11 @@
 #include "revision.h"
 #include <signal.h>
--- a/app-arch/zip/files/zip-3.0-no-crypt.patch
+++ b/app-arch/zip/files/zip-3.0-no-crypt.patch
@ -4,8 +4,8 @@ forward ported from zip-2.32

 http://bugs.gentoo.org/238398

--- zip.c
-+++ zip.c
+--- a/zip.c
+++ b/zip.c
@@ -3452,6 +3452,9 @@ char **argv;            /* command line tokens */
 
   /* Key not yet specified.  If needed, get/verify it now. */
@ -24,8 +24,8 @@ http://bugs.gentoo.org/238398
   }
   if (key) {
     /* if -P "" could get here */
--- zipcloak.c
-+++ zipcloak.c
+--- a/zipcloak.c
+++ b/zipcloak.c
@@ -744,6 +744,28 @@ struct option_struct far options[] = {
 
 int main OF((void));
--- a/app-arch/zip/files/zip-3.0-pic.patch
+++ b/app-arch/zip/files/zip-3.0-pic.patch
@ -1,8 +1,8 @@
 if our toolchain generates PIC by default, then do not use the hand written
 assembly files as none of it is PIC friendly.

--- unix/configure
-+++ unix/configure
+--- a/unix/configure
+++ b/unix/configure
@@ -29,6 +29,9 @@
 echo Check if we can use asm code
 OBJA=""
--- a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
+++ b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
@ -1,6 +1,6 @@
 diff -dupr zip30-old/fileio.c zip30/fileio.c
--- zip30-old/fileio.c	2008-05-28 20:13:24.000000000 +0200
-+++ zip30/fileio.c	2012-06-12 17:30:29.794547493 +0200
+--- a/fileio.c
+++ b/fileio.c
@@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_strin
   if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) {
     ZIPERR(ZE_MEM, "local_to_wide_string");
@ -11,9 +11,9 @@ diff -dupr zip30-old/fileio.c zip30/fileio.c
 
   /* in case wchar_t is not zwchar */
 diff -dupr zip30-old/zipfile.c zip30/zipfile.c
--- zip30/zipfile.c	2008-07-01 00:15:30.000000000 +0200
-+++ zip30/zipfile.c	2012-06-10 01:59:42.571706181 +0200
-@@ -5406,6 +5406,8 @@ int putlocal(z, rewrite)
+--- a/zipfile.c
+++ b/zipfile.c
+@@ -5406,7 +5406,9 @@ int putlocal(z, rewrite)
     if (z->flg & UTF8_BIT) {
       /* If this flag is set, then restore UTF-8 as path name */
       use_uname = 1;
@ -34,8 +34,8 @@ diff -dupr zip30-old/zipfile.c zip30/zipfile.c
       add_Unicode_Path_cen_extra_field(z);
     }
 diff -dupr zip30/zipnote.c zip30/zipnote.c
--- zip30/zipnote.c	2008-05-08 04:17:08.000000000 +0200
-+++ zip30/zipnote.c	2012-06-10 02:33:36.372663528 +0200
+--- a/zipnote.c
+++ b/zipnote.c
@@ -575,6 +575,13 @@ char **argv;            /* command line
       strcpy(z->iname, a+2);
 #endif
--- a/app-arch/zip/zip-3.0-r4.ebuild
+++ b/app-arch/zip/zip-3.0-r4.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs flag-o-matic
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="bzip2 crypt natspec unicode"
+
+DEPEND="${RDEPEND}"
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-no-crypt.patch #238398
+	"${FILESDIR}/${P}"-pic.patch
+	"${FILESDIR}/${P}"-exec-stack.patch #122849
+	"${FILESDIR}/${P}"-build.patch #200995
+	"${FILESDIR}/${P}"-zipnote-freeze.patch #322047
+	"${FILESDIR}/${P}"-format-security.patch #512414
+)
+
+src_prepare() {
+	default
+	use natspec && eapply "${FILESDIR}/${PN}"-3.0-natspec.patch #275244
+}
+
+src_configure() {
+	append-cppflags \
+		-DLARGE_FILE_SUPPORT \
+		-DUIDGID_NOT_16BIT \
+		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
+		-D$(usex crypt '' NO)CRYPT \
+		-D$(usex unicode '' NO)UNICODE_SUPPORT
+	# Third arg disables bzip2 logic as we handle it ourselves above.
+	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
+	if use bzip2 ; then
+		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
+	fi
+}
+
+src_compile() {
+	emake \
+		CPP="$(tc-getCPP)" \
+		-f unix/Makefile generic
+}
+
+src_install() {
+	dobin zip zipnote zipsplit
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@ -2,5 +2,5 @@ AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8
 DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
 DIST zopfli-1.0.3.tar.gz 195227 BLAKE2B fed322e6d0baf8e9008e91fef4c459e8f67f0e7d62942469893d89b8ca39ace6d1ac68cbbc322e938e66a613ea9a36e3ae9f59550b5f4964107bec490a07038a SHA512 362cbeee0b3f04a4c5da512f82671491f874d4ec7b693dca9724ae42123d7ac184cc4d5de1872b4f1fc938c97f79dfdb482f62d1fca4a17cff6d267f6021e8d2
 EBUILD zopfli-1.0.2.ebuild 966 BLAKE2B cab9a7529b3516654f4c9fc84b38ba72d2b3000c70682d61b6ca42eae86655bab2ca3fc6929d481a140324a4669bf496a5b08d645f4c2b39895b677e73b17102 SHA512 401c5e1a4be1ab1dd813335758c04ead724d5029f631f960cc3017e036aca3a3d80043ba93b4064d12c041d1217129cce05aeb92fa6af40a9719babccab4db16
-EBUILD zopfli-1.0.3.ebuild 509 BLAKE2B 413d42ef7c870a5f19dd286f860fc3dba1b080900d1bb7380ed23b79d08f1cb914f8382942d9f7d1c42146cad8d9e9d55fd738950423f824bbe0ecf677891e89 SHA512 d27ec6229f28fb1ae6eec787eb4a45ab632d035127a68d22f9ba29b584bfa446d61066db14bdca7d82076c7838c9b02bb71436577917195d82c92eb3199084f1
+EBUILD zopfli-1.0.3.ebuild 503 BLAKE2B d20d1a538096e2aaf8d25b905c03dd7daa977aeec09d41b9ef7770a197f6bddcaef1c4feac45ebf510c6f7f1dbf3dda5b7faade47e764082ae8780cd82ef4bf5 SHA512 dc518aba33113d78f76802b2a08df9bace86dd6df37bba6010f1d8f0dea898bf5668ace675c5053b673d58a4d0aa37629d7723bb35c52e695aa7f5bb0587762b
 MISC metadata.xml 384 BLAKE2B 0ea1ed6757cfd935a4e46b926d33891d99b5c943cd3145e9587b1e3d905d27c3756820f6d530afc329a552777ef19c6f4b4c54ae67798fd813b20363133a75f0 SHA512 f096a21a2f292028e07d029df22a40c252809879acc4b40c31c1bcf157c5ce28da0dc9d7466bfe6a6f13f0e61ac2d0e46e7a082135d7ae5fd945faad4837104a
--- a/app-arch/zopfli/zopfli-1.0.3.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.3.ebuild
@ -13,6 +13,6 @@ S="${WORKDIR}/${PN}-${P}"

 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"

 DOCS=( CONTRIBUTORS README README.zopflipng )
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@ -2,6 +2,8 @@ AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
 DIST borgmatic-1.5.6.tar.gz 70075 BLAKE2B 23e233c7457c25ae5b83571436dcfac4e70bf4c9a9bf9af95b8722533b48fdd82089152da220b7d61a01569233f2aedddf300c3a5ad2c69c631060f0b08e6b59 SHA512 e314fa1f20516dd52f4435c782bf634821a034925c0f11553483a1e55eef5d588e54e7abb1a88d239c1619f291548a5058a8f636d16dd829680089c20c601a79
 DIST borgmatic-1.5.8.tar.gz 71078 BLAKE2B 488a2d3a1689d16ac2e4e2e9e0f842fab51322a83b024f5bff742e31290d70e6acb683cfe74cc610b0bf0e3ff9d523bacd7faa309560f2ebb8b5b4820de54119 SHA512 25f38bbd48eb41ded8e315620fdcd929c10b38b89a3fc428db9e0053d4c1c46941962f6693018c5e26aa2187ed20bf366424b1b03f9c61cc56274c7008e824e9
+DIST borgmatic-1.5.9.tar.gz 71857 BLAKE2B c30c2629e327168ee81e9ecc26c811c5bab7369063f5711cd79567922f21d4e5c0980fe34021340d94923cea85ab0c307f9f348268c3f2063d084d0360e5fdfa SHA512 a1ea62ffdc1457fc1e7b964a474bc25d2b2d3d153ba2026018d5081011acf8d6d1329a440c2616e201ebf0351bf2f12a1e37ec2477a6f5da44de315ec3bb0c3a
 EBUILD borgmatic-1.5.6.ebuild 2023 BLAKE2B bb2ede921d9b7087b4665a5146e0bf5a963d34eb0d48d5e57a401974b80577429776ac4e9b581825a8ed8c3da907cac202500084dda839b3654fc4c9feffbe52 SHA512 c07d3132f22f4db916c9996f44e588429d5162a0d064253c7ef080e4b3e479eba58c64bb488a55a741de6281557872f5f2610bb5edbd4526b64bff25f142e187
 EBUILD borgmatic-1.5.8.ebuild 2023 BLAKE2B 175bcf279ff3809a491f0adda60907973ee7d3b25888bd13760a9f9aa90cfd17cb27310d27d83c3dea94febb853aab77cf0f671bc6ada7e986f9f8974b21eb63 SHA512 647c6005ffc4c3e86236b0ddab1c403e14a0599b3cae57bad130ef1fa618e0ad3093fb22c304a2b516b7b43765c74cefaa2e53dd1d19ea2e1667188504fecfee
+EBUILD borgmatic-1.5.9.ebuild 2023 BLAKE2B 175bcf279ff3809a491f0adda60907973ee7d3b25888bd13760a9f9aa90cfd17cb27310d27d83c3dea94febb853aab77cf0f671bc6ada7e986f9f8974b21eb63 SHA512 647c6005ffc4c3e86236b0ddab1c403e14a0599b3cae57bad130ef1fa618e0ad3093fb22c304a2b516b7b43765c74cefaa2e53dd1d19ea2e1667188504fecfee
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
--- a/app-backup/borgmatic/borgmatic-1.5.9.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.9.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}]
+	')"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/flexmock[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Unlike the other two test files in integration/commands, which use the
+	# relevant modules' respective APIs, test_borgmatic.py tries to call the
+	# 'borgmatic' executable - which by the time we execute src_test will
+	# not have been created yet. distutils_install_for_testing would likely
+	# take care of this - but between the aforementioned behaviour inconsistency
+	# and the fact the only test run from this file as of version 1.5.1 is the
+	# parsing of contents of 'borgmatic --version', just skip it for now.
+	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
+}
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@ -4,6 +4,7 @@ AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610d
 AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef3fc3d42249e23a97555f9ce67d13a94565d0f3f61a7f4fd5c71300e7988b9d666f220122e0f1 SHA512 dc06be1e5433973f6bbabd86671ea20f12bf57d91871b4664bd7fbae32a561967f139b99674ac93a3a9ec56380e090500c118b45917f884b69395e3f03f9a311
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
 DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d
+DIST burp-2.3.30.tar.gz 617064 BLAKE2B 62aa65da16155d2a321d4ef700a83000e9754eeee53ad7605b97c589a09e1168cd4cece3076d2c4660c098967f5b19056875b5aa4f226f135a17965fc099bb44 SHA512 c315c30c064073f864058d1ec9341b6e800964f308fa5ea298759e35a58ff27a198a3b6886cc04692bc259f1cfe5a5e077542fd45d3e89813541af2e4ca03533
 EBUILD burp-2.2.18-r1.ebuild 2832 BLAKE2B 91c0da9f9e456cde5b62dbe114efecc42aa9af1ac38c6e5bb0eac0c8b8aa8f6c454cd8d318b4cf27c039c3848d40c386d544b79e0a863b4b24f9dde41275eba2 SHA512 bb31a0f602f8bbaa50968a3085d84625711dc0d7f53ccd7f4216d8e1009b59da824d266729d0e2ac54ad0b02468146f770dcc45162a5dac950c35e503967ff5f
-EBUILD burp-2.2.18.ebuild 2874 BLAKE2B f6c253a5adfc5e945a9f9b8e919556c124fd0205b269409680f3ba3b7aed79ff420859ab574fb69e2364071232fd87eeacdf73263c9401bfc617284b40be9d29 SHA512 7b4b21657a6cc4abb6bee9bd2e86160e7620cc4df4ab9e42c502b26df265eed89c7da2fa7f10a26c80b7913f7261e754e9802f1842589f59f1491ed9f9a33477
+EBUILD burp-2.3.30.ebuild 3101 BLAKE2B 888c2c4e938d3d8fa385aa1c60cbee41807e3e09893b33561b0f8bd2b412642af3b9dcaedec605cf3a792341d8ccd7807cd24f1629a6419e90cae08eb26066be SHA512 94a2b64aea3d2dd2c792eb7fff090ab9b2910f2b80f8841868e2a7508525790e3c7cc67dbe4c7f90c950be5102793d4d99a277122da3b6c36d3caccf3e447fdc
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
--- a/app-backup/burp/burp-2.3.30.ebuild
+++ b/app-backup/burp/burp-2.3.30.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit autotools systemd user
+inherit autotools systemd

 DESCRIPTION="Network backup and restore client and server for Unix and Windows"
 HOMEPAGE="https://burp.grke.org/"
@ -11,12 +11,14 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl ipv6 libressl test xattr"

 RESTRICT="!test? ( test )"

-CDEPEND="dev-libs/uthash
+CDEPEND=" acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
 	net-libs/librsync
 	sys-libs/ncurses:0=
 	sys-libs/zlib
@ -36,11 +38,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
 )

-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
 src_prepare() {
 	default

@ -78,6 +75,12 @@ src_install() {
 }

 pkg_postinst() {
+	ewarn
+	ewarn "You are installing a development version of burp. These versions contain"
+	ewarn "new features but might have unexpected issues. It is recommended by upstream"
+	ewarn "to use the current stable version (i.e. currently the 2.2 branch) instead."
+	ewarn
+
 	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"
--- a/app-backup/luckybackup/Manifest
+++ b/app-backup/luckybackup/Manifest
@ -2,5 +2,5 @@ AUX luckybackup-0.5.0-nomancompress.patch 991 BLAKE2B 6fcf029ea905d434215f61a497
 DIST luckybackup-0.4.9.tar.gz 5954338 BLAKE2B 632738f8c422ba7d56536fae866ce31d224910b41495e4df3be28a8013ba776e30b4d8e70ceb26c92d28aaf70c96402f27687c55d8f5d7aa5d405bab506a66be SHA512 86d6f1bd84f3bfd89734f0f2066cb17bbf9b4ede96167398de03a460c14d24bf4b50a91bb380655ace9a23497271e102b940ea99a7595cf17f596660dae7f7dd
 DIST luckybackup-0.5.0.tar.gz 5954426 BLAKE2B 7243db713b8e5a6f3929e6d011faff8bdef8b7580c328d336843c71e738fd92a0fd19b2bc3dd0a4695f0af6ec5b436b18833dc20c5ad3479036a1a0bca22be12 SHA512 41fe878a8008b291c2e6f5f8a77ae7dba9d2c547689e53a2dde15cbe733eefd7debf21b3570bd3414dace522ec7843f645639af2cca49b7c2f950eeac62b1f45
 EBUILD luckybackup-0.4.9.ebuild 1442 BLAKE2B 07b9b559b32179733248d205b862f5e4eb1e4ccbf1e4fcd6ea63a0c07ffee7436055236bfc12fcc9aebfacd53b279379c1a0ee3d4d132fb892679f3cc338da4a SHA512 68d4d5e8b5d70b1b2a20471e97c65459969d2f7486fe700e1e18031c68eb612776970a2ac411b17cf8bc83e34e51dd87175bbfd62b405cbedecd32499eaf8cb8
-EBUILD luckybackup-0.5.0.ebuild 1146 BLAKE2B d3a1698afc0afc671b9cbaf98af9d3ae23593a9586b15af9d1098cb43238b949c8824659f64cd3baa64172f8334bb22547039693ed18af7d7271d8d40c9e9feb SHA512 ea328b39244632ec379b88b7e10a63b5caa0f3409981566342a4b256120b0e3765650fb2b0a568dfc880c66692747976557c933353024907e412bf8cfd426203
+EBUILD luckybackup-0.5.0.ebuild 1145 BLAKE2B 1760b77ec9f8360c80f513f2e4b077dba22ffeedf5dc58304f0016005edb7a5e6cb772cf10e729f26178d07e65f4e3cb51c07425f5fedd588f9eb08d93b43fbf SHA512 c171772885179872ffd974307d7257aebc089fe0a3e964d5c7d88da328b481bbf6f8ae960da3bda6f442695b7acc13239833c128b47d4458516f34676aec8d0a
 MISC metadata.xml 328 BLAKE2B b41ac27e6b5c14d5c6bf9df4a47291ffe57bc679b06ab27b3cf9135be123195a161be705ffd2349f3cc4a5f618c2e75740a677696afa244a3a3716be625aa223 SHA512 64415b71b483e93f41d75f858bbdbce2c612b5e7c37753237d7c2374b1bb2bd2d30a86d18b32f5ac015e15c57e94553019756d2cc6021c803d25da527929ddeb
--- a/app-backup/luckybackup/luckybackup-0.5.0.ebuild
+++ b/app-backup/luckybackup/luckybackup-0.5.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""

 DEPEND="
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@ -1,5 +1,5 @@
 AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8307 BLAKE2B 35c32ab7c59c207bf765e92852abd47b1105c58cb685ea83d6b3386581444e5fc82bd4df0216ca0b2649ad0fe9678328e6044172f3214876d08da0a9ce8afd40 SHA512 f32a7ba66e461fd100c2769b34a418b389b7237a36899d3b48fa1ea27f6482f641f621ef05016b857845b8ed35748fec982b729cc9dbc391de2ab445ddc97a22
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8307 BLAKE2B f0a70affbb805dc31bd096d305edea97a0d0366c731547cdd112e133d41a1778c067796bd25a98796b9d1da2097b2afbeb0266340c5548b84fb28564c6a97386 SHA512 64b77433fa082b3ffa7f21babe2dfe06aaa4d8f78deb7d4bb06201e6876fdf3556450a6495fd05dc5863cb5eb0de6a226ffd13e3e0398294a319b2ac0f33b009
 EBUILD cdrtools-3.02_alpha09.ebuild 8238 BLAKE2B 7bb73807895571dee4c7322a86ded1540ed2446f9be36fe72039a259b88c048a7f03725aa146c7977c69dd132aa143fb30cb9ef92e185e1bb475b902e6c14af3 SHA512 2547caf73df8bfa14b25e144d49208e53c771acbb0a23ce87e8d1c249e16a3cb2fd73babedcf4c3cfd5f0a8f180343de22fb6ac71780dee9f1040e0c6ca607e6
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@ -18,6 +18,7 @@ IUSE="acl caps nls unicode selinux"

 BDEPEND="
 	nls? ( >=sys-devel/gettext-0.18.1.1 )
+	x11-misc/makedepend
 "
 RDEPEND="
 	acl? ( virtual/acl )
@ -28,7 +29,6 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	x11-misc/makedepend
 "

 S=${WORKDIR}/${P/_alpha[0-9][0-9]}
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/sword-abbott/Manifest
+++ b/app-dicts/sword-abbott/Manifest
@ -1,3 +1,3 @@
 DIST Abbott-1.1.zip 435868 BLAKE2B 905e0a08b27a28f2de227738a3c2b48818c39cc4b5115c48ffaacdd817435ebd003cd71c0e011d18437a8a87277c2d352a4e344474b5b66de1d19133b975b9a4 SHA512 999fa69c552296140c6bb4309848b61c53e7cd96543b07d13b43bdf7250b55f33363961105058378fb4979a52e928fe2c1e0e6ff7655839fda0cd1fbc2a12fae
-EBUILD sword-abbott-1.1.ebuild 326 BLAKE2B cf5cb34ab580e9bd9804cade2656794f689076154e48a58a45d893f73542746438d80723825296981df4be14e1a12a4f9e4b162ac1bb274e7809c7f6b4fbe53c SHA512 deb2bca30b30bc7044a622697f0891ac9847d6e36d500bdedb56f74467c7c15d5b5dae3cb5fa46a67a8718e96c2f28a03e9d7bbb127f48d982ef4b72a1cb9ce5
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-abbott-1.1.ebuild 324 BLAKE2B a522fae66d54ffc46377931fc25097978d4e6ac2ecf01ff98676389e8ff80615ed41e36d5c8942d498ebe61aa794080d062ad2e267f827cb1e719c7ea8b4113c SHA512 42b8f94db737da5f8c777029c9fd032fd0c7dd6f79375041c82e904cc7f8fbe11b87952dff98d06a98fadbec5147b9df1d9ca965297b99a03c9ff1ebe6067539
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-abbott/metadata.xml
+++ b/app-dicts/sword-abbott/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
+++ b/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 SWORD_MODULE="Abbott"

 inherit sword-module

 DESCRIPTION="Illustrated New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Abbott"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Abbott"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-acv/Manifest
+++ b/app-dicts/sword-acv/Manifest
@ -1,3 +1,3 @@
 DIST ACV-2.0.zip 1396326 BLAKE2B 0aaf48548d4b6f7597b1d5339183d47ac35711a875dde8c42aeefe9345a2b7c19efa5ae58422f1feac93e98c521f4c4f09331f70f0e3d8f07b30fbb2c0ddf8a9 SHA512 913597446f8efda893bc27267a17c9de393d4dc6b6d865abc2d8c99f5b20f4bfc0b1107cd7d81a03c3c192bd8166ec5135d3e5eb9bfaf76998bc797eddf70dca
-EBUILD sword-acv-2.0.ebuild 316 BLAKE2B 7071d1981a30174ca312464ad55ad1536d2ee4ada9e81e08d6346dcc0815d2787bc18f58c5bd8c6999fe3d80f732efdab3612824a1dfa5278c16bc9e7a057f93 SHA512 ce2ba547df5d677a8ec12e9bbe1b9708ca66651ff3fd0dc0ac61f185668c3cb25eac6c3e1d22b3899b79bdc35c8a5f6364f1dd29ea93bd7b2c85c3cbe1c37f03
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-acv-2.0.ebuild 314 BLAKE2B 91503f9692e0d593b8459c9dec91c1e75a537d7cb42cda807e98ab4a46ab132a36bc5127c56398f2d6d1f7694a31f475dff8e523ccede39d4923b6c1eebfffc9 SHA512 b6573998e30331f1291641400b8e3d678c332fbac7f454a6c6ec4a07ac6a5073f10d3a70d82853927207f6b3a6714fc4551020012b28a26df330bf3b698f80d1
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-acv/metadata.xml
+++ b/app-dicts/sword-acv/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-acv/sword-acv-2.0.ebuild
+++ b/app-dicts/sword-acv/sword-acv-2.0.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="ACV"

 inherit sword-module

 DESCRIPTION="A Conservative Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ACV"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ACV"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-afr1953/Manifest
+++ b/app-dicts/sword-afr1953/Manifest
@ -1,3 +1,3 @@
 DIST Afr1953-1.2.zip 1447644 BLAKE2B fd740c4cb374c4a60fffc2ce478823a0d716d5db94bb3a14c0fa99367b9316ebd0402b64e40f70d0acff94e0fe7d36e851f348940ca8d2222d2e52ea1de6268c SHA512 fa41822db6a05728d676fbe6bf5d0a81ba3863ac07aaf1c5dd535df025783cb5d6ce8f32924027110dedf41f16e7dfaea5004f49936ede472697645b87caffb3
-EBUILD sword-afr1953-1.2.ebuild 313 BLAKE2B cf4f37f6949f5a3a1d8b5c02f6d528f0afd2090f5a5a64f9df94fc994a32c7d71089b6c4009fe9dda3439b7047484d6e67d4840844c3b4d973457ddcc163ba97 SHA512 0482d4f50da03c59a3b44e5db6e5dfdb51ad3e662096e9679c84fc97bb7d770fec04fe51c89f22a2e62495f0b78ede99367e24e815737c87ea14a9b91fb4c0c6
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-afr1953-1.2.ebuild 314 BLAKE2B 613d60abc47b0fa70f453020477b55bc396e9efc60c873f965c26daa06e626e3d89d7c2b576892d020b83da5583382a2e5be602b44346a31f86a6293b99b4db4 SHA512 16a93f997b9c4401a6b83269d6e6b8d1bcf57167cc1e6e524e9623540e13efed4ad17db66c8da48aee43cd3d1a361ccfafb6cbd0f01cd0604ec585176acf32ea
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-afr1953/metadata.xml
+++ b/app-dicts/sword-afr1953/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
+++ b/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="Afr1953"

 inherit sword-module

 DESCRIPTION="Afrikaans Bybel"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Afr1953"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Afr1953"
 LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-akjv/Manifest
+++ b/app-dicts/sword-akjv/Manifest
@ -1,3 +1,3 @@
 DIST AKJV-1.4.zip 1402903 BLAKE2B 726e61e4fd3b9eace74627c5dfbd38424b0472e127c3ec762b6cd3f587bccfbd690330245b3a8b2ca12cdc47c9ccdaf6fc5d710bab9ff963d9fd9c5b3e641580 SHA512 6f9ac42e6b768d356520384dd063f4deef409e15380e7b17c94e0870717c4b37881e17b4fe5eef62a55b71092fd37507a4f0b3a42149757756896b3fb021612c
-EBUILD sword-akjv-1.4.ebuild 323 BLAKE2B 63ea4a9fc3bf1d41c64826b014304eeae62099bf89dc85f320b769ad0039bfb1fe5f7cf97412d954e9182bfbe3568000eca6e5314543e1eea9d35928bcb67325 SHA512 26bf1ede87eb3437ed5c3da8740ff959cfd06d15ee3341e7d687f29c775d4a7ae53db42d7ce9fbd3275c8226a066646cea8892ba36b09269bbacb850edeeb552
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-akjv-1.4.ebuild 321 BLAKE2B f0205fee706eac9bbce5fc94eade2b227a7195cf3c210189d1ad08469f36f62039c1457b872c0466ea5e6592410619215d5e63039bfc0ce133bb0ccf283bd452 SHA512 e88a47d824944e78d6f28f49ee8b1a4d378f74c76076d695d266f0a65b7355ce313b81f81bb459457a33b9ee0fa72ab522444146169f12d71ea1ca5ffa4838f0
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-akjv/metadata.xml
+++ b/app-dicts/sword-akjv/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-akjv/sword-akjv-1.4.ebuild
+++ b/app-dicts/sword-akjv/sword-akjv-1.4.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="AKJV"

 inherit sword-module

 DESCRIPTION="American King James Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AKJV"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AKJV"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-alb/Manifest
+++ b/app-dicts/sword-alb/Manifest
@ -1,3 +1,3 @@
 DIST Alb-1.2.zip 1544025 BLAKE2B ea32989c2b6ee560891a248327bca8ba01d2db772cab085574a95c894c7c9c0eae8ba5d6b5917fce0a9c24e32fe5c0b87096a4219a0eebf8152976b7da4d130e SHA512 49cb89bf807cdacc006e66089be9ec74746f007c2143d3efe44d34b1d9d56bf8f2657f1fff1cef512430ca7fbf2fddadb5346b666756b54fcdd871b550915977
-EBUILD sword-alb-1.2.ebuild 305 BLAKE2B 0ba0c42f624f492fb9fcdb598706ed86207766300477ed827bcc2f871832e7dff50037e1b9271d85f140b49ca18ccfe218c7a1c665e456d332e4774545c831b4 SHA512 117c4b69d112ca42dba006ec3bdb8c29ce063f2ad1c9a5fcb9442e70209d0b52360f5dded16c45f2b8644e6467f62429dd93dad460e0bdf083cede79d7cfb3c1
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-alb-1.2.ebuild 306 BLAKE2B e14d827af51c8cd9d33f5d9d05473040d0bf5b5c20750becda193555975cbff34ccccf0a964918e94ddc52abae4179add4cc1eec5c01c40b6dfa90d7394d9cae SHA512 6522810ee316bd39fec0a58245f187caca58dd5bc10842c45b6ed1fe85b174fe8ba3941b12e79868a6dd88516be8ed156e25942ea08e7e850ae76902e823430b
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-alb/metadata.xml
+++ b/app-dicts/sword-alb/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-alb/sword-alb-1.2.ebuild
+++ b/app-dicts/sword-alb/sword-alb-1.2.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="Alb"

 inherit sword-module

 DESCRIPTION="Albanian Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Alb"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Alb"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-aleppo/Manifest
+++ b/app-dicts/sword-aleppo/Manifest
@ -1,3 +1,3 @@
 DIST Aleppo-1.1.zip 868170 BLAKE2B 133eb51afd1c7038e6d08969106fb1cff3b0210cd7470bc7c3b03593f2a561025db9af3259c94fae078429df0188763f3f0349c9a0d31473e8743cbb7f6cc491 SHA512 566cd9d7e533cd6653f39f2965c1750c9096db98ef9dbb151882f0f60396d60cd3f01e60f84a6c5b25d6af34f7d7d255cc6dfd9bb53223a542dd7d71704c9b08
-EBUILD sword-aleppo-1.1.ebuild 309 BLAKE2B a78b81894af2311b36f2199304bb6ad5bb290eb8ee46149e6dd1f5b0d0e6ba709f0f65858e41d29579cd3be1d23b480cd8dcca7e1f7184d7435b141e8924bf0f SHA512 863391b335725f70c0af3f9ec81129712345f361dfb1c59612783689c7d84010d9cc27a32870f50f500b7d86b6d80ced5df1c47f1d1461b41cb23a312a4cc532
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-aleppo-1.1.ebuild 310 BLAKE2B 4d9db320505253a1fa9dd31ed076139e966f45f8c3974b8c66b28b09c6fc589e70358d922e54ae53abbff573ae544458599f7c655dc9abafec52aa8bb9f409eb SHA512 b3607f52d7e2386bc874da7023fa78db7b2dff0659993bcd56035e906fc043737ba6a06aea9c153f80599a363b5e75e5120b14e854487d7ed5c2a6d7cbe80c62
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-aleppo/metadata.xml
+++ b/app-dicts/sword-aleppo/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
+++ b/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="Aleppo"

 inherit sword-module

 DESCRIPTION="Aleppo Codex"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Aleppo"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Aleppo"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-amtract/Manifest
+++ b/app-dicts/sword-amtract/Manifest
@ -1,3 +1,3 @@
 DIST AmTract-1.1.zip 758636 BLAKE2B 51ee5834e2082cf9b904e67add17b6547060084a8bf8817143e11f5c0567d99344259ff3c578d6252cbd61bbb2fc1e01210e4fa4d267de627845ad6e3382ff92 SHA512 5575030e76ec32261da220618dbf157213e0b7c630479b2d9966d9eb992f863b777bd38e3ef3502c01cd62fa84df85a7b0e35a4854e2366cb4aa088425602641
-EBUILD sword-amtract-1.1.ebuild 341 BLAKE2B 55ccee98a7124f89862b1aed21c61e7d87aafcba5aa1f82b623c6504e21c85fe6a8d4ad6484694b865f25cc8b3becba5e21325c7e31188603a87bed8786af12c SHA512 3bf3ada1f22cd8db02c581a37fb632d79e170e294a539676df962cc2bf6d39486a7042ee776309b0ed776966939dbf41ec53a8939bf339e5ca27082ff6f0cd1d
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-amtract-1.1.ebuild 339 BLAKE2B f75ace4327e84362155bc6659c0be9087386307d475392743c75569d25f0bb26497e712fea6f1591197ddd3735c56c800c3857c98dd41fd72777a3c4c2d61d98 SHA512 0a038e407ab0e059cfbb7ab5f04e8184f3aaae2187a3754fdf740d0ffe70f8adab8e1d72e838b67107c27d13dfde852e8036b2766260cbf6121a2502129a298e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-amtract/metadata.xml
+++ b/app-dicts/sword-amtract/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-amtract/sword-amtract-1.1.ebuild
+++ b/app-dicts/sword-amtract/sword-amtract-1.1.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="AmTract"

 inherit sword-module

 DESCRIPTION="American Tract Society Bible Dictionary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AmTract"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AmTract"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-arasvd/Manifest
+++ b/app-dicts/sword-arasvd/Manifest
@ -1,3 +1,3 @@
 DIST AraSVD-1.1.zip 1306354 BLAKE2B 571e38b2003243be7c72d9acee84bc550f87e21fa2c8e131596557774f2d2fe842ec695d778cf771507d83749f0a6cab7f0f8e9515429749076b8ef07816ef66 SHA512 928371a99b7d543a512b3adb3af70788ccdfddb174fd0a3267a0e724623658c3c04b15ef9e91389c5b9d21e0f34b1f1584234390a7bc74c90ee14625b711d250
-EBUILD sword-arasvd-1.1.ebuild 353 BLAKE2B cb76a1a504029229824d15f57a5278db4e87d747b19d95b415c2f652105108eefe5045dd6d63ffd92290d06c3f1644d440141f8f5e93e90dd0c1692fe8f61da0 SHA512 d2b1f68f0dfc48df7a96b1783be69abe4ee299406037e9ecfc73cdfe809efe268c661bf4c4277379b2aa0bca0d5694350c3fc10fe7bc96c1155beea3e80a56c2
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-arasvd-1.1.ebuild 354 BLAKE2B df46b73759d2ef1ac0b99d53b2886e42a1ced35f3fc8801aae766c969fdd7dfed94b55edb4137920ff386b8b73933e58dba592bca029ef503fbbb939bcaaf967 SHA512 1b1be27a644a5553b33d954001a379f033762f8a8b3249d6e538bdbc2d4a9111356dc70910801e14958fa62ec4e2bc9cadf79ad3e9fc124d51723e77b3ea5104
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-arasvd/metadata.xml
+++ b/app-dicts/sword-arasvd/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
+++ b/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="AraSVD"

 inherit sword-module

 DESCRIPTION="Smith and van Dyck's al-Kitab al-Muqaddas (Arabic Bible)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AraSVD"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AraSVD"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-armeastern/Manifest
+++ b/app-dicts/sword-armeastern/Manifest
@ -1,3 +1,3 @@
 DIST ArmEastern-1.1.zip 334965 BLAKE2B b193bfa9f3f3472f1fd390c3aba61f7299d5d1dcc1a70eb5f88b4eae3bff68adca7302cfb1834c6fb8b95086e38651faa512f085201ad56f486e2cc71738ab4a SHA512 fb481aae1c58e5a4327afdac3f8134678f4e55488dfafa2976d2f77960c742bc371d86575a3d14ce703dae65523392d854baf1c48f186b8dad22e4e6088db860
-EBUILD sword-armeastern-1.1.ebuild 327 BLAKE2B bf8bba231150a57dc45bd71e3634c33f2d4a4fb3584be139de3b1b5914b6f133903a1de496b69ffdab5a0eb2333c484342e09fed5e2a0462b025f23f09b1e6f0 SHA512 70ec310bbdc93d92923c71d7bb27865ada6a9e816c16764003e0f2e67387b9fbfcb51a4f0c572be998cda74efa393200d422cb4de3b952ba5fcb0b079ace5333
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-armeastern-1.1.ebuild 328 BLAKE2B 41848e65eb56b1f096e994cf9684fb99aae331e0b1da432762fcc830f7021d01f916b76d1c384790b8f2aed9c7e58e8f1726a67ca5de8fc760dd66f86b269a98 SHA512 33f78e03fa15a848a56f4e42fea174f93a6ac805e0994bc43cefdcb61256808295e844d999084e94d87362f3f2737dca55102ea0de60c6b9bff4d2fb250aedaf
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-armeastern/metadata.xml
+++ b/app-dicts/sword-armeastern/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
+++ b/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="ArmEastern"

 inherit sword-module

 DESCRIPTION="Eastern Armenian Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmEastern"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmEastern"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-armwestern/Manifest
+++ b/app-dicts/sword-armwestern/Manifest
@ -1,3 +1,3 @@
 DIST ArmWestern-1.1.zip 428727 BLAKE2B c10066c0da1692b2b009f3b2e28c2445cbc949edb8c8c46c732a916118e5373f4070ec042b9c6db3911db2856d4b431fb15893dfc22fdc565d3a6c08259b984a SHA512 85fc4ba42c10da39103096afde9226ea206e52e69510ef3643acf54721233724c04e8185e32bd9663f62a33c8f1b70dc2a6d123f63f0679604aa58122db1fe46
-EBUILD sword-armwestern-1.1.ebuild 329 BLAKE2B c61dd8e1750dbcf6fb6953a2c9894fb0fd47177dd4edcfe13dadf3dc8a77abe43afc4031e87901bbc433674a112ed19255c578a0cd28bba732a4a59fddc653d7 SHA512 2f8d6a1672ace42878450cb55ee25310e588f929ad88d7ff27cca1eae2dcc8d66262b3130a5ad0db3f950844de726dda4024a2281d8e33356ce32e451694629c
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-armwestern-1.1.ebuild 330 BLAKE2B 3a89456ab1cb3914a75283efbb98e5fdfdd4d3bce63dfb2d2e65410e9408a3e5210ad6b590482d1ac9d2a9f64f6d29a8fb1e3311f81230bbd02fc01dc0dcd5b2 SHA512 0ea68e511fe8df9e64e34240ec3b2e623f8b0b6d33bf70b4611f3747da027a778978602da2be5538c6041b77bbefd43abfe418713c190a6f5ca9118eb621d937
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-armwestern/metadata.xml
+++ b/app-dicts/sword-armwestern/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
+++ b/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="ArmWestern"

 inherit sword-module

 DESCRIPTION="1853 Western Armenian NT"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmWestern"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmWestern"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-asv/Manifest
+++ b/app-dicts/sword-asv/Manifest
@ -1,3 +1,3 @@
 DIST ASV-1.3.zip 1579461 BLAKE2B 9c0564aa98936f6b0b44f5ef75af23da0a64f50430832ed707ad6e076e5f463bb14afaae93933cc66933289c8388c336ec01a79562ec4e6ca0105042e2b0de42 SHA512 3f1275dd4e95e61f5f2d0da7721a1ab2efd66f2bf8b72a34365a187b6a467be64a006f6769b5e562be7aa6499ab7c41954ffa90976ec81687de5d8e485d43bf9
-EBUILD sword-asv-1.3.ebuild 326 BLAKE2B 89bb66d209d3aaa88f3c758de057d4844f1d0945cadf14aa829c127dacc627e2a21def3e8c993c2768894ec67a99f47bf1508831a942c340a73268803ce55bba SHA512 00642cdfeebb2fb1defd38067936c332791daa38b75d9f7fdb25b7c26d95dbbad0d57dbdcdd979c0d563149a44c01ed6ee45d858529194bfb0e7f2a8a1f96829
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-asv-1.3.ebuild 324 BLAKE2B fdb17c3f7336f2795c6807616c3ebb5807bd83d63ca9a01529a336acacca40fff29ee6e224e003c82ab2662c48c16cabe89b2abadf23325c80cbdd28e0ec6e5c SHA512 b66a8de120fa802d65fdea45fda764d845613f87a3781f2bef84a14ba29633809784075140a607543e05b6b0693babb71a7e5cc8eb57797828b6652d13f8d61e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-asv/metadata.xml
+++ b/app-dicts/sword-asv/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-asv/sword-asv-1.3.ebuild
+++ b/app-dicts/sword-asv/sword-asv-1.3.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="ASV"

 inherit sword-module

 DESCRIPTION="American Standard Version (1901)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ASV"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ASV"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-barnes/Manifest
+++ b/app-dicts/sword-barnes/Manifest
@ -1,3 +1,3 @@
 DIST Barnes-1.1.zip 5812838 BLAKE2B d3fce355f092035d389552e3269c6de0ef90cd0a1f14d009c0291efdb1041f9826f086a4afa9e6ff40a7aac6246a30535e3ea74421516c68fda0351c08fc6606 SHA512 5b63b6bcfc8cbd2513cb79c0a77d61cad7f963184eeabc7d1beb9036aeae4c60d91c109e4632c1b54bd8acf84bbff8d5160d12ae29d618c2eb17b249d4d567d3
-EBUILD sword-barnes-1.1.ebuild 327 BLAKE2B 73ae6d3bb00545b51454799df2d15c0fbd7b69f14a8e43bb4592ee9b900a3013c9949ad368c4ea68b1cd32c6cb3ebcdbda845a94c146160f2323208556be822b SHA512 6028385cb3cf79fd0f9ce22199e24ef7a26c49e9d425d5cb9bf11eabfe3ae3c7e647d38ed26b4d2c01532e02bd2f9b9822222e87aa38998b4ce2b7b9bc5138ad
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-barnes-1.1.ebuild 325 BLAKE2B e89e405fd0adb558bd4b5808251fce17be430b141e254ae5e3834ec44ac26292baf94d47f31a20debe60a9ff7251aa4cd3e9de181dd486691d69202c4596edfd SHA512 703f17604b5272ad0c3666291b18f399f895b177e53dc3eb3db7e6fc09737341b2df3b33bca605ffc030006ceabeed1ee64bc82add6fb9567852b6350cf8583e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-barnes/metadata.xml
+++ b/app-dicts/sword-barnes/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-barnes/sword-barnes-1.1.ebuild
+++ b/app-dicts/sword-barnes/sword-barnes-1.1.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="Barnes"

 inherit sword-module

 DESCRIPTION="Barnes' New Testament Notes"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Barnes"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Barnes"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-bashautin/Manifest
+++ b/app-dicts/sword-bashautin/Manifest
@ -1,3 +1,3 @@
 DIST BasHautin-1.5.zip 426714 BLAKE2B 8248a2e8ed16f8eda784a590584bb1516bfcc4f24172b2cdf05a5464efd46f064cc5469dd01f5b879c39d9f534d190b82edc64f77c6204e402b0372057497cd0 SHA512 a0266465dfc0c945398075cea549fd17601ee8d38f4d319b035c6a8425e1222c4e6cca46ccc52d6769c368eb4aaa592cea4ba2b60279e2ebeb64c8f4b834e5ff
-EBUILD sword-bashautin-1.5.ebuild 335 BLAKE2B 210dc70bbb245b42531000d47ba7a330b2dbc82138b13511984503877fbd1f1947b1b884072edd47b768bfa3d574f078bbb525053aca3d427c831b3a17f47bb8 SHA512 af6477932d3da76737ff12e57451e933b430f72f2d6f73b218e7924fd52417c51d920f4d6da9a723f5325dce1a5a1cc3c2e5d8a4f0e9cbf4856d1f492b785591
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-bashautin-1.5.ebuild 336 BLAKE2B 3309b2dab145661726b11a59b9b091e046c2b35914be0e09a8210103566a902d5f27e9098a6b8fe7225acc5020ed73424793ef7c5d819669fa681fcf260f0cf8 SHA512 7901943b979c3edac32062dfa756e464060b51965663089dbd62cf1a51053a43879b8f761b3f3d6ced0c65dd5a74a247c66f0fe0feb8f3a3c4133bff29528ffe
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-bashautin/metadata.xml
+++ b/app-dicts/sword-bashautin/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
+++ b/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="BasHautin"

 inherit sword-module

 DESCRIPTION="1571 Navarro-Labourdin Basque NT"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BasHautin"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BasHautin"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-bbe/Manifest
+++ b/app-dicts/sword-bbe/Manifest
@ -1,3 +1,3 @@
 DIST BBE-1.3.zip 1391875 BLAKE2B cb7eeffa00a47160fe929cfff000d942cd9062bd0bce26a928a9b7330ea2d18a3a3436c036b5b8f65f0a17eeb052e34ec10d5429b4f058aaf109c3b20a58ec19 SHA512 9df323ea99b5b116937c22e1ae5b2b863220c52a7d488096968d63dd8b937a99a60691462f5604f3d22133058ce5744bf227d35421501362791043f520f34b3b
-EBUILD sword-bbe-1.3.ebuild 328 BLAKE2B 0e255ee43d365da6a75381530c167b1f5d3f36e2837aa3b4ee55d970650433f0a8d58e2ea8bfaebfb6c34c698eedb46f8dca4f6fc19332af39494e9d2c91e38f SHA512 89b9d14b66b3f929b1c5bc51a41ff54c2c3f868873fb83393415fad69b4ce6469c2b94472142bced7fc6c6e279237fc0f1a445a49fec4c6e42ee0708b0b67f90
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-bbe-1.3.ebuild 326 BLAKE2B 6d5d8d67918694c1fe2e2241353c5f281f4ae7e33bbbe090a7645e35bebd0d4543f0ff30b18cc7a3e8fac9e27e326700ac40df1fd03e2a6338e4b898fb90a857 SHA512 3952932ada7d737eab7e5102d286ee8e9dd45ec4041614e02df48e4e97bf7e86f843726d971955094519bc472fd4a77436e7255af12e2467ac7f39463fd43a26
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-bbe/metadata.xml
+++ b/app-dicts/sword-bbe/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-bbe/sword-bbe-1.3.ebuild
+++ b/app-dicts/sword-bbe/sword-bbe-1.3.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="BBE"

 inherit sword-module

 DESCRIPTION="Bible in Basic English (1949/1964)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BBE"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BBE"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-bulveren/Manifest
+++ b/app-dicts/sword-bulveren/Manifest
@ -1,3 +1,3 @@
 DIST BulVeren-1.0.zip 1827256 BLAKE2B c376e621ae066f3e29ffbfb1f9645e7e6ddd45b915cc38a4bd453f9200915bff4703fa2e3e8d241a0bd10441c9411bedeea6c9fb2c64ca4cc657c3d36ece850c SHA512 87f7499a27c155e9e4717849d26cf394ccb1f19943e8d7c8ba224ed8a3681a773bb38e6bfab7912138d451126f02626b46ea2265d810ca459110557aecf9518f
-EBUILD sword-bulveren-1.0.ebuild 326 BLAKE2B 1d7cf562d82776fab255f3b105ee18c7497ae5f154ba37ffdcf07ffd06b72a187b3068c2bc22f379eabd4f62f8c460a73acf27ed2d24f9cd65735ea84845a3c8 SHA512 13b05d2496b42b02a28f905722e3551f80e0a65e8d94f504f2348c8bbcfd7dc77227491f7966e19a311d3b61c9c7449d8a8995c773de2228f6b30585f2ad75cd
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-bulveren-1.0.ebuild 327 BLAKE2B 545ce37c55c2bf0de67567fa545e80322de90a00944fea245e83c98c6205c34a9e2084ea7f648201b5a46edfac62f0531e4df3c6b7486531b783aa98c988457c SHA512 7fa63d06ef59bf81045e25e55d1e07f58d2a92aaf9e76fcc26b6d6dbb0d644a611924740d90a356f4f1fc959c2e623a6c2a13c93289f59ed39e47397e063ef8e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-bulveren/metadata.xml
+++ b/app-dicts/sword-bulveren/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
+++ b/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="BulVeren"

 inherit sword-module

 DESCRIPTION="Veren's Contemporary Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BulVeren"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BulVeren"
 LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-burjudson/Manifest
+++ b/app-dicts/sword-burjudson/Manifest
@ -1,3 +1,3 @@
 DIST BurJudson-1.1.zip 1990168 BLAKE2B f2073a2bdf41df690c5224a25ce8d2ce86bc1a896b5355de8bb1a7486bb0f06c807e23ebf04da16ff734c1a0f4a31e214740b4e3ce5fff31f6253dc0df7b7ca3 SHA512 49e3d9fcf0d12ed5923f81c4fd5d6e0c34b066d992ac9944617fb8dfc734e493f78a60d18966b86557b9477c5d5d5fde17699b5b1bcc8d0ed8dfad20677fdcae
-EBUILD sword-burjudson-1.1.ebuild 328 BLAKE2B f1f269c3e30f902322847f9095d072915676cfd088bfd5569ceb3ea8c4d049be4dd2d5f1a83312a787522f1d24b8823683dabad133a8be19cfa09ae4d6c3b2df SHA512 30df7f18d58ae4bbd565179ecbb027d73341b9f8d041f89509d82afac565588bca9684bf58ed339e660a6dc1a418efe6eb55b2bd76ceb958ee33452e8db2bc20
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-burjudson-1.1.ebuild 329 BLAKE2B b1ebd4452778a3f89b6bbfa30234973f2a84f0a095a27fabc6e8fbef47a8ee81e8d1c87cf1cc8aa962d2b473a9e2f99d472bac56dcd057ccf747fb2a8bba32b3 SHA512 b69fc5c0a5e448bba70de42e083b1d7f89a30ef97b560778ed2fb6036518670daa73b4a5b2f12d95a4a693f5cf338fc8267c92f6d50b35b73692a19af5c3a469
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-burjudson/metadata.xml
+++ b/app-dicts/sword-burjudson/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
+++ b/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="BurJudson"

 inherit sword-module

 DESCRIPTION="1835 Judson Burmese Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BurJudson"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BurJudson"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-byz/Manifest
+++ b/app-dicts/sword-byz/Manifest
@ -1,3 +1,3 @@
 DIST Byz-1.10.zip 1263944 BLAKE2B ba0985666992db19bdac5d7960686d6ffd06fdc37d1444b5949e073e45d25dcf1f99ede807a9f5e9ed02fde7d412a9f06835557d8ca7a2097f83df5cdd5a082c SHA512 e47ed94aa465932191903f8199ab119ca6075807cf2c693c04cfecf27b2b128d3f757c57929151e16f8e014ffcb8ef303702642b8863100fd49e6a54120a3727
-EBUILD sword-byz-1.10.ebuild 321 BLAKE2B 8c51463e36cf595a1db4b9f09560bca8fc97af32a892bd4426b0a1c261e8e9791145649d09fc5194a70bc0c0e0d5d70623c9c00be2e676eacc6d80501c62bb63 SHA512 b324384c8e8e6c03286536e2b6423023ec75cb4f431324422e9853bf1bcd8aff3f5955e41d8a2ef20c1ba89e3424003de1168e0110c998120844dc06a269a092
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-byz-1.10.ebuild 322 BLAKE2B acf9bdbdc288ad90a654838bc05515543f0de92f63e796fd1ebd6c49a72d89283197eee030101ea410cada9a54e965f4f66a106a516fc2f1ec5720c2592c7b3f SHA512 e41cd6dbe67c9239068405ebeac12b626af0327a8a8d5fa032d544813e8249389882a1d88e76b54d7c38e039c1208ddf2bd9f1106279279575fddd3c11d1474c
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-byz/metadata.xml
+++ b/app-dicts/sword-byz/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-byz/sword-byz-1.10.ebuild
+++ b/app-dicts/sword-byz/sword-byz-1.10.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="Byz"

 inherit sword-module

 DESCRIPTION="Byzantine/Majority Text (2000)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Byz"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Byz"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-cbc/Manifest
+++ b/app-dicts/sword-cbc/Manifest
@ -1,3 +1,3 @@
 DIST CBC-1.1.zip 133815 BLAKE2B 8c281751fdc2c4d82713c0e03c7c24127f81f378802b3c01ed4d715b6b180d4053cf1e8710c405012d2b4d2ac5044dd4fed1fd6834e99483b5748decd2fde512 SHA512 3990ca230a0d700e24b2639ab7fa4c97ccc6a382eb810f48c8c6334424384ae91bf97a299c00ba041db8daa82f5481c89cb425d34d84dd4fb298dc29e3f50b78
-EBUILD sword-cbc-1.1.ebuild 323 BLAKE2B f51508b9db20f72cd7fa9ded122d10cb76b7597f9f22cbef87bb962ac3b3a107d48787caa0e6fdd976492b83f3a471d760f3a6e4a2452a8d0cd83001292c92b4 SHA512 8178103adbe7a18174c915c85140ed2df80d582a33ed57f962869acd090971f0a948151b755fc647339410e6c6ee815dc3e34acd231c03c0d56e71a0dd1f7c04
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-cbc-1.1.ebuild 321 BLAKE2B 3cc1bec53937cbc369f58f341dc1fcdccdd11023980159f61535bd610d1fbb296b52e54619ace56e7cb2eb5b7415c676558d814389824aaf53551870c8d34c9e SHA512 049e2dd5ab1fdf80901f204f13667824c9bf846e24ad09d84cb9069bb53057fbf415633b6d4e45064b400f4ec4b88bbd0142d6c47352227a37d3d85eacbe91a6
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-cbc/metadata.xml
+++ b/app-dicts/sword-cbc/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-cbc/sword-cbc-1.1.ebuild
+++ b/app-dicts/sword-cbc/sword-cbc-1.1.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="CBC"

 inherit sword-module

 DESCRIPTION="Condensed Biblical Cyclopedia"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CBC"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CBC"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-chamorro/Manifest
+++ b/app-dicts/sword-chamorro/Manifest
@ -1,3 +1,3 @@
 DIST Chamorro-2.7.zip 287951 BLAKE2B e493f8f1de66b78b5be96855256e36a10e9c51d75cd01412622ed18e2cec15306676c38051571abe7c3f129f233e01b0f4876ba742641addcbe58673e0593b55 SHA512 98aa82f8986b3010b4543dd86ed95902b4ab4a83397f3f1dc8fce5fdf069ef0a20259a3b52b35c08028293aa2a81b8087ce1f3ec38e3f8f08d1ca74d06bd48c6
-EBUILD sword-chamorro-2.7.ebuild 323 BLAKE2B 3198c90b7ad91f7bc69d127d65ee8c756b94b42ad3548666d1c86ab559a6da4ec3c2a183c521707630266e5e47eaaac17ae10f00a8e58d6f565522a9e9a05024 SHA512 78bd7bdd1075d406214358f0593d8b9ff13e151bf91f239a5aafbc8c3fd4cce8f53f8d69353d606aa393d9b5467a3eeb29e67e1ddb2c266e6c2f060a348e9a26
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-chamorro-2.7.ebuild 321 BLAKE2B 5a177fd8da0d7ab501bad204d68893bbb9ca5dc279d92f43dfe7cd5f3b1a1c746a66ea3efaaf6f953659beeeec7f12ef8f918fa7c34a134ed41bc1381fd65383 SHA512 68facd403f57fa4fbda6040597ae7f996afca90a2e54228d766cf354c75cc792d5fc4b21062e839f35f6ddeb1bb73e2e8b1a6806822943aef4abdbcd46be1b2b
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-chamorro/metadata.xml
+++ b/app-dicts/sword-chamorro/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild
+++ b/app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="Chamorro"

 inherit sword-module

 DESCRIPTION="Chamorro: Y Santa Biblia"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Chamorro"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Chamorro"
 LICENSE="freedist"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-clarke/Manifest
+++ b/app-dicts/sword-clarke/Manifest
@ -1,3 +1,3 @@
 DIST Clarke-1.0.zip 9722167 BLAKE2B 2b07fe56d1d188c79d7f4f04707f8ec57f4e062ce3f5822e04e9df7d1cbd1c1aa2803bbcfc83e6b9625ca8e351c9690fb8a78cde4600aea066db72d1e732698b SHA512 f383e897a16a3c2b68d62145a2952cfee1b0fdfea8848d7973ab5b453aaa4706beaaae9ac457bbd512cd8c45a7514b312563b408a238447e6f69d16f8664c849
-EBUILD sword-clarke-1.0.ebuild 337 BLAKE2B 7781dea45a622015c5d6a4d36d03493f4259ce7349f3bc26b35842cb0cd5a181fab7a9956208afe9e447806dacd4dbc96bbb81c8bec24daea327302e8de286f2 SHA512 8088d85cb1908b8d90713571bd9b7c3a533425925b38569efe8815540378e7a49dc4ef3a1312537de88ffadd85cabd2978a4c6ff2349727b2bc3d1d9766fe163
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-clarke-1.0.ebuild 335 BLAKE2B 9de5999e3b1b907d75c038d2e2183d52c34c5d17982ab7a4dc2acab46f20227bf304971a41e7ab37f35755ed15ca9737b9f1e4c7c12fa53255f1dd14a7221b7d SHA512 c64cccaca7576db7053bec25f64be2983f6ba89ab688bbd5a44e6d2e158ffbd1f8cb26e5642b626c59d46c1cf913344ed6a5feae4d19266067ea05d198a1e3d5
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/app-dicts/sword-clarke/metadata.xml
+++ b/app-dicts/sword-clarke/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>theology@gentoo.org</email>
-	<name>Theology</name>
-</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/sword-clarke/sword-clarke-1.0.ebuild
+++ b/app-dicts/sword-clarke/sword-clarke-1.0.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7
 SWORD_MODULE="Clarke"

 inherit sword-module

 DESCRIPTION="Adam Clarke's Commentary on the Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Clarke"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Clarke"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-common/Manifest
+++ b/app-dicts/sword-common/Manifest
@ -1,3 +1,3 @@
 DIST Common-1.3.zip 357456 BLAKE2B f96fc2ae120775c90d3b9fb7347fdf99770cce37fc8561f494c2b2d7da614a88c09f807d4b24a8f2e81645eb967660e2251e38bd5978ce1d660dc77d2b165e84 SHA512 b92d4c346883ca45d703208c5e3b70390a6a012e5d62fadc3fe937dd00b90e56eac4b0d7f845c008054d2ca3f7fafa12e90742b774633d0c0f951eed09960cc7
-EBUILD sword-common-1.3.ebuild 332 BLAKE2B 596f6dcc9aaa008565ef91d6553e9fac941005082e3c3ca0309bd356903643581e4ebc3259b1df93b014e3472af9255af1affaebd614329af713dd595e78b26d SHA512 60a4c99e5dc3533f2c17803791db99f49543390786228b1fff1f4c648bc883961422f83434addd285d9dcad9916f979a8cde7c5e93b09adfe14d7a0d36c87834
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
+EBUILD sword-common-1.3.ebuild 330 BLAKE2B e8a62835c29177047fc77efd1137ff874d68ff33fac540da4d6e84964601435cd8c0ba302ad9f5bf48e64f26b6bcc77ae573ad868a216c060c4d0c1ed2f654f4 SHA512 9b080d4e687ba0b25d6af339ca5ab374cdf6016c22c089ec0092f74f7967f4c553c8189693ad3634bd94ce36cee50c1c0b96a1b4b48df05f022f39d79ae17627
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
--- a/Show More
+++ b/Show More