diff --git a/app-accessibility/mimic1/Manifest b/app-accessibility/mimic1/Manifest
index ce3f81e219..e75272849e 100644
--- a/app-accessibility/mimic1/Manifest
+++ b/app-accessibility/mimic1/Manifest
@@ -1 +1 @@
-DIST mimic1-1.2.0.2.tar.gz 457566646 BLAKE2B ce2e0b0e88141383f31b0caf611c323d8c94a7f3fdbfc05a765e6e6cd77297db9e53415cc81847eb45d809c3d85fe8e9b75432ef6bc31e0c0a4eca7b336a3d17 SHA512 9fec604e694b0cc7aba545bd5d3ab02c73660d472667192093ca60f3fec1425ae86067a051e552797703be868ceaf30dbc6c289383946f78086174ad647cae6e
+DIST mimic1-1.3.0.1.tar.gz 458653037 BLAKE2B 885ee7e1639afd7f802b5004e7f6f1d391df4a50137355edee965c8d397e393365485b9e459434a7870487364084daa240abd829776acc01b6e2b34a103dd4d1 SHA512 df6b56ea8e02ffd2c02090ff99e722638c962c278cb5354fcc75d010bb4a4e1f830855c8637e44d9f72007810b34df24eeaba39e7767b3502e49ce04263569f4
diff --git a/app-accessibility/mimic1/mimic1-1.2.0.2.ebuild b/app-accessibility/mimic1/mimic1-1.3.0.1.ebuild
similarity index 100%
rename from app-accessibility/mimic1/mimic1-1.2.0.2.ebuild
rename to app-accessibility/mimic1/mimic1-1.3.0.1.ebuild
diff --git a/app-text/OCRmyPDF/Manifest b/app-text/OCRmyPDF/Manifest
new file mode 100644
index 0000000000..f9690203a6
--- /dev/null
+++ b/app-text/OCRmyPDF/Manifest
@@ -0,0 +1 @@
+DIST OCRmyPDF-9.7.1.tar.gz 7859333 BLAKE2B 5f366d8655c55dafe911d2f1feaad84c4f032252454015693b314515d6bd308e91f93626cb3229d2956354e2c60df8420fb4d7a2023ca0a78636ea5c40d7ff56 SHA512 daf5f636afa2704c9163f4f0d49f944358919c2af229030d78bb29f10d0a8acf3e219060542d52982bc02180b410c6dca771c54f4d3239250365397707bccf6c
diff --git a/app-text/OCRmyPDF/OCRmyPDF-9.7.1.ebuild b/app-text/OCRmyPDF/OCRmyPDF-9.7.1.ebuild
new file mode 100644
index 0000000000..3209a63311
--- /dev/null
+++ b/app-text/OCRmyPDF/OCRmyPDF-9.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="OCRmyPDF adds an OCR text layer to scanned PDF files"
+HOMEPAGE="https://github.com/jbarlow83/OCRmyPDF"
+MY_GITHUB_AUTHOR="jbarlow83"
+SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="jbig2enc"
+
+DEPEND=""
+RDEPEND="
+ ${DEPEND}
+ app-text/ghostscript-gpl
+ app-text/tesseract
+ app-text/unpaper
+ <=dev-python/pdfminer-six-20200124[${PYTHON_USEDEP}]
+ >=dev-python/pdfminer-six-20181108[${PYTHON_USEDEP}]
+ dev-python/pikepdf[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/reportlab[${PYTHON_USEDEP}]
+ dev-python/tqdm[${PYTHON_USEDEP}]
+ media-gfx/img2pdf
+ media-gfx/pngquant
+ media-libs/leptonica
+ virtual/python-cffi[${PYTHON_USEDEP}]
+ jbig2enc? ( media-libs/jbig2enc )
+"
+
+python_prepare_all() {
+ # do not depend on deprecated dep
+ sed -i -e '/pytest-runner/d' setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ newbashcomp "${S}"/misc/completion/ocrmypdf.bash "${PN,,}"
+
+ insinto /usr/share/fish/vendor_completions.d
+ doins "${S}"/misc/completion/ocrmypdf.fish
+}
diff --git a/app-text/OCRmyPDF/metadata.xml b/app-text/OCRmyPDF/metadata.xml
new file mode 100644
index 0000000000..c95868ce29
--- /dev/null
+++ b/app-text/OCRmyPDF/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ alarig@swordarmor.fr
+ Alarig Le Lay
+
+
+
diff --git a/dev-java/openjdk-sts-bin/Manifest b/dev-java/openjdk-sts-bin/Manifest
new file mode 100644
index 0000000000..014fd31523
--- /dev/null
+++ b/dev-java/openjdk-sts-bin/Manifest
@@ -0,0 +1,8 @@
+DIST OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz 206018212 BLAKE2B 90d550d74e53362cbae4a623250d22bff65dcf74898c3a6076d4fbe77cc98ffe35bc4ecd5f44fc785e4247e5989236bb54444c5269cdcc4fa16f09fab6de3adb SHA512 ca4386dd7366617e15b501841fbf03d06e891a9cfa75e63347108c9eac1010cb2d9479aafb86f796b7bdd0ab9806f1c2d77d73105b5b49434d99ee4777f9daca
+DIST OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz 191743541 BLAKE2B 5ffd9fd462addc0766e88ded1b3c4b7d982ae3bf4946576c9a2d36a5297c4488dfa4f1c7e771bdaa190ad847db1aafc37582b0729a70df9d1fbfa31d8ed6dc64 SHA512 943860efdd55c486422c78d159dabb50b41d3a4fb7e1056286263677debef1e620947743e549f3f9587ef4e928bf050ce2f0bf77c2cf7bdbff1e93bb49cdbc87
+DIST OpenJDK13U-jdk_ppc64le_linux_hotspot_13.0.2_8.tar.gz 190310065 BLAKE2B 0cb13abcdb530a43037e3c5a36bc28cbf47c6d7eb33689adb4a0aab587d623c033a026f404d7ccc3cac3c6252b64c60e7d6ef1aaa26a266daf1cc82461b7d008 SHA512 bec72df21cfd33b8ee87b95676946e45017bb97fcb7f5a0080487cd21c0182da586d1ee0114cdf79d8fd2b803a5f47ff56d21d1604ecf81b838ec06c1a3d744a
+DIST OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz 207518686 BLAKE2B 7c632b0ef75fef9490e789e2d89874c19db050c8e0f763f35f5d29164263c25be79b09cb5be141301af3de7529b7f28c9dc7c63a909e502fd00a7b96d12093ea SHA512 9e2698fab54e5cd2d56c6456102760321d01ac15bf8bd97ae96069676a22284bf4d08daa1a41f2c33d761dd067bb8ec176eb37848dae3290df374d06631d5d1c
+DIST OpenJDK14U-jdk_aarch64_linux_hotspot_14_36.tar.gz 213697531 BLAKE2B af9de64240e925324c1107402a4e08712cb8774c840b67d988f8e723e37f33a619d6610afe9b0a68f4f6367ab6e1a2514d9fd396ce5396fc538949bac0946149 SHA512 4d1292abe81e37a7150cde8dbb0695a6a9772fec6d05dffa41010d90cb3d31e8a67d9de997428e6aa961caca926d554e184aafd8012581f05e4300821c831642
+DIST OpenJDK14U-jdk_arm_linux_hotspot_14_36.tar.gz 189027827 BLAKE2B 6e2901415485e0465fbaeea627b7610f21aae9775ede3299f5b62977a2bdd0a3661677bbca156a6d2f1504c7330c9565a24f7d220b09a1b3dfd01cf78866edde SHA512 a84561092c19ca2d38b3951511040ebaea52ca9410f13faca40d534a9bef6c6589329a74f92df4c87e99f70ff12a14ba811ce1337c179d0d1dcca03bd1fa1c44
+DIST OpenJDK14U-jdk_ppc64le_linux_hotspot_14_36.tar.gz 197951326 BLAKE2B 8c91ea619736cff9608340ad2bfa8c07f411661809391de794fa269d2eaca543f2ca7c0944744ae2e775a9be6f98be46c69aa4bd295fe8cf619691453af7abd0 SHA512 d6d56ec71451f8cca69100090d67ad9a83242e8a3622e66adf2ddc1f1a5b3f097cd61725241daaf5bc85229b244b94527c64fcb6fa2ca420170544cf76265a38
+DIST OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz 216382990 BLAKE2B 82a783df5e88304c3b5c1141bf56ce8a1931df500702c62fa49300973a6e770ba7cf61a602bc2d41bd375b7b0b7f91a8af7b00ee1029e8c3408a08887ba629e9 SHA512 1851cf24db0b48007a2373d8596cf4b8d832d10a2f41316799c4af2bd37cbab4b211e7913d431b59f6bc212957cdbae401c6bcd389635c248c939433cef63516
diff --git a/dev-java/openjdk-sts-bin/files/openjdk-sts-bin-13.env.sh b/dev-java/openjdk-sts-bin/files/openjdk-sts-bin-13.env.sh
new file mode 100644
index 0000000000..1def83a229
--- /dev/null
+++ b/dev-java/openjdk-sts-bin/files/openjdk-sts-bin-13.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-sts-bin/files/openjdk-sts-bin-14.env.sh b/dev-java/openjdk-sts-bin/files/openjdk-sts-bin-14.env.sh
new file mode 100644
index 0000000000..1def83a229
--- /dev/null
+++ b/dev-java/openjdk-sts-bin/files/openjdk-sts-bin-14.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-sts-bin/metadata.xml b/dev-java/openjdk-sts-bin/metadata.xml
new file mode 100644
index 0000000000..d5bd272081
--- /dev/null
+++ b/dev-java/openjdk-sts-bin/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ denis7774@gmail.com
+ Reva Denis aka RarogCmex
+
+
+ Java™ is the world's leading programming language and platform.
+ The code for Java is open source and available at OpenJDK™.
+ AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
+
+
+
diff --git a/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild b/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild
new file mode 100644
index 0000000000..44907ee192
--- /dev/null
+++ b/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2 toolchain-funcs eapi7-ver
+
+abi_uri() {
+ echo "${2-$1}? (
+ https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+ )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=13
+#Some people like AndrewAmmerlaan reports that SLOT="$(ver_cut 1)" is not detected correctly. So I had to hardcode that.
+
+SRC_URI="
+ $(abi_uri arm)
+ $(abi_uri aarch64 arm64)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK. Short Term Supported"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="alsa cups examples -gentoo-vm headless-awt source"
+
+RDEPEND="
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ >=sys-apps/baselayout-java-0.1.0-r1
+ >=sys-libs/glibc-2.29-r7:*
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXtst
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED%/}/${dest#/}"
+
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr demo/ || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym ../../../../etc/ssl/certs/java/cacerts \
+ "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+
+ if use gentoo-vm ; then
+ ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+ ewarn "recognised by the system. If ${P} is set for system scope"
+ ewarn "this will almost certainly break"
+ ewarn "many java ebuilds as they are not ready for ${P}"
+ ewarn "You may enable it only for desired users via eselect java-vm"
+ ewarn "Example| larry# eselect java-vm set openjdk-bin-${SLOT}"
+ else
+ ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+ ewarn "will not be recognised by the system. For example, simply calling"
+ ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+ ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+ ewarn "absolute location under ${EPREFIX}/opt/${P}."
+ fi
+}
diff --git a/dev-java/openjdk-sts-bin/openjdk-sts-bin-14_p36.ebuild b/dev-java/openjdk-sts-bin/openjdk-sts-bin-14_p36.ebuild
new file mode 100644
index 0000000000..c7602a9831
--- /dev/null
+++ b/dev-java/openjdk-sts-bin/openjdk-sts-bin-14_p36.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2 toolchain-funcs eapi7-ver
+
+abi_uri() {
+ echo "${2-$1}? (
+ https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+ )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=14
+#Some people like AndrewAmmerlaan reports that SLOT="$(ver_cut 1)" is not detected correctly. So I had to hardcode that.
+
+SRC_URI="
+ $(abi_uri arm)
+ $(abi_uri aarch64 arm64)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK. Short Term Supported"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="alsa cups examples -gentoo-vm headless-awt source"
+
+RDEPEND="
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ >=sys-apps/baselayout-java-0.1.0-r1
+ >=sys-libs/glibc-2.29-r7:*
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXtst
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED%/}/${dest#/}"
+
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr demo/ || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym ../../../../etc/ssl/certs/java/cacerts \
+ "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+
+ if use gentoo-vm ; then
+ ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+ ewarn "recognised by the system. If ${P} is set for system scope"
+ ewarn "this will almost certainly break"
+ ewarn "many java ebuilds as they are not ready for ${P}"
+ ewarn "You may enable it only for desired users via eselect java-vm"
+ ewarn "Example| larry# eselect java-vm set openjdk-bin-${SLOT}"
+ else
+ ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+ ewarn "will not be recognised by the system. For example, simply calling"
+ ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+ ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+ ewarn "absolute location under ${EPREFIX}/opt/${P}."
+ fi
+}
diff --git a/dev-python/hstspreload/Manifest b/dev-python/hstspreload/Manifest
index 1d799fec10..1ec5d92f7e 100644
--- a/dev-python/hstspreload/Manifest
+++ b/dev-python/hstspreload/Manifest
@@ -1 +1 @@
-DIST hstspreload-2020.4.7.tar.gz 860352 BLAKE2B 3b7aed45c4129858acd29b2a9b318f91e57fc2162e3d49e73815a66d5cacca51f4bc0f8a52ba0dd1fba4ab6c295e61be6eef342d029683c6715eca2788c26a27 SHA512 ce4ffa44f25f571b8df3508a0aa5e613be0239c0475f1bddbdf69513dae0fd07f88d434ab268bacabaad05b858c9c570266cd8061ec87de56c47efd02806618a
+DIST hstspreload-2020.4.14.tar.gz 865188 BLAKE2B 61f8d80fb9dc13e6e65bdaf2b6e10bdfbb15c5f299d70762c2494cdd59de113bdf43fe9c5b36e09e2a746bbe4ecafa577e99ebf967eab0ed713402cebbbb74fe SHA512 4fa0a05e19ae01e6715834393a825fbbf108e8e154f50dde7965fea1e986d03ee485efc0b2dd1ca580962c4c98f3338c12083df5089af0b04ad17e69b6eac8d0
diff --git a/dev-python/hstspreload/hstspreload-2020.4.7.ebuild b/dev-python/hstspreload/hstspreload-2020.4.14.ebuild
similarity index 100%
rename from dev-python/hstspreload/hstspreload-2020.4.7.ebuild
rename to dev-python/hstspreload/hstspreload-2020.4.14.ebuild
diff --git a/dev-python/mkautodoc/Manifest b/dev-python/mkautodoc/Manifest
deleted file mode 100644
index 7467e3b3f0..0000000000
--- a/dev-python/mkautodoc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mkautodoc-0.1.0.tar.gz 5654 BLAKE2B c0ae754e800ea25e9cccc621b4fd5c8d1561c57808b301ac5a3036ca18fda1adc432006e13b777a83dcc2cd6960a34745e17dfbcbbda24098902198d4fc9d743 SHA512 7ccb0a03016e2984d88d78eca2a8ee01e2153ff574c912358640c158b2084e3c365ace0fdb89cb74bb1950c68775d9d3cb11201cbf3c6d136dc7886a3294dc89
diff --git a/dev-python/mkautodoc/metadata.xml b/dev-python/mkautodoc/metadata.xml
deleted file mode 100644
index a7b0e8be87..0000000000
--- a/dev-python/mkautodoc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
- andrewammerlaan@riseup.net
- Andrew Ammerlaan
-
-
- tomchristie/mkautodoc
- mkautodoc
-
-
diff --git a/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild b/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
deleted file mode 100644
index bfc7f38cd6..0000000000
--- a/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Auto documentation for MkDocs"
-HOMEPAGE="
- https://github.com/tomchristie/mkautodoc
- https://pypi.org/project/mkautodoc
-"
-SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
- PYTHONPATH="${WORKDIR}/${P}/tests/mocklib:${WORKDIR}/${P}"
- pytest -vv || die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pdfminer-six/Manifest b/dev-python/pdfminer-six/Manifest
new file mode 100644
index 0000000000..439b5418a4
--- /dev/null
+++ b/dev-python/pdfminer-six/Manifest
@@ -0,0 +1,2 @@
+DIST pdfminer-six-20200124.tar.gz 10181868 BLAKE2B 1421c4fba7ba3ad47966ee2a023453794b674033f9a84d11758efdf1601d82a5a628276a2ec57db99827856935c14e0b6fea49ac3a54fce97933e73a4ca598ae SHA512 60ce03984ef7d80d47e55ef50886ea77f82b7b4a61924332a25a56f4271f83816ca95c5e17a52d592c86356ffe8a0db530eae7c5f5b1f96fc42ae42679378a58
+DIST pdfminer-six-20200402.tar.gz 10184190 BLAKE2B a54a9eee0297574b0b6e1b3df89a72ba4d2570b49312ebdba1b1d56387fa3c126dda032a6560bc6195f3b8f59a57e17839fda7bfa1386ba31494060bcf1a9f1b SHA512 da64a9141ad1afde63c41e6678ac5f2a13abba7ee2d1447fb5cd986e90a2d02ba040f128bb1f73db4329929eed90488a3b0b8c96f6af0d1968d483820bf6d656
diff --git a/dev-python/pdfminer-six/metadata.xml b/dev-python/pdfminer-six/metadata.xml
new file mode 100644
index 0000000000..17361c3983
--- /dev/null
+++ b/dev-python/pdfminer-six/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ alarig@swordarmor.fr
+ Alarig Le Lay
+
+
diff --git a/dev-python/pdfminer-six/pdfminer-six-20200124.ebuild b/dev-python/pdfminer-six/pdfminer-six-20200124.ebuild
new file mode 100644
index 0000000000..9c14b7d4f2
--- /dev/null
+++ b/dev-python/pdfminer-six/pdfminer-six-20200124.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+
+DESCRIPTION="Community maintained fork of pdfminer"
+HOMEPAGE="https://github.com/pdfminer/pdfminer.six"
+MY_GITHUB_AUTHOR="pdfminer"
+SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/chardet-3.0[${PYTHON_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"/"${MY_PN}-${PV}"
+
+distutils_enable_tests nose
+distutils_enable_sphinx docs/source dev-python/sphinx-argparse
diff --git a/dev-python/pdfminer-six/pdfminer-six-20200402.ebuild b/dev-python/pdfminer-six/pdfminer-six-20200402.ebuild
new file mode 100644
index 0000000000..4676f2f62a
--- /dev/null
+++ b/dev-python/pdfminer-six/pdfminer-six-20200402.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+
+DESCRIPTION="Community maintained fork of pdfminer"
+HOMEPAGE="https://github.com/pdfminer/pdfminer.six"
+MY_GITHUB_AUTHOR="pdfminer"
+SRC_URI="https://github.com/${MY_GITHUB_AUTHOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/chardet-3.0[${PYTHON_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+distutils_enable_tests nose
+distutils_enable_sphinx docs/source dev-python/sphinx-argparse
diff --git a/dev-python/pytest-instafail/Manifest b/dev-python/pytest-instafail/Manifest
index 002fbd866c..f617288e5a 100644
--- a/dev-python/pytest-instafail/Manifest
+++ b/dev-python/pytest-instafail/Manifest
@@ -1 +1 @@
-DIST pytest-instafail-0.4.1.tar.gz 5237 BLAKE2B 697aca533e3654204d5c7cdee245c7c2f7811b7941f195923983be8a30d76b0a132d1eff984c86070a9c4a5463adb6143d1f8915a105c2c75d59e8ca92149e86 SHA512 f043a1a58a2fc92c740e916008fe3e8bb66d3086f2c518f34ef8d63362169cd1b4f4a5f39b70382329cda837e0fd6c02cbb7504292d0aed95994d473c6430488
+DIST pytest-instafail-0.4.1_p0.tar.gz 5301 BLAKE2B 542ae74fa6f381e58252f7a00bf4e1a5208679a6c56d0c9e2e39b46daec34459c2fe2b4ec8c2e6a94d517a769df0019752b1f87257e70a00683e3bb72f3f2d93 SHA512 1e2d7a1dd13ab11d5f6a5e8876aa8a48a6ff9012707d63023d709bfb1aa9a9ee3c088fc9b507d4b75d41e7ab1474154937575b2fa3a6f1bfb286fc3865f70382
diff --git a/dev-python/pytest-instafail/pytest-instafail-0.4.1.ebuild b/dev-python/pytest-instafail/pytest-instafail-0.4.1_p0.ebuild
similarity index 83%
rename from dev-python/pytest-instafail/pytest-instafail-0.4.1.ebuild
rename to dev-python/pytest-instafail/pytest-instafail-0.4.1_p0.ebuild
index c65e6b1119..1c0e9dd703 100644
--- a/dev-python/pytest-instafail/pytest-instafail-0.4.1.ebuild
+++ b/dev-python/pytest-instafail/pytest-instafail-0.4.1_p0.ebuild
@@ -9,12 +9,14 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
+MY_PV=${PV/_p/.post}
+
DESCRIPTION="Plugin for pytest that shows failures and errors instantly"
HOMEPAGE="
https://github.com/pytest-dev/pytest-instafail
https://pypi.org/project/pytest-instafail
"
-SRC_URI="https://github.com/pytest-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/pytest-dev/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
@@ -32,4 +34,6 @@ DEPEND="
)
"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
distutils_enable_tests pytest
diff --git a/dev-python/sphinx-argparse/Manifest b/dev-python/sphinx-argparse/Manifest
new file mode 100644
index 0000000000..a0e62eccff
--- /dev/null
+++ b/dev-python/sphinx-argparse/Manifest
@@ -0,0 +1 @@
+DIST sphinx-argparse-0.2.5.tar.gz 24890 BLAKE2B 870329d588c5c1131bb104e548e6f1caf673b6b4ffa9cb074a9a6e769f90d8d351ec14ce05f902d10ce4ae2336e05a119a386ea154faf2a5c57ba240514c9b92 SHA512 8e946947c9d018c10d7283b19c49cf19bf5813ba5c227bf3aac21752e5ecddf4653ec2bb1e2b67b8c1c3d8eb50ede55acc5b0e0071297433a2468606d3baa0b1
diff --git a/dev-python/sphinx-argparse/metadata.xml b/dev-python/sphinx-argparse/metadata.xml
new file mode 100644
index 0000000000..a69b0a0590
--- /dev/null
+++ b/dev-python/sphinx-argparse/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ Alarig Le Lay
+ alarig@swordarmor.fr
+
+
diff --git a/dev-python/sphinx-argparse/sphinx-argparse-0.2.5.ebuild b/dev-python/sphinx-argparse/sphinx-argparse-0.2.5.ebuild
new file mode 100644
index 0000000000..a5cacc2af2
--- /dev/null
+++ b/dev-python/sphinx-argparse/sphinx-argparse-0.2.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension that automatically documents argparse commands and options"
+HOMEPAGE="https://pypi.org/project/sphinx-argparse/
+ https://github.com/alex-rudakov/sphinx-argparse"
+SRC_URI="https://github.com/alex-rudakov/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ ${DEPEND}
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/commonmark[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+# requires self to build own documentation
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinx-argparse
+
+python_prepare_all() {
+ # test fails, skip it until a fix is found:
+ # AssertionError: assert [{'action_groups': [{'description': None,\n 'options': [{'default': None,\n
+ sed -i -e 's:test_parse_nested:_&:' \
+ -e 's:test_parse_nested_traversal:_&:' \
+ test/test_parser.py || die
+
+ # needs test files in workdir to compile docs for some reason
+ cp -r test "${WORKDIR}/test/" || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index f2483f6280..e37fb486ab 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1 +1 @@
-DIST starlette-0.13.2.tar.gz 431011 BLAKE2B 60a34667c5c784dc4167ddaf764be976f97e95f518c6c1cd7c0d20a41c10cdc2232a402a39b5c742a5fbc8a19613713fa18756f0b1858e8acf9905f614ae0d58 SHA512 9622f5ddcf7469305e0d509457a1d9c7e44b6291e84c0c5627d4599dc2f561ce58a5437214b41917ac019dd6f27c3551ed0dea38b57fbbcadc54b30ceca870a5
+DIST starlette-0.13.3.tar.gz 431202 BLAKE2B a05c91104a1be1837486447551477388db657e1a52fe504796132ec87aae99738862254d284a0dca3fc78843070f31ec6b2ff82ea9a4454986ec9616845bf662 SHA512 00359e9cf2400c9cc5ef5fa7ce6e9e82a3360c680defe3268bb15a21b96894be36c67c55b5caf9bedcb814ef213876d44b5ae2209d54594477b72f2c979429cc
diff --git a/dev-python/starlette/starlette-0.13.2.ebuild b/dev-python/starlette/starlette-0.13.3.ebuild
similarity index 88%
rename from dev-python/starlette/starlette-0.13.2.ebuild
rename to dev-python/starlette/starlette-0.13.3.ebuild
index 8568ab7be3..84b0d96a0f 100644
--- a/dev-python/starlette/starlette-0.13.2.ebuild
+++ b/dev-python/starlette/starlette-0.13.3.ebuild
@@ -5,7 +5,11 @@ EAPI=7
PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 eutils
+DOCBUILDER="mkdocs"
+DOCDEPEND="dev-python/mkdocs-material"
+AUTODOC=1
+
+inherit distutils-r1 docs eutils
DESCRIPTION="The little ASGI framework that shines"
HOMEPAGE="
@@ -24,11 +28,6 @@ IUSE="doc"
# We need newer graphql-core
RESTRICT="test"
-BDEPEND="doc? (
- dev-python/mkdocs
- dev-python/mkdocs-material
- dev-python/mkautodoc )"
-
DEPEND="test? (
dev-python/aiofiles[${PYTHON_USEDEP}]
dev-python/black[${PYTHON_USEDEP}]
@@ -50,14 +49,6 @@ python_prepare_all() {
distutils-r1_python_prepare_all
}
-python_compile_all() {
- default
- if use doc; then
- mkdocs build || die "failed to make docs"
- HTML_DOCS="site"
- fi
-}
-
pkg_postinst() {
optfeature "Required if you want to use FileResponse or StaticFiles" dev-python/aiofiles
optfeature "Required if you want to use Jinja2Templates" dev-python/jinja
diff --git a/dev-util/FoBiS/FoBiS-3.0.2.ebuild b/dev-util/FoBiS/FoBiS-3.0.2.ebuild
new file mode 100644
index 0000000000..65b63badde
--- /dev/null
+++ b/dev-util/FoBiS/FoBiS-3.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="FoBiS.py, a Fortran Building System for poor men"
+HOMEPAGE="https://github.com/szaghi/FoBiS"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}.py/${PN}.py-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="graphviz"
+
+S="${WORKDIR}/${PN}.py-${PV}"
+
+RDEPEND="
+ graphviz? ( dev-python/graphviz[${PYTHON_USEDEP}] )
+"
+
+# removing "import future" and "from past.utils import old_div" from python scripts
+PATCHES=( "${FILESDIR}/${P}-remove-import-future_olddiv.patch" )
diff --git a/dev-util/FoBiS/Manifest b/dev-util/FoBiS/Manifest
new file mode 100644
index 0000000000..a45e2c266e
--- /dev/null
+++ b/dev-util/FoBiS/Manifest
@@ -0,0 +1 @@
+DIST FoBiS-3.0.2.tar.gz 49142 BLAKE2B 02242bed7aeaff9c92be986974136a501cbbd7d839b2e69a56cefe23cbd198e192f3d6834fa251c01ee3306c238c3a7211738a9223ae7a5a04ffe3bf7e806679 SHA512 103a96acf8665fd43c10a1a32c5290ddb47f071a620ecbbd7793d0b23dc4acec2c2351f24ce1fff6fa33829e27e011ae0e36de3880d370e92c578c81d53b1d8e
diff --git a/dev-util/FoBiS/files/FoBiS-3.0.2-remove-import-future_olddiv.patch b/dev-util/FoBiS/files/FoBiS-3.0.2-remove-import-future_olddiv.patch
new file mode 100644
index 0000000000..c79c28d20f
--- /dev/null
+++ b/dev-util/FoBiS/files/FoBiS-3.0.2-remove-import-future_olddiv.patch
@@ -0,0 +1,171 @@
+diff -Nur a/fobis/Builder.py b/fobis/Builder.py
+--- a/fobis/Builder.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/Builder.py 2020-02-21 20:10:30.000000000 +0300
+@@ -22,8 +22,6 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with FoBiS.py. If not, see .
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import range
+ from builtins import *
+diff -Nur a/fobis/Cleaner.py b/fobis/Cleaner.py
+--- a/fobis/Cleaner.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/Cleaner.py 2020-02-21 20:10:39.000000000 +0300
+@@ -22,8 +22,6 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with FoBiS.py. If not, see .
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import *
+ from builtins import object
+ import os
+diff -Nur a/fobis/Colors.py b/fobis/Colors.py
+--- a/fobis/Colors.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/Colors.py 2020-02-21 20:10:49.000000000 +0300
+@@ -24,8 +24,6 @@
+ from __future__ import unicode_literals
+
+
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import *
+ from builtins import object
+ class Colors(object):
+diff -Nur a/fobis/Compiler.py b/fobis/Compiler.py
+--- a/fobis/Compiler.py 2019-12-10 20:10:04.000000000 +0300
++++ b/fobis/Compiler.py 2020-02-21 20:10:56.000000000 +0300
+@@ -29,8 +29,6 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with FoBiS.py. If not, see .
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import *
+ from builtins import object
+diff -Nur a/fobis/Dependency.py b/fobis/Dependency.py
+--- a/fobis/Dependency.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/Dependency.py 2020-02-21 20:11:05.000000000 +0300
+@@ -23,8 +23,6 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with FoBiS.py. If not, see .
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import *
+ from builtins import object
+diff -Nur a/fobis/Doctest.py b/fobis/Doctest.py
+--- a/fobis/Doctest.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/Doctest.py 2020-02-21 20:11:12.000000000 +0300
+@@ -24,8 +24,6 @@
+ from __future__ import absolute_import
+ from __future__ import division
+ from __future__ import unicode_literals
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import *
+ from builtins import object
+diff -Nur a/fobis/FoBiSConfig.py b/fobis/FoBiSConfig.py
+--- a/fobis/FoBiSConfig.py 2019-12-10 20:10:31.000000000 +0300
++++ b/fobis/FoBiSConfig.py 2020-02-21 20:11:22.000000000 +0300
+@@ -28,8 +28,6 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with FoBiS.py. If not, see .
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import *
+ from builtins import object
+diff -Nur a/fobis/Fobos.py b/fobis/Fobos.py
+--- a/fobis/Fobos.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/Fobos.py 2020-02-21 20:11:29.000000000 +0300
+@@ -29,8 +29,6 @@
+ from __future__ import absolute_import
+ from __future__ import division
+ from __future__ import unicode_literals
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import *
+ from builtins import object
+diff -Nur a/fobis/Gcov.py b/fobis/Gcov.py
+--- a/fobis/Gcov.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/Gcov.py 2020-02-21 20:19:45.000000000 +0300
+@@ -23,12 +23,9 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with FoBiS.py. If not, see .
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import *
+ from builtins import object
+-from past.utils import old_div
+ try:
+ from pygooglechart import PieChart2D
+ __graph__ = True
+diff -Nur a/fobis/ParsedFile.py b/fobis/ParsedFile.py
+--- a/fobis/ParsedFile.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/ParsedFile.py 2020-02-21 20:11:53.000000000 +0300
+@@ -23,8 +23,6 @@
+ # You should have received a copy of the GNU General Public License
+ # along with FoBiS.py. If not, see .
+
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import *
+ from builtins import object
+diff -Nur a/fobis/__init__.py b/fobis/__init__.py
+--- a/fobis/__init__.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/__init__.py 2020-02-21 20:12:01.000000000 +0300
+@@ -20,6 +20,4 @@
+ # You should have received a copy of the GNU General Public License
+ # along with FoBiS.py. If not, see .
+
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import *
+\ No newline at end of file
+diff -Nur a/fobis/cli_parser.py b/fobis/cli_parser.py
+--- a/fobis/cli_parser.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/cli_parser.py 2020-02-21 20:12:07.000000000 +0300
+@@ -21,8 +21,6 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with FoBiS.py. If not, see .
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import *
+ import argparse
+diff -Nur a/fobis/fobis.py b/fobis/fobis.py
+--- a/fobis/fobis.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/fobis.py 2020-02-21 20:12:13.000000000 +0300
+@@ -23,8 +23,6 @@
+ from __future__ import absolute_import
+ from __future__ import division
+ from __future__ import unicode_literals
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import *
+ try:
+ import configparser as configparser
+diff -Nur a/fobis/utils.py b/fobis/utils.py
+--- a/fobis/utils.py 2019-12-06 15:58:52.000000000 +0300
++++ b/fobis/utils.py 2020-02-21 20:12:18.000000000 +0300
+@@ -21,8 +21,6 @@
+ from __future__ import absolute_import
+ from __future__ import division
+ from __future__ import unicode_literals
+-from future import standard_library
+-standard_library.install_aliases()
+ from builtins import str
+ from builtins import *
+ import os
diff --git a/dev-util/FoBiS/metadata.xml b/dev-util/FoBiS/metadata.xml
new file mode 100644
index 0000000000..753f7427f4
--- /dev/null
+++ b/dev-util/FoBiS/metadata.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ torokhov-s-a@yandex.ru
+ Sergey Torokhov
+
+
+ FoBiS.py, a Fortran Building System for poor men, is a KISS tool
+ for automatic building modern Fortran projects, it being able
+ to automatically resolve inter-modules dependency hierarchy.
+
+
+
+ FoBiS.py
+ szaghi/FoBiS
+
+
diff --git a/media-sound/zita-ajbridge/Manifest b/media-sound/zita-ajbridge/Manifest
index 3f82c8bfb8..4542774f9a 100644
--- a/media-sound/zita-ajbridge/Manifest
+++ b/media-sound/zita-ajbridge/Manifest
@@ -1 +1 @@
-DIST zita-ajbridge-0.8.2.tar.bz2 24451 BLAKE2B 0311fe95f5ee0ed2cd2fe92b2f43d9cf649bc95669a24564310da2c4a87a518991c749142ea889de9d9f773d0ced8d2f6de26a92c004c4d8b9072e3da2fd93b7 SHA512 4813033ce6e16a7be013e82b9f0630a626a7515cd1ce8bd71b5f05239e5ef4cf3aecf522539557e159228d04459cb6ce112830619369c62e1e76bf95b84fbe71
+DIST zita-ajbridge-0.8.4.tar.bz2 24544 BLAKE2B e4f0923129fd8cc38234efc0449bd5d408676cbf00e1225d563b4fb2e41b3b27541cc2be6ac6eed61b1294379b51e0f2d929553ff2053b544f62e87f3679fb10 SHA512 591c75324fdb51d705b15b7cb93ff0ff098d354277262468faba2c45741c24e0749ae9fa9169d206a4d589c7fac33d05ed33cb6ea6d9d808b3f640c7e938f244
diff --git a/media-sound/zita-ajbridge/zita-ajbridge-0.8.2.ebuild b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild
similarity index 100%
rename from media-sound/zita-ajbridge/zita-ajbridge-0.8.2.ebuild
rename to media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild