diff --git a/Manifest b/Manifest
index 3c249b62a73d..cea6d0e1e80c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29455 BLAKE2B 1f18cd9803ff2aa3ce5239d71216c1a32ca27e6e509f0b73f45456405dd786d2ff17103abbc5f4dfc937b896de0282ecf1b3ad96dd17b2890527aef0510a24ef SHA512 c65d0cf9df1751636a5695d7e60253c3a00ee280121c3328579f9d473b61f29230f5ad0627fa380f655d2b0b037620cf6754c90d47ecee0c0e3d4884972e511b
-TIMESTAMP 2020-04-28T05:39:02Z
+MANIFEST Manifest.files.gz 29437 BLAKE2B 477413267362119248346c1cdf178df151a846e46999ceac8d455d66a8a8c53a3478000f40855dad625260d9cea8936e22bce63556562547dec714ea57e5f4de SHA512 6ab985ef178df9771612692ad52aa61a2585991bef90dbcc17f51758633434eb99773193582ae4e26015ed576f5f662a50008c020b23d2b23db588d78d18ef20
+TIMESTAMP 2020-04-28T09:09:00Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl6nwXZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl6n8qxfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBwGA/+IKM/+OMEqEXkz6G5ftiJ96pxJGIU6xA8xtE/XWtewvKV4+FzLpU8ObLe
-clHK/R1DkyXHLrDyxWrJfRohnlLMzJEPdDn8C0pwyzFf6EfoQo43l+oRrj6NDVnt
-Rg/hYVucJZM5famQGLJgk0TUexcY3C7UUehD+9frrRffeCyLkB+5CcCxHyNNmBK3
-7h6d//qSZqGyjwAxSK9GPkpVo9rFgIu83msQuuad+bwvTPUIJKKJvGmKYYEYFBFD
-oBIyBZm9JH8CS/+OjFtincbALqttEmpiPLoSXH9RKfp+g2UpFS87y06L6HcV6vMd
-3VyaGpcevMRQnGY1pEKgGxmX4VzSNMGFO9ORYvVKGvS31hPWEGWA+lL2pAINCdxP
-3ODDLjkDBAXF3lhai25S1Yg4dnGH4TTNETtJNLN6X/XHsa4aa8rFBgUHQE+X5bqP
-I1sUDQ9SqSYSu5rkYak+PI9rwKPVSwHRx3vd/vHf8+iD9yOh+JQVcwUtNYPArvrz
-emUgTlp3l0KnYU8rwdxj8Al+iFHI+pxyzHmU0xDPrG4SQSsC/9ha9xnLvnNxy1af
-w21lMqOlOWaSCozbvWQi5D0FIj0un1aUXXUEf0fA0CFfvgZWDA1B6XIjxk6pCS/x
-E0UbdC0r//P4Oe8g5wCadmedhCXQti1lHcuhf1yqAVhx2CWHpTI=
-=Fblq
+klBUHA/+PyV2RZ6BEpaMhD7AQFYiydSrgWe1Mjlq7vhT7pl/gD5NC+I9WNt35KnG
+1rvuazObbvrD4Cg8duY58myRQmJ17/ZOuL8z2JrqFBsUmFjbw5blQ5fuE5LwATaG
+b2tClhOBFOY1VsLII2DJfWMn3C2uwiBA7UHTisQDdaQ4m3hZZuzdy0apq8rU4tP1
+IjmgiLX7Gft8d7FXCVFXo8j/LLFeZfn9/ep+VJ8jeI0uXiELuuscvCC8GvnSNkRP
+rHok4ezjdT23aiFsQKFC/FSM0HTa1iao/ueubhSA8FvKzX8vJ68Naocs+3sL2If3
+6Bprh8MTX4PUSXvE0pEasT1RWu3wC1+0a8Xj61TxGOKti64fICrGrWUUQBh+/byJ
+SDMKW7XTYzG69ABbwBZ+oDzOPFcqUq+xlPgr+HypsffOc3NUTfdQGWS0iYbeWrAd
+DvI+p1bx92rjW9VdnLivBGRdge1ms6KzwjKOMxk3ArXzxpRDzXZEH024htwnGUg4
+uFDpSljtlKiC3K30MFePih+QVlLTgLrA2H5oz0hbhznAs4qBtNAQS4Lgfyc2VejH
+pa88bdYQZN1OaAXRIx2IXBFCz38NHimebwOwPE3ya8Vm1XErx747iNKEw50jpCt+
+pNmVK86Apovcc613kzgNt63eP5xZXHvzWLNZhO2GCiTi+ht1a+k=
+=ahQ3
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6310d2a0bc86..e08f7c2d60e4 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index eeab73deda25..9eeb97665fac 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 58db7d0f039b..271889ba3fe4 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -3,8 +3,9 @@ AUX tcsd.confd 372 BLAKE2B 535a5bb44cd18e4d0b7520a8ea840159d35e4ae0c557b63ec7892
AUX tcsd.initd 843 BLAKE2B 1c2190a10823130ed69c79761063656e55cdadafeca99053d12a86f110091936f44475f5ea6adaf90e7eb70f3871fcf6452c96c86b5bc88ae28a1a5144e2a95b SHA512 d43dac0f8a7b878fb7572df8e3314ef2e6c1b90ff794df2f41192e7e4f3c8849602dde49db359e6566f1e426b63fc214c6b9dea731fcb7f3c09623e3c27b2001
AUX tcsd.service 131 BLAKE2B db7995ca078c6008daba2bee50b892d5ae0fceb184c966f67578185dbdd81b8a3a55000029215d28d99e8e3ccd73f64b85b66cc4f4a337f28ee9d9ade4222067 SHA512 e516bde8ce45fe4ad687aaaabae475da9c20a9fbd8ebee736d09ceb6efa597efb6f3bb99840a4c0d2c9eb77c2824df6ee45985b46dc8cf924b4eed67eeec1468
AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99cfe99d04d8196b57a158bd2ce75335526b2001c2af8aa0f8b17ddfefa304685e237385be0bc4113d5ca366dd464fa85d SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783
+AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227e5b246f02880d38b29dc6a17d12a4932059f237913f8d1841d56ee32c652cf732c01e77cd1235255b8e2fc28bc9a78027 SHA512 cf771b065d972b9974c93ec67a471a8ed3da737178a14b2d14537ee7948544bcbf071201d42d6e2b1333a3c30e8104cd1dbb344327a424597e5046e50137a692
AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
EBUILD trousers-0.3.14-r1.ebuild 3005 BLAKE2B 625aca034e7f6c85660c31f2ea2aeea18dc9b555213c8238c54d1e348a1a46db01f6e852ab2ae26ac42d396ba928a75bc0ba9d898bbd74b69b4c0b66310bb604 SHA512 bcbd7d7925f0ad42365c73a0419effe6c2e0b63904b1d2730305251b4ed6c95e5d36b6266a1409714075af714055b4500895399cf0b59ec8baa7bbaffb773502
-EBUILD trousers-0.3.14-r2.ebuild 2950 BLAKE2B 2251a0f410623b1dac675ac40f737874463508550521acad0d1f612c1719537d797814d4978a58ce2d52f4315c8c73202fc780d4ef9235019b57e066bab5f173 SHA512 050ccacc085d1f7960423a81a2a47b08891bc539b1c2294f63a744be1416ad51a121ca6e2d141c1b7bff60fb7e6e3d1d2905782c76e417abf06dd0bac165fdcb
+EBUILD trousers-0.3.14-r2.ebuild 1584 BLAKE2B 83f09a6d466e4eb3bb0a20226a8306cca1f793c0079392bd1639f22f337aeeacf1460c88d382a684a5a80edb1aeb90148dc0e98b03ddf8bee1ce1bc0d73a248e SHA512 7e74633d4886d4ab0c57643a96968fc75d9987a0f0a89a81f4470be6e3ce00684a26fa2252d5041c1a2a91b405e03003eb7537fd24bb03e98ec4fe5139adec32
MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7
diff --git a/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch b/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch
new file mode 100644
index 000000000000..5046bc70883b
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch
@@ -0,0 +1,15 @@
+diff --git a/src/include/tcsd.h b/src/include/tcsd.h
+index 5b9462b..05bae97 100644
+--- a/src/include/tcsd.h
++++ b/src/include/tcsd.h
+@@ -166,8 +166,8 @@ void thread_signal_init();
+
+ /* signal handling */
+ #ifndef __APPLE__
+-struct sigaction tcsd_sa_int;
+-struct sigaction tcsd_sa_chld;
++extern struct sigaction tcsd_sa_int;
++extern struct sigaction tcsd_sa_chld;
+ #endif
+
+ #endif
diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
index 98591153d561..b94cc955e2d7 100644
--- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
@@ -29,6 +29,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
"${FILESDIR}/${P}-libressl.patch"
+ "${FILESDIR}/${P}-fno-common.patch"
)
DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
@@ -37,45 +38,9 @@ DOC_CONTENTS="
If you have problems starting tcsd, please check permissions and
ownership on /dev/tpm* and ~tss/system.data
"
-
S="${WORKDIR}"
-pkg_setup() {
- # Check for driver (not sure it can be an rdep, because ot depends on the
- # version of virtual/linux-sources... Is that supported by portage?)
- linux-info_pkg_setup
- local tpm_kernel_version tpm_kernel_present tpm_module
- kernel_is ge 2 6 12 && tpm_kernel_version="yes"
- if linux_config_exists; then
- linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
- else
- ewarn "No kernel configuration could be found."
- fi
- has_version app-crypt/tpm-emulator && tpm_module="yes"
- if [[ -n "${tpm_kernel_present}" ]]; then
- einfo "Good, you seem to have in-kernel TPM support."
- elif [[ -n "${tpm_module}" ]]; then
- einfo "Good, you seem to have TPM support with the external module."
- if [[ -n "${tpm_kernel_version}" ]]; then
- elog
- elog "Note that since you have a >=2.6.12 kernel, you could use"
- elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
- fi
- elif [[ -n "${tpm_kernel_version}" ]]; then
- eerror
- eerror "To use this package, you will have to activate TPM support"
- eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
- eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
- eerror
- else
- eerror
- eerror "To use this package, you should install a TPM driver."
- eerror "You can have the following options:"
- eerror " - install app-crypt/tpm-emulator"
- eerror " - switch to a >=2.6.12 kernel and compile the kernel module"
- eerror
- fi
-}
+CONFIG_CHECK="~TCG_TPM"
src_prepare() {
default
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 7f29ed20f347..d2899d809a72 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index ae99d2254e5d..1d23282e00ca 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -2,8 +2,10 @@ DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f3
DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e5a6d34ade06462febd6a2b596aa572dd7e16c7541b0fcc23ff5f97f462b8869440782fd51f71ddd16d4c9 SHA512 d0a46ed2a21057a4fa866ae9305c9893360376d8591a9414eab96f9cb91991a43f3bf824bbb9a00c606555686aafdc0dc4b4bb41bcc94fe5dc90064342914c5a
DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
DIST scite-4.3.2.tgz 2710026 BLAKE2B dd53eb2c3214033976ae4c5f63f75ea19d691ac9362e9d8ed527aff6b34d16e029d404d9731e3097cdf36d4c4594b427aa26bc9b83cb6a6ed05741e61fe4dfd4 SHA512 fd29369787f16c8357ae4bfd82b7f621ebb399e93e77c7540296c2a3c8b4e403071359f67f59bb5bd59216ae7e9cfa8aabfc38e200d59bea2c13e96991a3c9b8
+DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b615cd6c02f2e79f1788433dd3ecd6a565599d43a0c4da34ac30e9434037a042d77170f14969d3b008a742f SHA512 85bc76bc9bb817fb0f7ddecad5e01d83d7090e788c2f74b9b23a86284f452a62c2fed64d0cf7c24cb57043228b8c91212742b644756d2ab185b10ead8785b82b
EBUILD scite-4.1.3.ebuild 2976 BLAKE2B d92923eb83d02613e10241f727c8324a51e60df0954ba49e0d33031dde3d7ee0447b6bff96b6fa8a47432d0bcc3ca33dd7062c4081910bc735030a552165a35f SHA512 60bc482c10148a40a9a377925e3d19e4cf3d7e6d32a1fd320dc24c9e46eaa46e3752f65e9393cbd31dc50fd0d84a974a90ddc0d9c0bc0f3bf1c8a2fbd59ccbe1
EBUILD scite-4.2.0.ebuild 2979 BLAKE2B 9699168e861dc67fe186091890ce2dcc0799407c915c4357d23313557d133bbc02aa2835eaf578b1e277241de15633c9d47c93e550d734a85b1734e8a2c79204 SHA512 8a42fb020c8c1ca8befc3f084eb5fecb783fd7017283c52269a3770984d1173b8ea9500e1bfa6d980a1e22ab3ab2b518df0e32ee838bd01de9ccc69dc9f9b0ef
EBUILD scite-4.2.1.ebuild 2939 BLAKE2B b1068efcac9794f133bcb5b059f030d8d804c501d229525b8985112f2c245be60a0b3a49e3a46dae901d37790f669784ba542005fe266aae99eb4240a64965e1 SHA512 921c777969f1f7a307eba9b073d151691c4b11faeec2e84c88ecb0cf5b6c7965109b1a35924e3a59859878976da842345a0042d5667e03672bf2a439f619de47
EBUILD scite-4.3.2.ebuild 2823 BLAKE2B a02e1ca319d0b1b5e60ab1ba28266cce1458cb1b01e314b3eb6ca06f70a065a26c20c965852d0d56f1c44da0745f92ea2d9b6ba8b21d3bed26b0f72c7bbae887 SHA512 e234e7259d0f93c32c9b487f0eef966746d84989d44d81b5234b8728a907453beef39ee43e7f67d4ac934cc8c32441589b1a0438ec565784acf7c9a96ede65a0
+EBUILD scite-4.3.3.ebuild 2823 BLAKE2B a02e1ca319d0b1b5e60ab1ba28266cce1458cb1b01e314b3eb6ca06f70a065a26c20c965852d0d56f1c44da0745f92ea2d9b6ba8b21d3bed26b0f72c7bbae887 SHA512 e234e7259d0f93c32c9b487f0eef966746d84989d44d81b5234b8728a907453beef39ee43e7f67d4ac934cc8c32441589b1a0438ec565784acf7c9a96ede65a0
MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
new file mode 100644
index 000000000000..e34188a5587f
--- /dev/null
+++ b/app-editors/scite/scite-4.3.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="http://www.scintilla.org/SciTE.html"
+SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
+
+LICENSE="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+RDEPEND="
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/pango
+ lua? ( >=dev-lang/lua-5:= )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig"
+
+DOCS=("../README")
+
+S="${WORKDIR}/${PN}/gtk"
+
+pkg_pretend() {
+ if tc-is-clang ; then
+ # need c++17 features
+ [[ "${MERGE_TYPE}" != "binary" &&
+ $(clang-major-version) -lt 5 ]] &&
+ die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
+ ($(clang-major-version))."
+
+ elif tc-is-gcc; then
+ # older gcc is not supported
+ [[ "${MERGE_TYPE}" != "binary" &&
+ $(gcc-major-version) -lt 7 ]] &&
+ die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
+ else
+ die "Either gcc or clang should be configured for building scite"
+ fi
+}
+
+src_prepare() {
+ # remove hardcoded CC, Optimizations and clang unknown flags
+ sed -i "${WORKDIR}/scintilla/gtk/makefile" \
+ -e "s#^CC = gcc#CC = ${CC}#" \
+ -e "s#^CC = clang#CC = ${CC}#" \
+ -e "s#^CXX = clang++#CC = ${CXX}#" \
+ -e "s#-Os##" \
+ -e "s#-Wno-misleading-indentation##" \
+ || die "error patching /scintilla/gtk/makefile"
+
+ sed -i "${S}/makefile" \
+ -e "s#^CC = clang#CC = ${CC}#" \
+ -e "s#^CXX = clang++#CC = ${CXX}#" \
+ -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+ -e "s#-Os##" \
+ || die "error patching gtk/makefile"
+
+ # repair and enhance the .desktop file
+ sed -i "${S}/SciTE.desktop" \
+ -e "s#text/plain#text/\*;application/xhtml+xml#" \
+ -e "s#^Categories=\(.*\)#Categories=Development;#" \
+ || die "error patching /scite/gtk/SciTe.desktop"
+
+ # add the ebuild suffix as shell type for working with ebuilds
+ sed -i "${WORKDIR}/scite/src/perl.properties" \
+ -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
+ || die "error patching /scite/src/perl.prperties"
+
+ # it seems that pwd here is ${S}, but user patches are relative to ${workdir}
+ # Bug #576162
+
+ cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
+ eapply_user
+}
+
+src_compile() {
+ # prepare make options
+ local emake_pars=("GTK3=1")
+
+ tc-is-clang && emake_pars+=("CLANG=1")
+ use !lua && emake_pars+=("NO_LUA=1")
+
+ emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
+ emake "${emake_pars[@]}"
+}
+
+# want to use the base src_install() as base_src_install()
+
+src_install() {
+ default
+ dosym SciTE /usr/bin/scite
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a2fa608f2e83..b902f3325ac4 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 170d9276dbf2..3fb0943c3667 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,4 +1,6 @@
DIST diskimage-builder-2.35.0.tar.gz 439947 BLAKE2B 9b148948caef031f44992aaa2b0463b6cc9390b0591fdfe6e82d8258becda61eb5aa0d87ae91ed73523057ae357dcf327d7ca9d8d6a1b66da7f2d535d6c32dc1 SHA512 c5ad15c7a793a6c4b17e09fb119ad1444273f930741ae68491ce3a95f416cf8bb76ed0f6df4e34e03359355426c9189f2f5a8b730cb9ffd027a0bbd676f62310
+DIST diskimage-builder-2.36.0.tar.gz 441509 BLAKE2B 4f8ec1686df8438c53eb088e52b954d0b84c8f327108599970f987db8de0f5ea7491e123c5f41fa9ff058d8f9d30238a533357b01e1cb671dd1fb3eb96ad28cb SHA512 f3fc13195742b25b8cca72d8b5630900d77f5af69dd9d153c44875e9e8f8f27393a8478a4adcdc05ea9d5b73b742e066edb5ab636bfd8d88c404c8f0fe33f1e7
EBUILD diskimage-builder-2.35.0.ebuild 1129 BLAKE2B 660fdba0c75e9f9b71dd1b8edc7f979e8a8a055c78078bf10ce7fb145070a74a6fc88844d765fac5f2847b6f797601b9d00c84827e80f62329359fdf7fdb859d SHA512 8e40801a1da5446b1b16c5712d089def56cbf6c25ca74dd64c287fe9157abe399ac6cec752508aa9e9b8651492e39bdf9946d052d07636b1f1bc03abe18e1f23
+EBUILD diskimage-builder-2.36.0.ebuild 1131 BLAKE2B d077e0bcc6df338cfbab02a90bf1cada112848619de1a660afb0e79d282d1698e6ab39acb47dffb5b8582ac2cd465b63b60febbff791d84f3cdb2c015f194cf5 SHA512 ab2e56b8e7068487ac60422a81b0ba60a59b8bb30e20108a82d1bb809d3ed6987ae0226632e91a7eb3b30d92145792858f0d6b7cd4eaf8fa15caf6d863bfeb0b
EBUILD diskimage-builder-9999.ebuild 1131 BLAKE2B d077e0bcc6df338cfbab02a90bf1cada112848619de1a660afb0e79d282d1698e6ab39acb47dffb5b8582ac2cd465b63b60febbff791d84f3cdb2c015f194cf5 SHA512 ab2e56b8e7068487ac60422a81b0ba60a59b8bb30e20108a82d1bb809d3ed6987ae0226632e91a7eb3b30d92145792858f0d6b7cd4eaf8fa15caf6d863bfeb0b
MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.36.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.36.0.ebuild
new file mode 100644
index 000000000000..092a05de7652
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.36.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+ >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+ !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ app-emulation/qemu
+ sys-block/parted
+ sys-fs/multipath-tools
+ sys-fs/dosfstools
+ sys-apps/gptfdisk
+ !dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 428b3faf44e9..774b522d0cf7 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/kuroo/Manifest b/app-portage/kuroo/Manifest
index 52a31606ae54..405b7c8308bb 100644
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@@ -1,5 +1,5 @@
AUX kuroo-0.90.5_p20180410-qt-5.11.patch 1178 BLAKE2B 944d08100d9b3a75bddc9fa44127ed4d71c043c96c1ed267ec2ecd4a4ccffad4f7c65f0be539ebc40392834b4217e057c611dd6912b33d2904a7b4ba2484a0ba SHA512 fb7e746ce8354ce71a38d4a850ffa7cb270727b26d08353cb5d8661583e02e7e0b45013f03aac71a0058e2f0a567ab963669336bde8819bc212083eb19be2c1d
DIST kuroo-0.90.5_p20180410.tar.xz 241920 BLAKE2B d182df57f0c6628b849f6f6e4d7919281117396ea30360e6eb0993b3c61ba67956a8e0648926f77e23d8222a8337108599f657cb7e49091fd51b98febb6593ce SHA512 f1894c90b8b6df06818cab6cc3fb55a3348f8a9df669b515796dabe9a0df3773d69ba89a4aa3569250b2fb379c1169d8789c82fcd3868ddb9f640f010aee811d
-EBUILD kuroo-0.90.5_p20180410.ebuild 1377 BLAKE2B f024e0cc1e5d5e36ef956a930ad5292e0a8bba33b204a7ff95268d03607a9650fdb3101f2a0118b65038a3066b9e79fe52618b8cc924e20688a5cd5917793eec SHA512 9ed7aaf28ab4321c919f60ca1d6e97b5445882829ecd7bc910ab6b022ad90c9569b9b3a4d7b9fe3c97028bda378693db578d0087827c6ad5d18868b87b0b7d31
+EBUILD kuroo-0.90.5_p20180410.ebuild 1384 BLAKE2B 644a144a5a39494938163492fd9b812116ca0758561bb8e2203b99ec2dbac7c4175e7f892480bb751ac3fd91c9a0e3124de2f0a3344021e8aee594ff14fbd1ed SHA512 bd034155f09c646e6c8c9ccf8d6bd7ea597f9546b3a821cd83b2cb4a1bb503ee5e3cf2615ae225f96a3bc21d24f3a6759fd129bb3f11aabf7eea4211391ad1a2
EBUILD kuroo-9999.ebuild 1133 BLAKE2B 5a0366878956d76cbf889aba9f644d7347381c3652ad4c5ea819b0e7c4c6a33a505eee697270a2e8b41a9ca6db6f6fd6f1ab77381f9c643b562a8e42e78b266b SHA512 c984911f4c74eec46a55046dfef46bddb0d42c0374a07185a9b773370fceaab54dbaa5e3b48c0bc8af1100727420b84302beefc3c2f9ebb01473ef7094a082e6
MISC metadata.xml 757 BLAKE2B 338d2d4cb0c2d198f8d38ccaa33dac9b9b745baaecbd642f6a0cbf4a3471642db421918eb292a1e7ebed9305429decd70c1cb27f98328cea17f3dc87c893fc53 SHA512 86b24f163496aff68fdfe3ad7fb1648100d1f9757dd18194899b512242236b8e3130b70f74576adbdcc7f570ddccea6655714875f39b52fb6bf4c2bc46b55b11
diff --git a/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild b/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
index 0a8e445eadb1..c48facaa7beb 100644
--- a/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
+++ b/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit cmake-utils
+inherit cmake-utils xdg-utils
DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
HOMEPAGE="https://sourceforge.net/projects/kuroo/"
diff --git a/dev-perl/Apache-Session/Apache-Session-1.930.0-r1.ebuild b/dev-perl/Apache-Session/Apache-Session-1.930.0-r1.ebuild
new file mode 100644
index 000000000000..d4c49083299b
--- /dev/null
+++ b/dev-perl/Apache-Session/Apache-Session-1.930.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=CHORNY
+DIST_VERSION=1.93
+inherit perl-module
+
+DESCRIPTION="A persistence framework for session data"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Digest-MD5
+ virtual/perl-File-Temp
+ virtual/perl-IO
+ virtual/perl-Storable
+"
+DEPEND="
+ dev-perl/Module-Build
+"
+BDEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ test? (
+ >=dev-perl/Test-Deep-0.82.0
+ >=dev-perl/Test-Exception-0.150.0
+ >=virtual/perl-Test-Simple-0.470.0
+ )
+"
diff --git a/dev-perl/Apache-Session/Manifest b/dev-perl/Apache-Session/Manifest
index 1d378c2ff45e..4bfb3c6629d5 100644
--- a/dev-perl/Apache-Session/Manifest
+++ b/dev-perl/Apache-Session/Manifest
@@ -1,3 +1,4 @@
DIST Apache-Session-1.93.tar.gz 49995 BLAKE2B 85185f30ae25d83ca0ed3bd7e926c7ccfe55495891af98cd06305effc8163f6c2afae7d4f79e3e5dface8453b1ab3a8859f0e951c261eb417ab784a08123de72 SHA512 568653b5151df61dbbc4b034043e1d4be75642122ab920a13155c4abbe052e4d96915b1453eb9f2f06bd1159d95efef7ed5905b4d2f2b8c6fdd3711d0cf5dbe4
+EBUILD Apache-Session-1.930.0-r1.ebuild 606 BLAKE2B de83b09d726abe8215c8ec189f6fc0d13ddfb36f06902aaa451b6b98efe94e39ca65de28669502d3e24c29951cf030451688f845cf949399d99ca0c18142b552 SHA512 2e958e3edb941f5d40cfa6bc740c125b4ffc6a03f631a0ed5ee03e9e58a9f20807f2ef0ae300ebc0f22886e13ddbf44f7acd065c247ff1aa25e3662fa56a3886
EBUILD Apache-Session-1.930.0.ebuild 585 BLAKE2B f984c8e9bc7edb606376b8bd97e3ed0b0eb22f1e1e3ad6cfe277a58ca86cc5d03ed1caf1c92d384a30e8ee6abafce00fc753efb2371f5611eecd07b70c9b9fd5 SHA512 ead76027406fc529582447b0645dfba65bc4137f96f846625ec50ec5c4c84f98f182f179ac65efcdad798d1612f201e8ec437b5a9307676c1bfd9af4d30f15fd
-MISC metadata.xml 2529 BLAKE2B 8f67bc2030f0a273206442240d13fbdfcf83418950989f128a8b7aebeb08a0f9b1d67abe0a24122d4dc73bb7b741ad7903e0aca381bf94132eb72f50eed43ce4 SHA512 439843c77122fac1291629ad36918f3b5c0daa9185719f0d2cd1f906e2538937eeaf95e672c1b2b95fc9b039c13eab7d367d84ae5549e9dadb73f9e322b3b56b
+MISC metadata.xml 2606 BLAKE2B 76ec50e0d175c37ebcd317fd96a774b8781d04b01b38762af94c039fe30c29ad59e5dc6afeaf09d5067bf5f5c8fa85ae226edc94af0bcc643bf0c7cf83db2227 SHA512 69d220ff13cdbfe9d68e1e663180c443096be9d9887527bbc0674815c0f3760090cf3a59e0a46981ead630d217e0bc2182be2091715f8c3fe64b2e1838b627c3
diff --git a/dev-perl/Apache-Session/metadata.xml b/dev-perl/Apache-Session/metadata.xml
index d6c93cba34bb..239c534c9812 100644
--- a/dev-perl/Apache-Session/metadata.xml
+++ b/dev-perl/Apache-Session/metadata.xml
@@ -21,6 +21,7 @@
Apache::Session::Lock::Semaphore
Apache::Session::Lock::Sybase
Apache::Session::MySQL
+ Apache::Session::MySQL::NoLock
Apache::Session::Oracle
Apache::Session::Postgres
Apache::Session::Serialize::Base64
diff --git a/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r2.ebuild b/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r2.ebuild
new file mode 100644
index 000000000000..1c85a20d4b59
--- /dev/null
+++ b/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PHRED
+DIST_VERSION=0.97
+inherit perl-module
+
+DESCRIPTION="Graceful exit for large children"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PERL_RM_FILES=(
+ t/pod.t
+)
+# mod_perl < 2.0.5 bundles Apache-SizeLimit
+RDEPEND="dev-perl/Linux-Pid
+ !=www-apache/mod_perl-2.0.5"
+BDEPEND="${RDEPEND}
+ test? (
+ dev-perl/Linux-Smaps
+ >=dev-perl/Apache-Test-1.360.0
+ !www-apache/mpm_itk
+ )
+"
diff --git a/dev-perl/Apache-SizeLimit/Manifest b/dev-perl/Apache-SizeLimit/Manifest
index c41c9c926411..b4f23e811ddf 100644
--- a/dev-perl/Apache-SizeLimit/Manifest
+++ b/dev-perl/Apache-SizeLimit/Manifest
@@ -1,3 +1,4 @@
DIST Apache-SizeLimit-0.97.tar.gz 24544 BLAKE2B 590d5861b064109688172ff362303cc5cb223e31b730558fac91e512c0df868897b8dd8ac5b59a636bc70952455c19cacf3d8a46209bcc668a6f6cf4e3b54643 SHA512 d3c4e97e3f9c7e3bb9a8868dd89ee14443f8596c900b85ea4b6d766b9d71001e3e920871adf58829c8d17d03dea6fd48901d2082b83c7382cf0bf30b8238472a
EBUILD Apache-SizeLimit-0.970.0-r1.ebuild 547 BLAKE2B ff66b4d9f6f27cc84ab00249a409fa7239d20311f248bc667b1ec99e7ba0d5f31a4a4647710195edbdcb6f9ea0b342012022191f725f3702c36dbf4a69272535 SHA512 796fb3b4eadce500a14ccc9f5fd2638a401390fffb3ee0b60f727ac56dacae59a42bf8abfd14915683c8fadd611bee92cb6dab971d88f7ee7cc7b6d33fd40e8a
+EBUILD Apache-SizeLimit-0.970.0-r2.ebuild 581 BLAKE2B 34d2802a621860413399f803df8e3f915bedd49338a61912f4104009d6429ef890be742693ddac47d798ba06267ca5b81d281b42f68115381050099b1db3f400 SHA512 c5914fcc44209d66d5fbddea7ba654339dc6a6b3c07e8ae3519e2bda78492537628a8ddc031f1f26bb5f26bb48166033049e3c1834c63d06a07c06f246fa68b4
MISC metadata.xml 523 BLAKE2B d17bea188138f950393e9696b1a93ef405698374a935248879bec723803ab2c68a86e52bdf87989ae20f2864d7bad81e9d8f64c5e2fba6b8d79f628eb9f35198 SHA512 d02d4b4f93d3f8fa60a066fd5e8d0db3fbc37869158fd52b18ead756378d440a2035b1cf4f88ebaf6d71c4561ad3b630b65abdd739c9b0d64bc28ba9856c3949
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 5e434eb69a65..52664987ddcf 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/PPI/Manifest b/dev-perl/PPI/Manifest
index 9338b432209c..60610654004a 100644
--- a/dev-perl/PPI/Manifest
+++ b/dev-perl/PPI/Manifest
@@ -1,4 +1,3 @@
-AUX PPI-1.224.0-t-marpa-dot-inc.patch 670 BLAKE2B 87feb1cff3cc7a6ed77c11f1854268c678a8309f6bc402d290670482192c78ac0c6abdd21f7de083fd78f0c372e8cbb3c144a5b3ba83a8c0c858813b6492228b SHA512 b729bc4b64c7e25f6c44d689084778240f5450fa502f3fc3c3649d0ddf59eb89fa53108ceba9b87ac50a5de6847d134771aeea41a89014d62623ad582df9a579
DIST PPI-1.236.tar.gz 257245 BLAKE2B 7f49ba8baa67b6597b774420d379e832412f666995701e5c6ab56d8ecbdb7a2542e7b2bb18ed76e944ccd47ba8bda970d0fd170683d9236f20991902eb401f86 SHA512 93a7f4059b12156bdcba77958c17841ab43d85cb0045d0c58d087d6e637e09e253a559cfe465d9d8699329098582759cb8381978c121b9661a9a755e919dece1
EBUILD PPI-1.236.0.ebuild 1045 BLAKE2B 5d5da9637071120381da425eceabeece8c7ccc0f2e5861d937a1a6bdba0b460341c0b00ffebd8baba18485c4cbd862644b556fc5f61477ade0b556afed6ab971 SHA512 18ae94a129388a87dcc3d9d8e98dc10686c1ce3c16385cdb09a03804180de038c8f22456eed8af0804fd2e02ac3bee6370b6e18f66369c61e7dda4020bea38b0
MISC metadata.xml 6633 BLAKE2B 66b064eed0aab9a099bb6ea9e621e10f4c5c06b052abf393a5edaccdb5ddbf068382ad767a2d9fb6a68e70766234ace27da4ceddbe0b2174167d27e56d705717 SHA512 a6f5d77c3a8a13f3c454185c090d595b400b665a9aa2dc7e7edbc0c643109bc251d6522a330510080c5ce905f84cfd8892ed0783032a6e45dccc710df5569ec2
diff --git a/dev-perl/PPI/files/PPI-1.224.0-t-marpa-dot-inc.patch b/dev-perl/PPI/files/PPI-1.224.0-t-marpa-dot-inc.patch
deleted file mode 100644
index 2a02e1d71dc9..000000000000
--- a/dev-perl/PPI/files/PPI-1.224.0-t-marpa-dot-inc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 74e2e77fdce3e2f366342ad736c25e49379d2013 Mon Sep 17 00:00:00 2001
-From: Kent Fredric
-Date: Tue, 20 Jun 2017 03:04:48 +1200
-Subject: [PATCH] t/marpa.t: Fix test reliance on '.' in @INC
-
-Fixes https://github.com/adamkennedy/PPI/issues/200
----
- t/marpa.t | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/t/marpa.t b/t/marpa.t
-index a25fc2e..6e79003 100644
---- a/t/marpa.t
-+++ b/t/marpa.t
-@@ -2,7 +2,8 @@
-
- # Unit testing for PPI::Token::Unknown
-
--use t::lib::PPI::Test::pragmas;
-+use lib 't/lib';
-+use PPI::Test::pragmas;
- use Test::More tests => 23 + ( $ENV{AUTHOR_TESTING} ? 1 : 0 );
- use B 'perlstring';
-
---
-2.13.1
-
diff --git a/dev-perl/Params-Classify/Manifest b/dev-perl/Params-Classify/Manifest
index 9f94ca835fa1..9a234773d2b0 100644
--- a/dev-perl/Params-Classify/Manifest
+++ b/dev-perl/Params-Classify/Manifest
@@ -1,5 +1,3 @@
-AUX Params-Classify-0.13.0-no-dot-inc.patch 2275 BLAKE2B 1208c7912ae1bc2a5662671ca61136df730151732de7ace4646136806a0591eb37ee7fbd62d87a434d712f2875fa11458034fd56f8cb7c5c1e970b137c8f0714 SHA512 f7225360fff798351a4c5abf573033bed4c3ee099a410d06c56fce7d392655fc6eae4cbe35a006d8eb9df036d2fa3407febdd7ecf7e30b9f1bbff955802ed62b
-AUX Params-Classify-0.13.0-op_sibling.patch 2504 BLAKE2B b191de076d3b275c90d02f6f8eb4b3ded0b4fc109de4d0a9ed19120ba537a8157ac46ef238119c15662e308beb3378be4c3abd0b025c87b3e67f4d0c237e069c SHA512 e4c5cc9ee207922f48d1711b25f62b57bf2c03c9e52c6d0cb96713df421c95de014daf8d85910488b8d04f3545540139e5adb012925752c0da8578b29b311231
DIST Params-Classify-0.015.tar.gz 22061 BLAKE2B c905a067415d6c2846fed8c52689cd93ad81fed70414369aa7d36a314c40668ab0ddc025fe296777fdd959161e79330cca41374044a2e5ad5887d96ae76548d4 SHA512 1c41590a3f06d21d5f23e12371b0aee5d4249f773bfb0738e955fbdccdccc6e495744c50d3b91305a6b470e022475446705c8eb8e8d05ca1ed037d369a67617c
EBUILD Params-Classify-0.15.0.ebuild 783 BLAKE2B d25d7234b4218af1dbaf3ac40dc70ebc7dfd6b70c9cbf49886ffd6c38538e4542dc21c45d31a0527c5b49118438bc0c95a15f23531672128676fb2ab7dc2deea SHA512 37eb0af2fa2e196d98d3bcd74d5f141a6d5a10760d87ed09cc16f15d8c653a12c2b51b979289ef48c6f4282dec9bdbb804ddb6ada2b5d33356e0e6d473ce8b0b
MISC metadata.xml 426 BLAKE2B 1de0a01712ae8f7ef7b1fd36ae0750f786972b1f4fed908bc04b7b5c2242a4418edd0c25503b9f16e78cbb9a766540ffc3c66cedb1c66be754721ad7702dc67f SHA512 f225a5362caebe1c868973ee63115caf802b914443e8a9a3347e72fa4ac533fe3f16e95f8ec1ae96ce5a85fcb1e6b971bc18ba1a9b14b410a7e5b23e9ead0214
diff --git a/dev-perl/Params-Classify/files/Params-Classify-0.13.0-no-dot-inc.patch b/dev-perl/Params-Classify/files/Params-Classify-0.13.0-no-dot-inc.patch
deleted file mode 100644
index 06cf4f49cbbb..000000000000
--- a/dev-perl/Params-Classify/files/Params-Classify-0.13.0-no-dot-inc.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From d612219a1a3bfe14f0cd1de59709724b35d7f21c Mon Sep 17 00:00:00 2001
-From: Kent Fredric
-Date: Tue, 20 Jun 2017 05:45:39 +1200
-Subject: [PATCH] Fix for '.' in @INC
-
----
- t/blessed_pp.t | 4 ++--
- t/check_pp.t | 4 ++--
- t/classify_pp.t | 4 ++--
- t/error_pp.t | 4 ++--
- t/pod_cvg_pp.t | 4 ++--
- t/ref_pp.t | 4 ++--
- 6 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/t/blessed_pp.t b/t/blessed_pp.t
-index 84caf74..e6d1865 100644
---- a/t/blessed_pp.t
-+++ b/t/blessed_pp.t
-@@ -1,7 +1,7 @@
- use warnings;
- use strict;
-
--do "t/setup_pp.pl" or die $@ || $!;
--do "t/blessed.t" or die $@ || $!;
-+do "./t/setup_pp.pl" or die $@ || $!;
-+do "./t/blessed.t" or die $@ || $!;
-
- 1;
-diff --git a/t/check_pp.t b/t/check_pp.t
-index ce2ef1d..5564360 100644
---- a/t/check_pp.t
-+++ b/t/check_pp.t
-@@ -1,7 +1,7 @@
- use warnings;
- use strict;
-
--do "t/setup_pp.pl" or die $@ || $!;
--do "t/check.t" or die $@ || $!;
-+do "./t/setup_pp.pl" or die $@ || $!;
-+do "./t/check.t" or die $@ || $!;
-
- 1;
-diff --git a/t/classify_pp.t b/t/classify_pp.t
-index facdab2..1dd9cbc 100644
---- a/t/classify_pp.t
-+++ b/t/classify_pp.t
-@@ -1,7 +1,7 @@
- use warnings;
- use strict;
-
--do "t/setup_pp.pl" or die $@ || $!;
--do "t/classify.t" or die $@ || $!;
-+do "./t/setup_pp.pl" or die $@ || $!;
-+do "./t/classify.t" or die $@ || $!;
-
- 1;
-diff --git a/t/error_pp.t b/t/error_pp.t
-index 6473533..a018e32 100644
---- a/t/error_pp.t
-+++ b/t/error_pp.t
-@@ -1,7 +1,7 @@
- use warnings;
- use strict;
-
--do "t/setup_pp.pl" or die $@ || $!;
--do "t/error.t" or die $@ || $!;
-+do "./t/setup_pp.pl" or die $@ || $!;
-+do "./t/error.t" or die $@ || $!;
-
- 1;
-diff --git a/t/pod_cvg_pp.t b/t/pod_cvg_pp.t
-index 960bc4f..8503674 100644
---- a/t/pod_cvg_pp.t
-+++ b/t/pod_cvg_pp.t
-@@ -1,7 +1,7 @@
- use warnings;
- use strict;
-
--do "t/setup_pp.pl" or die $@ || $!;
--do "t/pod_cvg.t" or die $@ || $!;
-+do "./t/setup_pp.pl" or die $@ || $!;
-+do "./t/pod_cvg.t" or die $@ || $!;
-
- 1;
-diff --git a/t/ref_pp.t b/t/ref_pp.t
-index f3b5941..55f487d 100644
---- a/t/ref_pp.t
-+++ b/t/ref_pp.t
-@@ -1,7 +1,7 @@
- use warnings;
- use strict;
-
--do "t/setup_pp.pl" or die $@ || $!;
--do "t/ref.t" or die $@ || $!;
-+do "./t/setup_pp.pl" or die $@ || $!;
-+do "./t/ref.t" or die $@ || $!;
-
- 1;
---
-2.13.1
-
diff --git a/dev-perl/Params-Classify/files/Params-Classify-0.13.0-op_sibling.patch b/dev-perl/Params-Classify/files/Params-Classify-0.13.0-op_sibling.patch
deleted file mode 100644
index a7c6adac0e9a..000000000000
--- a/dev-perl/Params-Classify/files/Params-Classify-0.13.0-op_sibling.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://rt.cpan.org/Ticket/Display.html?id=114490
-
-
---- Params-Classify-0.013a/lib/Params/Classify.xs 2010-11-16 15:35:47.000000000 -0500
-+++ Params-Classify-0.013b/lib/Params/Classify.xs 2017-03-26 15:38:12.384693301 -0400
-@@ -41,6 +41,26 @@
- # define FPTR2DPTR(t,x) ((t)(UV)(x))
- #endif /* !FPTR2DPTR */
-
-+#ifndef OpHAS_SIBLING
-+# define OpHAS_SIBLING(o) (cBOOL((o)->op_sibling))
-+#endif
-+
-+#ifndef OpSIBLING
-+# define OpSIBLING(o) (0 + (o)->op_sibling)
-+#endif
-+
-+#ifndef OpMORESIB_set
-+# define OpMORESIB_set(o, sib) ((o)->op_sibling = (sib))
-+#endif
-+
-+#ifndef OpLASTSIB_set
-+# define OpLASTSIB_set(o, parent) ((o)->op_sibling = NULL)
-+#endif
-+
-+#ifndef OpMAYBESIB_set
-+# define OpMAYBESIB_set(o, sib, parent) ((o)->op_sibling = (sib))
-+#endif
-+
- #ifndef ptr_table_new
-
- struct q_ptr_tbl_ent {
-@@ -625,8 +645,8 @@
- OP *(*ppfunc)(pTHX);
- I32 cvflags;
- pushop = cUNOPx(op)->op_first;
-- if(!pushop->op_sibling) pushop = cUNOPx(pushop)->op_first;
-- for(cvop = pushop; cvop->op_sibling; cvop = cvop->op_sibling) ;
-+ if(!OpHAS_SIBLING(pushop)) pushop = cUNOPx(pushop)->op_first;
-+ for(cvop = pushop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ;
- if(!(cvop->op_type == OP_RV2CV &&
- !(cvop->op_private & OPpENTERSUB_AMPER) &&
- (cv = rvop_cv(cUNOPx(cvop)->op_first)) &&
-@@ -635,20 +655,20 @@
- return nxck_entersub(aTHX_ op);
- cvflags = CvXSUBANY(cv).any_i32;
- op = nxck_entersub(aTHX_ op); /* for prototype checking */
-- aop = pushop->op_sibling;
-- bop = aop->op_sibling;
-+ aop = OpSIBLING(pushop);
-+ bop = OpSIBLING(aop);
- if(bop == cvop) {
- if(!(cvflags & PC_ALLOW_UNARY)) return op;
- unary:
-- pushop->op_sibling = bop;
-- aop->op_sibling = NULL;
-+ OpLASTSIB_set(pushop, bop);
-+ OpLASTSIB_set(aop, NULL);
- op_free(op);
- op = newUNOP(OP_NULL, 0, aop);
- op->op_type = OP_RAND;
- op->op_ppaddr = ppfunc;
- op->op_private = (U8)cvflags;
- return op;
-- } else if(bop && bop->op_sibling == cvop) {
-+ } else if(bop && OpSIBLING(op) == cvop) {
- if(!(cvflags & PC_ALLOW_BINARY)) return op;
- if(ppfunc == THX_pp_check_sclass &&
- (cvflags & PC_TYPE_MASK) == SCLASS_REF) {
-@@ -667,9 +687,9 @@
- cvflags &= ~PC_TYPE_MASK;
- ppfunc = THX_pp_check_dyn_battr;
- }
-- pushop->op_sibling = cvop;
-- aop->op_sibling = NULL;
-- bop->op_sibling = NULL;
-+ OpLASTSIB_set(pushop, cvop);
-+ OpLASTSIB_set(aop, NULL);
-+ OpLASTSIB_set(bop, NULL);
- op_free(op);
- op = newBINOP(OP_NULL, 0, aop, bop);
- op->op_type = OP_RAND;
diff --git a/dev-perl/Test-MockObject/Manifest b/dev-perl/Test-MockObject/Manifest
index 481c4cb05ddf..310085fc22a9 100644
--- a/dev-perl/Test-MockObject/Manifest
+++ b/dev-perl/Test-MockObject/Manifest
@@ -1,4 +1,3 @@
-AUX Test-MockObject-1.20150527-INSTALL.SKIP 13 BLAKE2B 5477232d5849ecc7dc7bf4ef33af43a8136a2d93856dbdba484916a65093cb9c04b5a8a4969a5f081bf6ed94bd74c58790714c016a9bd2f7a7129c87455b71f9 SHA512 90f3f3dad86f5b9cf88fa9c22ed8011d8f4b463baee85de2e96f9af792a0b0101b40aa0e91df9dd87d8476a440261fd59de7d013b24e037e8120c18bf71876f7
DIST Test-MockObject-1.20161202.tar.gz 29020 BLAKE2B 0d6c23378e5b14586055a9afa092d30c6334b619da53efaeecc2ed9a40d988736c528e4ae3899a92084a6a116b49ea9d20df0655b2c21a2b19e3df7f75a3e7d6 SHA512 6410b33727352f9bd1db5643c45ea187a8bd224146a804e523f3adc0cec5b3cf72238ae212d7ee9500743c74574d4185fcb357ed4351995eb3b51ad158a736f6
EBUILD Test-MockObject-1.201.612.20.ebuild 705 BLAKE2B 4b79330556bd9f24ae153b275e6502776e5b41ab40ec395b1a837e34ed4424e71a32b2701352b78bdb96ff46bfbe995b0c38e35ace2a685eb5d8b0406b75e8dc SHA512 f9a15e5242a42525c1f4932ea3f82998dc60c8d85f95e56b7f177da93b0ed43faacedee00289a9d7d96d88fd0e59983a5dba32a86bd84f6a5a4cfae374e66b16
MISC metadata.xml 474 BLAKE2B 976f81c1f9de5598da5a17401573163294541bdcd5238def9351fa91c3871a50411c1ee098ef97851825340e11b09a7c6bfbe5da2b131d64d3215e2d5315c638 SHA512 b49a132266d5df16e13621b1ed70fb51e8ba8c957913b9441e366bf20c37a14ee4e34c546832ecc14ae949040abead4167f95223282bc6cb7f222b4eb0e235a6
diff --git a/dev-perl/Test-MockObject/files/Test-MockObject-1.20150527-INSTALL.SKIP b/dev-perl/Test-MockObject/files/Test-MockObject-1.20150527-INSTALL.SKIP
deleted file mode 100644
index 4fd94be96e40..000000000000
--- a/dev-perl/Test-MockObject/files/Test-MockObject-1.20150527-INSTALL.SKIP
+++ /dev/null
@@ -1 +0,0 @@
-README\.pod$
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5da9cc5de69f..5f4f2859ce22 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 8da6f1c95b1d..5fe1128a5da5 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,6 +2,8 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
DIST cython-0.29.14.gh.tar.gz 2075030 BLAKE2B 12bbc2979c34fee9b498f5425d2cea5cedebda474e3f4ee6c9eb3185a4e33fc84df6c16454830316548e36cd9fb7c47f0925b0d6e16b325cbd81f8747c7e492a SHA512 fa1575fc5ec7ee19de34f91a15bdd45d889f54217dbe2a9654604ada90d8d86fe7bceb86449c41b68d6b65459769916a0d7d5f5da21c5597aedc876cde4e37df
DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe917c864047d028dd67041e70251025f14accbd76499b7b9290d0424989adf89321f251526e66a892bdc243ba80ba7f SHA512 bd0872359d31a41750353bb0d7f03c2a40aa2bf6e492148e693321cef15b02ae4f8d5f5a00efde7216f09a6ac06f2bb3ded9d00e27ad0cfc53605f3a9ef55af8
+DIST cython-0.29.17.gh.tar.gz 2080768 BLAKE2B f53f8593f4ab9ef87c8fff47a031d365a748b617b7ee41872768a6a649ca3c6a6f9a338f115881117cbb4ffe1811047ac5fdcac745d6387eee29487c9da4c297 SHA512 f722e4feb0fcd0de7b882d0ba7cd78c37b6aaa4438619607665ea269b207a482fab6ca65cf12bab54d94b5929776c973a270c0748ed35b0f88a72811bf90d4df
EBUILD cython-0.29.14-r1.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f60fd1a4bf9df14302e0b699bfa3265d5449b9f1e669303958141a38d0afcba0b94fd1809b8e94fd99ff8eb930e5 SHA512 78559785f85582572c633f75eabdc54bca756461ac94c7aa7a2771862abda2c5c114d776edc0e6efdd04bf76a8136a132c627bc77b67282bff86ad703ca87dcb
EBUILD cython-0.29.15.ebuild 1953 BLAKE2B 86f5fc8c981090f3568935b17a4ff8941fb26a66b0f037675ea8db48cf213c1a298dc825a25a760e823a4a4a4eec9e77da15765e2818ce40e5c8d90ff9d5c7e6 SHA512 155e5db0c8cb81f46c4124f7c718d6a7bc105aefbd692102966f72babf52521007a176d92a43a755780ab530284e98c372bdf685ddce66ab0848727d77bd83ce
+EBUILD cython-0.29.17.ebuild 1961 BLAKE2B 987cee2e8dc49dece5384df71337d7faa5344369b3fdbc6e2f60eb802639e26d4db8793fd5507c2f91741a87dec1cee289e2228fcfa1adadbf52757150728c90 SHA512 a957c2ae398285102fa23fd783415fd03b83d9c404f8fbe2f0f042612629908c982e9a92af6a660acb630120c0e42a50710a987a7b630b54ef59c86c6fb50de0
MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.17.ebuild b/dev-python/cython/cython-0.29.17.ebuild
new file mode 100644
index 000000000000..187187f52342
--- /dev/null
+++ b/dev-python/cython/cython-0.29.17.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+ https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+ 'python3*')
+ )"
+
+PATCHES=(
+ "${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+ fi
+
+ # Python gets confused when it is in sys.path before build.
+ local -x PYTHONPATH=
+
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+ tc-export CC
+ # https://github.com/cython/cython/issues/1911
+ local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+ "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+ distutils-r1_python_install_all
+
+ if use emacs; then
+ elisp-install ${PN} Tools/cython-mode.*
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index c2be51d2ece1..dc9073a01959 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -2,5 +2,5 @@ AUX python-distutils-extra-2.44-test.patch 1020 BLAKE2B 5818c26d89980d5f1608a9d0
DIST python-distutils-extra-2.44.tar.bz2 37687 BLAKE2B 3d7e3ad277440bfb6fbade8b890b95aad37589700b69a26ec9a5c30e97491871bc8c8f82b540131859d2ce82cebd3758f29ca510abe28046ffcaa0e7240fad3e SHA512 517222b4e34efba730db53ffeee8b8c8d96bd9d1b6044e6ca84c0f2c1d5c0e044240b899d460c50295615c94c513f7e57db3e34e5db6588a01ec92a73999f822
DIST python-distutils-extra_2.42.tar.xz 37996 BLAKE2B dee4cc950bb34027b60dcf58e173bae502a7090062e3c2218fd2ec562d6350f5872ed5c0865b89f1463bd35be0f365f23e05bb0220f70a944181af40df42ee60 SHA512 ff0df0a25a29504bec89970dbbf24d0b618e9f2d5d07a037f67778b86c92e880eafee86dd102b4ada4f280abd3102de9f4a4e47dbc68c1eaaa05fb492cbbae29
EBUILD python-distutils-extra-2.42-r1.ebuild 1413 BLAKE2B 211ab016649d01c0639e553ba7b06511b93674070154517995ef48954e0424a140ded586a3bc730a7b13935000ee567770436a346faf6ce7da1d681aaa21c8c3 SHA512 582a2bc41ae2d44f47791966623c282bbdafa7032e42094aa21753c897f8eec83fc767d1c67c59a6abc07527bf5d39d3fe6133660429570557e88c898f99e174
-EBUILD python-distutils-extra-2.44.ebuild 946 BLAKE2B 7c5a32872724eb060a5a7a42e6451b47f7ffc5c3f5b03369bcadc35af93d9dba633ef6acdc8e827b9520c7ce47c6dd818801d55f9d40a66f0f57b34fae4c4e6b SHA512 020003292ca766106ebd85ec2996d58ea6a74f941660f3bf9ee0da7fd2a1c2fc3dedec527fbd7f0988b6dce6c34869b69e8b7ffac28ddf50f85813da1498fdea
+EBUILD python-distutils-extra-2.44.ebuild 997 BLAKE2B 7a6eac8f97c999231c495f7f83fe02bc582e2f26ef064f73281f18b7dbd8eb604cafab2e8715f664b9fa6a343b06bdca3e8703d9bfeb1d3639f5472aba516fc0 SHA512 a17a771b88c4cf7e57f1494ad1fdfd5c91b2bde39a1c742429220d49a273052ff4c7323b19385e3f3f2595f5b188b6a43de04312ccf79359ba82a81aeddc6fec
MISC metadata.xml 401 BLAKE2B 6ba770986ed5364c9311bbf2a48957c0ec46f3c16e7718b564865b9ca7459f3c64cbcf6ee04c4b66564429e7f6714b0a128f83f2bd0d33f062b3670210d11858 SHA512 0dfe7658fe14d75a542a901de11983e7e0d8663b158032f5b8a71814c4caa93c14b4bc32e422c49a19550544c1b1fd4075be8a6644f0ea780bb23e1adc65b402
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.44.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.44.ebuild
index 8952cf77dcda..7b03b650654a 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.44.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.44.ebuild
@@ -24,9 +24,11 @@ RESTRICT="!test? ( test )"
DOCS=( doc/{README,FAQ} )
BDEPEND="
- dev-libs/gobject-introspection
- dev-python/httplib2
- dev-python/pygobject"
+ test? (
+ dev-libs/gobject-introspection
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ )"
PATCHES=(
"${FILESDIR}"/python-distutils-extra-2.44-test.patch
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index c03967342ef8..1ce1b303bcfe 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,4 @@
AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
-EBUILD rfc3339-validator-0.1.2.ebuild 719 BLAKE2B 603a4f719f5762fc8ed230aa186a9691bc7adfadca8b543fa69faed40399e72b5cfc2193c23f7ce33544d40e71117967bc5e57138911e67f9e4ead406b0e751f SHA512 dbb87ddf8dc5ba5734edbf8cd3e7e939daa6e4ca92b18f592560813c4a6cbab970a895d398236787e5aacbeb8b9cc7704dea2fe72df76a0da002d5f1ee517bc2
+EBUILD rfc3339-validator-0.1.2.ebuild 729 BLAKE2B efd0671e4da4a29097f9b96f2055f212606bc8d703647fa55e3c7dd7430ecacbbf3eeb197046f054c6545eafe753eea6487e20fe51b9cac8a72d19f08f205b7b SHA512 06006c0b9cb11d5349704b1396475a82605bde5c8f59d64c24c5e2941cb7dcd94418aa46d514730008f519d5c396f7d48f631cc24d9549cd156639eabe247c35
MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
index 7284229275fb..1829a7a027f0 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]
dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
"
PATCHES=(
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index b7f92be3da7e..13882c236b44 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 851 BLAKE2B eb348dd4a0cb57da7d915ba077f347afe8e266249c1664aab161c6ca0695656fdeb1439c1ad0d3e689b4b9a5d6a2ae6184abfac8ff4e1d397de2bb06c0834d10 SHA512 3ce00308b013b64c1880cc77cde1540c0daefeb4d202475d9ae570ee2eae003bb66b34f33e5fcbedfe6722a05563c99583db5f55a20baedf54f6bec4a2f5e384
+EBUILD rfc3986-validator-0.1.1.ebuild 911 BLAKE2B ceabcaf176eab440c1541290ac9f087abc4c4c9005be1301306cd61d8f6a308355348b550cd73056a76123f91119d98021428b0685293f06c96dcd4091e974df SHA512 26d27da3d0c6ae475ae0eebe21203934cc22b150d766846204533c890226a4f74834b129c6dc124adcdc0db9ce349517bf3ea5240b508c789e43f22b7bb92904
MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index 0b479e467a3e..c3a689322810 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -20,6 +20,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 93b13bd9ad2d..cae2b729b22f 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,5 +1,5 @@
DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
DIST rfc3986-1.3.2.tar.gz 44225 BLAKE2B f4cc72ed3c2dcc7132527cd33fd6b9f0136f789fdb229cc33b02bf2dd596b2f762e3e4cf8af63f239408b55cdf056cf54315a0a9cdf734a4203fad24b00ce594 SHA512 c086c55295d80ccf33dbfeff06059303119e7a407bfc405b7f75ec30413221ec58d3061d75fd3ca696b7acf9b1be1dfcc785e01280bf659a53be43ab1f300b15
EBUILD rfc3986-1.2.0.ebuild 705 BLAKE2B ece20ae0f22fbf2613a84c3850ff059729fb5f7303ef889b550d6af4d0ad3fec096d3ccef91080bf9a7e5343e12682bd1043be238d5b93d9adf3b9e5ee5f5fc7 SHA512 73dfda5986bcdc5f1dbb55e5e3b31bd5a9446921929b74b04dc4c7257fc1a0dbb0d9f0966f8e6b93ecbeb54a449b564919d18f5e05e3084c0155089c4eb66024
-EBUILD rfc3986-1.3.2.ebuild 762 BLAKE2B c769e8aa0a69a61ccef446a243de2d828dce90a2b4c497cb4b92143251ab7a5146d69c3ea6c57673df04f7a7db961dd25a04c73bd5fc3dd5b883a5cdf3ae4484 SHA512 54bada8caadc561363b49a9ed9c9856c30da6a4c4775acb04edbad711454ea8b3cd3ae02b54afc6352f9e26c2cb0e01fca559305bfee1a2ff0a73b3cd2cd7567
+EBUILD rfc3986-1.3.2.ebuild 683 BLAKE2B 1a77eb643dbc2805fffd84b1fcc7d0569220ce1b595b579bc6174de2dd6d4ef2389e251c0be8043eede97ffa442dbd3ac87e2c47fe01a66c9a736b5fd1ddd252 SHA512 eb4be0f8fa4128f4292aa42cac8b9f7ffb35d39be6ddec53f552066367950f8c0769799dfe29fbf65ab84777a36ea1777a622b0b2cb56e6646efa0a571dd96ad
MISC metadata.xml 633 BLAKE2B b228083fadc7671ce50c00091f30e09d49feae287a266f68b15c330044d86b039664b4680e62804a939b0a86c32aa423c0cdce35902d88e0a1ec237c2849afca SHA512 acab17f0537fd26fb63038eb2c670761809f7292935727d798cb56901ac5539b0a100b5baf9b15f4e78112b829363974040769fd13ec62b704788c58d499d85c
diff --git a/dev-python/rfc3986/rfc3986-1.3.2.ebuild b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
index 5d5064b5811d..d30c59714ba3 100644
--- a/dev-python/rfc3986/rfc3986-1.3.2.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.3.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3)
inherit distutils-r1
@@ -15,16 +15,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="idna test"
-RESTRICT="!test? ( test )"
+IUSE="idna"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
idna? ( dev-python/idna[${PYTHON_USEDEP}] )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
-RDEPEND=""
+BDEPEND="
+ test? ( dev-python/idna[${PYTHON_USEDEP}] )
+"
-python_test() {
- py.test -vv || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index a7c6753b173c..9696102cc2ef 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -17,6 +17,6 @@ DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1
DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
EBUILD twisted-16.6.0-r3.ebuild 5783 BLAKE2B e6433d34015f3140e93ac698aaaaae9fa822de410debaa5bce42ffc5697e9c11ed0c3180ce8212703746addda39d9b0d4c30dbbef348fb821a65cc6e24d8701d SHA512 181151b8b2667f688fa08ce7aa97e2fc242c8dd168cc5498d17f6224ce18933406ddcf40a8c813a0631f4cd58e498c370d94371043c41d4b18aa44876677b979
EBUILD twisted-18.4.0.ebuild 6270 BLAKE2B edbeb59373d55d728b255223dd7ca09043547c80513be779719704983508dd2be866e4fee90bb023f8817f95659291c262b4d037ba6609164a61d13dd660e5e4 SHA512 ae8aede1151acaa3f94553bdcefc25970e9026f4aef8a81c6a6f8f0a0e7d9c91283ff6eaf1aeb2ed8140021279ed3a985967fd6357b8ad239289604a9cc0a2a5
-EBUILD twisted-19.10.0.ebuild 5618 BLAKE2B 6c4d5058b0225f1bc8ad891cd1371e92b81d26ec9ac8f35e0da807440b5280b2688a9628f26ac329926cdbf8dfa45e7cb2943159351119ce595f2f7c748027a5 SHA512 4b6a3b94f517650868d0a9c115922aa0c79e46f7a0a46046f1cfe863894e98c0cded4f345cede6f6cf58d63a9838c2dd5dff875357f0c21b902408191ed33573
+EBUILD twisted-19.10.0.ebuild 5617 BLAKE2B 0fa0e0243bff6893e03fc4e688076c44d5fc729620850c949f732d68fa4f13520fdcc0d3c7f0173baf17cb27181d2ae6a6d628e247cf94bc2781ba51ab876ce3 SHA512 e0c545abab789c5efef5c6cb557c8f55d28cfc9f68e67c65f04e9e21c81bb5f64b609cbca659dcc0d7bff9024d91b00ff98aa4f688ca86f704497bfe68f35d5c
EBUILD twisted-20.3.0.ebuild 5503 BLAKE2B d57d3db475e1dba42ef4a5bda94af2eccabae79d6bdb7099d551653eabf8f68ee980434e77b8cac7da5179b70ac776ccb30887fcc195e3ef35b2459dc91fba4e SHA512 a3e5a1a9ee042289ca21a8cc934511ac742ba387d7667580c46bf5986717efdd143b13fcb9835cb076c1062048568cc676dae4d877a5dedb173598c77862e0c1
MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 98fe42f3287c..33fff2b99884 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
LICENSE="MIT"
SLOT="0"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 8775835dcb9c..f51dda019a36 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index fc1de9dc9ccc..1c1e7dfa415e 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -1,6 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# @DEAD
# @ECLASS: bzr.eclass
# @MAINTAINER:
# Ulrich Müller
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index a170b610a8a4..f76012b864e1 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 7cfd4db1bc02..1549abd4fb91 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -2,10 +2,6 @@ AUX opendmarc-1.3.2-multiple-From.patch 1394 BLAKE2B 91b36a131ca9dca5e33f3a9610a
AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664e279f09ee0c44bffc4fa2c4c6dbbdfaf653576bcce821597cccb58fafdfae51b81e5ac149e20113 SHA512 7e5faeebbccaaafe42e6edda3a812b9954f19d71b4593cb2ab895dfeb26a8073e4aaeb2f5c626b1c35877d08ea00077b0507fe833e2838b10d83d5e0acfe966c
AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
-DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c9052d1ec907ca9423532f62d52cbdaf7af1680a2179198616f27786940650492ad39c4fdb668c27c5979804471eea SHA512 30de56b6da1665e0ed68484702bfcfcbd0b65275053818c807c16dea26f0e014a0484dc9d5ed6d1405628ea22a61082f13cecf66714a414139f612c51a294086
DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
-EBUILD opendmarc-1.1.3.ebuild 757 BLAKE2B 1dc78305bb746405185e6b3e2a435a976475bf881ad3e2702c1e99cb38ae9c3ddca5bd6e51ea506ab0a84f40629ac1b7de24c5d44739b2fb54d301a2ce3cfac6 SHA512 4bdd251638b2ff2dd90ed985da7ae04152b7f41028585149e31f463f82203b11e972845821084f355e7481a5fd9275278b057a24abd5002559571b196b4ba3a1
-EBUILD opendmarc-1.3.2-r1.ebuild 1411 BLAKE2B 09744240801d95ffab1ddea96509c1e1796aab9b5787ad264984a9e94e943e07b52af49ec05670acad01a14685b1f38a099b387b1249a91f5a97305f2cb3b86e SHA512 b5a927769b5635124d815311daa6ff8057b4e735895e10726687c835fb19cf663e43d6e8c085a5e13e07d35c07d2ab22ff65f464f4de2ee26c05404bdda8def5
-EBUILD opendmarc-1.3.2-r2.ebuild 1550 BLAKE2B b5ba54570b5d5fde5df574e13e2d82ffed5de6a2293a094ab7e8a2aff95843d49cd3266baf4cedb86ade0a35189aa37a159cb12bec9d7d37132921f5978af62d SHA512 0d187edb2a3fe745f4f9b9ebc5c13a4a26c38308a18ea0a7966297a6d2a4835f611a90e0baa4a0794f886edc6df429202bea25f2a6a87e4a0ec3ff5dcffe063f
EBUILD opendmarc-1.3.2-r3.ebuild 1603 BLAKE2B 9183cfae9e768b485e5c469208660ec02c8d7fe8cecc8bd5916ab87d0579d9d4699a07a86ce9915eefea5e4ba549b71aeaf52f8be01c9b53e68d4f6f7c0ac1a3 SHA512 1c13bcdb86bacf192c0f1be61781757054bfdfa9db6a96b46de103eeebb28e35cee88051b580ebbe8be13708826c32e2169d3cf518b0e2c381b22990757d61e8
MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
deleted file mode 100644
index 63923f17a6d8..000000000000
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Open source DMARC implementation "
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-perl/DBI
- || ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}
- dev-perl/Switch"
-
-src_prepare() {
- # fix building with newer glibc, already fixed in later releases, #640012
- sed -i -e 's/T_RRSIG/disabled_T_RRSIG/' libopendmarc/opendmarc_dns.c || die
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
deleted file mode 100644
index 35988944a840..000000000000
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="Open source DMARC implementation "
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~x86"
-IUSE="spf +reports"
-
-DEPEND="reports? ( dev-perl/DBI )
- || ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}
- reports? (
- dev-perl/DBD-mysql
- dev-perl/HTTP-Message
- dev-perl/Switch
- )
- spf? ( mail-filter/libspf2 )"
-
-pkg_setup() {
- enewgroup milter
- enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
- default
- if use !reports ; then
- sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
- fi
-}
-
-src_configure() {
- econf \
- $(use_with spf) \
- $(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
- $(use_with spf spf2-lib "${EPREFIX}"/usr/lib)
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/opendmarc.initd opendmarc
- newconfd "${FILESDIR}"/opendmarc.confd opendmarc
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- dodir /etc/opendmarc
-
- # create config file
- sed \
- -e 's:^# UserID .*$:UserID milter:' \
- -e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
- -e '/^# Socket /s:^# ::' \
- "${S}"/opendmarc/opendmarc.conf.sample \
- > "${ED}"/etc/opendmarc/opendmarc.conf \
- || die
-}
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
deleted file mode 100644
index 031cb5289f55..000000000000
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user multilib systemd
-
-DESCRIPTION="Open source DMARC implementation "
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="spf +reports static-libs"
-
-DEPEND="reports? ( dev-perl/DBI )
- || ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}
- reports? (
- dev-perl/DBD-mysql
- dev-perl/HTTP-Message
- dev-perl/Switch
- )
- spf? ( mail-filter/libspf2 )"
-
-pkg_setup() {
- enewgroup milter
- enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
- default
- if use !reports ; then
- sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
- fi
-}
-
-src_configure() {
- econf \
- $(use_with spf) \
- $(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
- $(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
-
- newinitd "${FILESDIR}"/opendmarc.initd opendmarc
- newconfd "${FILESDIR}"/opendmarc.confd opendmarc
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- dodir /etc/opendmarc
-
- # create config file
- sed \
- -e 's:^# UserID .*$:UserID milter:' \
- -e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
- -e '/^# Socket /s:^# ::' \
- "${S}"/opendmarc/opendmarc.conf.sample \
- > "${ED}"/etc/opendmarc/opendmarc.conf \
- || die
-}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index cfa901fe3152..ec8a66f49320 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index abc99f274a6a..11d12b610ffc 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,7 +1,10 @@
DIST fontawesome-4.7.0.tar.gz 2672776 BLAKE2B c20474c0167665d82fcbe74984ad9c44fa1155a2a5363222981d6c32f40a3bf13bfc2c582d78e8d36e57939f8af3810fa823f2241d1924a83a05c79ed08cface SHA512 913e5eec2211111e9601c92059745344766f4c3a6f3563cbc6f8a5f3850a0101bab8f3f992a97c6f1c264a2bbb5163f3feecc6b3f64fcb22c9592d2d38cc777d
DIST fontawesome-5.1.0.tar.gz 10505651 BLAKE2B 0ec84cdf36855ba43e5858b2e8b12a93c9ec950216b64fa307e1fa058e05f83f08c820e4a3b95432e30c33ee4efe5931bee7077ff182d52725068c53bf387b6f SHA512 1f35f0d326e1f896b606d851577fe99639c164101f236c47966289a8a7e3b1e64fea3f1338d12f327777db56ec35b1fcb5d6de250276bcb468fec114d4c3928f
DIST fontawesome-5.11.2.tar.gz 10542743 BLAKE2B d17afa447acfa56ad42b6f36c6fd7ec049434028c00259f53f36d0896e2a679f83880c8e71f277316728d1ba5f18cf4af7cb22a935b0a300acc423bc02790fa8 SHA512 14267debf243aa3210125b4e45a2ab41cbcab599f2abab42e64432ff7b1f6b5716724012bc973b77bcee1b2d488738720ffa9b4f6ebaf8f4cc3375ff066fb72a
+DIST fontawesome-5.13.0.tar.gz 10998459 BLAKE2B 69ddfb0d8b3bb1a15911445b934cf0321e645164b34fc9f7844f0df04840a3e8d4d425b14589341cec0613ea4f2109678250198a1d5002e69c394eb053ceb4a2 SHA512 9fd3e1115acef6ac84667cf546374b204b947e229e4c645ab33f51026e993689a8295e7c0b02c88d735c4399efcd454f4252dcde7008eefb85c13846bf7c5bc4
EBUILD fontawesome-4.7.0.ebuild 598 BLAKE2B 01c3f14e7a3ca641bb70397916f048d7b3e0980caf98e872e02d2f17f44478374e986817060627cb30b131f677c12746fd9dca0e4f89deb2e742bb1d2e5593ba SHA512 bb2d606384eef7dfa4208f26aae0126bc40a4c99a2fe8eabe89f6daf22f469bec12cdc88e2530ee2302f0b6cc353ee62f82a13148770ee757d21503555f35ec9
EBUILD fontawesome-5.1.0.ebuild 693 BLAKE2B 7136a16eda143e81654f40f4da627e2860a9e0fa44a3fe448a469b57c71861aacfd55b678023583b163b6973daf9b8ca30a5369be01d4b66d551a735ab68ef06 SHA512 394d61d25dc52ef6a224f2a4a44d2db372980e583ec5f5f48003c2e1ec60fab5d299419f77cb85977fb0f96f06c3cea368f4add6a93d8fed53207b3e18d0b82b
EBUILD fontawesome-5.11.2.ebuild 632 BLAKE2B 3b3dc924017b666cee3963adc699eec7379fbb48373aa41dc9d8ef03a36576546e1672f1972cd31eba6326acccfb8c6139db92f9333a5910ba4294f08ce98e5b SHA512 d3d68891772b54d39eadd666d1ddd030b8763e2c458cf8451f1d3c22e0d21ab6378e80c2256e4d111b9f1cf5faf5df938c08fb818e0c197f634309e29b3f088f
-MISC metadata.xml 429 BLAKE2B fed6d6dbf2c1c84d80cd6d3004ba88c6d0ad82e7315976e630935efdd4314df8cc9e15fb33c2b2fafa6589aeef796e4d689e0e52931b2c9f0d84c1b1a654645a SHA512 24fe1d6df3a97828250bacda638ba5982be80bc13e687907778fa8c1874a30e80bfdf674cf59ee11e093bc14d35efb648e52f93faac8bd01a6096c0f951d153f
+EBUILD fontawesome-5.13.0.ebuild 747 BLAKE2B dba9b1386b81111d1565f548f43d4d3aba3305d19fcf964bf28c4751ef90e65b8a8b449cb16469e7cf61ab95259c8d86a1bdb121188bff71506485c987d5c6c6 SHA512 fa4f21874935f38e983bc59e5e04b9d517adaa0b69197b294ca5d594a53c98231ecce1c3765d95c99442d2cda5d6bf9c3889ba05ab757e4c4aac636e76b06529
+EBUILD fontawesome-9999.ebuild 747 BLAKE2B dba9b1386b81111d1565f548f43d4d3aba3305d19fcf964bf28c4751ef90e65b8a8b449cb16469e7cf61ab95259c8d86a1bdb121188bff71506485c987d5c6c6 SHA512 fa4f21874935f38e983bc59e5e04b9d517adaa0b69197b294ca5d594a53c98231ecce1c3765d95c99442d2cda5d6bf9c3889ba05ab757e4c4aac636e76b06529
+MISC metadata.xml 532 BLAKE2B 2a4d5bb78ff9948de3569171165e91bc9391863412dab5236ff996182671decde9ba0339d059c3ec2e58670c362ea7f49dab9b5e1abfc6d277c62a6c8f2dcd08 SHA512 862296f7e1ea8fa2fd4acbbe2d679df47076ad290bc6d571f15971c590745c47f3c7dba39d823411a0228aff71aedbb77b739fd4cfac990eed54f48c85406904
diff --git a/media-fonts/fontawesome/fontawesome-5.13.0.ebuild b/media-fonts/fontawesome/fontawesome-5.13.0.ebuild
new file mode 100644
index 000000000000..73c98da49484
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.13.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Font-Awesome"
+inherit font
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/FortAwesome/${MY_PN}.git"
+else
+ SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="CC-BY-4.0 OFL-1.1"
+SLOT="0/5"
+IUSE="+otf ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+src_install() {
+ if use otf; then
+ FONT_S="${S}/otfs" FONT_SUFFIX="otf" font_src_install
+ fi
+ if use ttf; then
+ FONT_S="${S}/webfonts" FONT_SUFFIX="ttf" font_src_install
+ fi
+}
diff --git a/media-fonts/fontawesome/fontawesome-9999.ebuild b/media-fonts/fontawesome/fontawesome-9999.ebuild
new file mode 100644
index 000000000000..73c98da49484
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Font-Awesome"
+inherit font
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/FortAwesome/${MY_PN}.git"
+else
+ SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="CC-BY-4.0 OFL-1.1"
+SLOT="0/5"
+IUSE="+otf ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+src_install() {
+ if use otf; then
+ FONT_S="${S}/otfs" FONT_SUFFIX="otf" font_src_install
+ fi
+ if use ttf; then
+ FONT_S="${S}/webfonts" FONT_SUFFIX="ttf" font_src_install
+ fi
+}
diff --git a/media-fonts/fontawesome/metadata.xml b/media-fonts/fontawesome/metadata.xml
index cbc37d4c0550..795d5dc16535 100644
--- a/media-fonts/fontawesome/metadata.xml
+++ b/media-fonts/fontawesome/metadata.xml
@@ -1,10 +1,14 @@
-
-
- FortAwesome/Font-Awesome
-
+
+ gentoo@aisha.cc
+ Aisha Tammy
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+