diff --git a/Manifest.files.gz b/Manifest.files.gz
index 42e42b1568e8..071efabb7527 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index b3f8b814d785..0c9911af72af 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
deleted file mode 100644
index b8046be7ebc7..000000000000
--- a/app-i18n/atokx3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST a20y1406lx.tgz 8491493 BLAKE2B d5823dbc49661434c48d056d0d1d082be3d1d136e8eb8aab6b48f27b8198102201d5daeaca11717fba512b6260b928e165e6f500e8f1d70665c8907b9b1e5ce2 SHA512 bf350be4f15db63b384ff10ec7e362c469a836d052e8885aac1bab049f7d4f0b04dacaecbe5c1303211405938bc3f674136ba5ae3b55ff31aa5e4f14dbec0273
-DIST atokx3gtk216.tar.gz 69246 BLAKE2B 73d246e5c79da0888ffc32deed9d8770500c64377845c553f1ef4ca18b6c9ce93e20dd9188983d9a7664ead60dfb66f53f605a2ab7bf065db336266b5fb38178 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd
-DIST atokx3up2.tar.gz 8427265 BLAKE2B 6af19673dd443f69870316413bd53712a5b1f148f07d7b7f9dddff3290a4b6d65866e7d38a3c6a3d1ff15990560b706d46a558a77ff4c8200b36b4f1345c62bb SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
deleted file mode 100644
index c1178520384d..000000000000
--- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit cdrom eutils gnome2-utils multilib-build
-
-MY_UPDATE_P="${PN}up2"
-MY_UPDATE_GTK="${PN}gtk216"
-MY_ZIPCODE_P="a20y1406lx"
-
-DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
-HOMEPAGE="https://www.justsystems.com/jp/products/atok_linux/"
-SRC_URI="https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
- https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
- https://gate.justsystems.com/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
-
-LICENSE="ATOK MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip mirror"
-
-RDEPEND="dev-libs/atk
- dev-libs/glib:2
- dev-libs/libxml2:2
- media-libs/fontconfig
- media-libs/libpng
- sys-apps/tcp-wrappers
- sys-libs/pam
- x11-libs/cairo
- >=x11-libs/gtk+-2.4.13:2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXxf86vm
- x11-libs/libdrm
- x11-libs/pangox-compat
- amd64? (
- >=dev-libs/atk-2.10.0[abi_x86_32(-)]
- >=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
- >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)]
- >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
- >=media-libs/libpng-1.2.51[abi_x86_32(-)]
- >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
- >=sys-libs/pam-0-r1[abi_x86_32(-)]
- >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
- >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
- >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
- >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
- >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
- >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
- >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
- >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
- >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
- >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)]
- >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
- >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
- >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
- >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
- >=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
- >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
- )"
-S="${WORKDIR}"
-
-EMULTILIB_PKG="true"
-
-pkg_setup() {
- if ! cdrom_get_cds ${PN}index ; then
- die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
- fi
-
- QA_PREBUILT="opt/${PN}/lib/server/*
- opt/${PN}/lib/client/xaux/*
- opt/${PN}/lib/client/*
- opt/${PN}/bin/*
- usr/libexec/*
- usr/bin/*
- usr/$(get_libdir)/*
- usr/$(get_libdir)/gtk-2.0/immodules/*
- usr/$(get_libdir)/iiim/le/${PN}/64/*
- usr/$(ABI=x86 get_libdir)/*
- usr/$(ABI=x86 get_libdir)/gtk-2.0/immodules/*
- usr/$(ABI=x86 get_libdir)/iiim/*
- usr/$(ABI=x86 get_libdir)/iiim/le/${PN}/*"
-}
-
-src_unpack() {
- local targets="
- IIIMF/iiimf-client-lib-trunk_r3104-js*.i386.tar.gz
- IIIMF/iiimf-gtk-trunk_r3104-js*.i386.tar.gz
- IIIMF/iiimf-protocol-lib-trunk_r3104-js*.i386.tar.gz
- IIIMF/iiimf-server-trunk_r3104-js*.i386.tar.gz
- IIIMF/iiimf-x-trunk_r3104-js*.i386.tar.gz
- IIIMF/iiimf-client-lib-devel-trunk_r3104-js*.i386.tar.gz
- IIIMF/iiimf-protocol-lib-devel-trunk_r3104-js*.i386.tar.gz
- ATOK/atokx-20.0-*.0.0.i386.tar.gz"
- # IIIMF/iiimf-properties-trunk_r3104-js*.i386.tar.gz
- # IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz
- # IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz
-
- if use abi_x86_64 ; then
- targets+="
- IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz
- IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz
- IIIMF/iiimf-protocol-lib-64-trunk_r3104-js*.x86_64.tar.gz
- ATOK/atokx-64-20.0-*.0.0.x86_64.tar.gz"
- # IIIMF/iiimf-client-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
- # IIIMF/iiimf-protocol-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
- # IIIMF/iiimf-notuse-64-trunk_r3104-js*.x86_64.tar.gz
- fi
-
- targets+=" ATOK/atokxup-20.0-*.0.0.i386.tar.gz"
-
- unpack ${MY_UPDATE_P}.tar.gz
-
- local i
- for i in ${targets} ; do
- if [[ -f "${S}"/${MY_UPDATE_P}/bin/${i} ]] ; then
- einfo "unpack" $(basename "${S}"/${MY_UPDATE_P}/bin/${i})
- tar xzf "${S}"/${MY_UPDATE_P}/bin/${i} || die "Failed to unpack ${i}"
- elif [[ -f "${CDROM_ROOT}"/bin/tarball/${i} ]] ; then
- einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i})
- tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}"
- else
- die "${i} not found."
- fi
- done
- unpack ${MY_UPDATE_GTK}.tar.gz
- unpack ${MY_ZIPCODE_P}.tgz
-}
-
-src_prepare() {
- if use abi_x86_64 ; then
- local lib32="$(ABI=x86 get_libdir)"
- local lib64="$(get_libdir)"
- if [[ "lib" != "${lib32}" ]] ; then
- mv usr/lib "usr/${lib32}" || die
- fi
- if [[ "lib64" != "${lib64}" ]] ; then
- mv usr/lib64 "usr/${lib64}" || die
- fi
- mkdir -p "usr/${lib64}/iiim/le/${PN}" || die
- mv "usr/${lib32}/iiim/le/${PN}/64" "usr/${lib64}/iiim/le/${PN}/64" || die
- rm "usr/${lib32}/iiim/le/${PN}/amd64" || die
- sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimcf.la" > "usr/${lib64}/libiiimcf.la" || die
- sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimp.la" > "usr/${lib64}/libiiimp.la" || die
- sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimcf.la" || die
- sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimp.la" || die
- fi
-}
-
-src_install() {
- DOCS=( ${MY_UPDATE_P}/README_UP2.txt "${CDROM_ROOT}"/doc/atok.pdf )
- HTML_DOCS=( "${CDROM_ROOT}"/readme.html )
- einstalldocs
- rm -rf ${MY_UPDATE_P}
-
- cp -dpR * "${ED}" || die
-
- # amd64 hack
- if use abi_x86_64 ; then
- local lib32="$(ABI=x86 get_libdir)"
- local lib64="$(get_libdir)"
- if [[ "${lib32}" != "${lib64}" ]] ; then
- local f
- for f in xiiimp.so xiiimp.a iiim-xbe xiiimp.so.2 xiiimp.so.2.0.0 iiimd-watchdog xiiimp.la ; do
- dosym "../../${lib32}/iiim/${f}" "/usr/${lib64}/iiim/${f}"
- done
- for f in ${PN}aux.so ${PN}.so ; do
- dosym "../../../../${lib32}/iiim/le/${PN}/${f}" "/usr/${lib64}/iiim/le/${PN}/${f}"
- done
- dosym "../../../../${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/64"
- dosym "../../../../${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/amd64"
- fi
- fi
-
- sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-iiimf" > "${T}/iiimf.conf" || die
- insinto /etc/X11/xinit/xinput.d
- doins "${T}/iiimf.conf"
-}
-
-pkg_preinst() {
- # bug #343325
- if use abi_x86_64 && has_multilib_profile && [[ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ]] ; then
- rm -f "${EPREFIX}/usr/$(get_libdir)/iiim"
- fi
-}
-
-pkg_postinst() {
- elog
- elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:"
- elog
- elog ". /opt/${PN}/bin/${PN}start.sh"
- elog
- multilib_foreach_abi gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
- multilib_foreach_abi gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/atokx3/files/xinput-iiimf b/app-i18n/atokx3/files/xinput-iiimf
deleted file mode 100644
index bc2330c49970..000000000000
--- a/app-i18n/atokx3/files/xinput-iiimf
+++ /dev/null
@@ -1,11 +0,0 @@
-XIM=iiimx
-XIM_PROGRAM="@EPREFIX@/usr/bin/iiimx"
-XIM_ARGS=-iiimd
-GTK_IM_MODULE=iiim
-QT_IM_MODULE=xim
-
-export HTT_DISABLE_STATUS_WINDOW=t
-export HTT_GENERATES_KANAKEY=t
-export HTT_USES_LINUX_XKEYSYM=t
-export HTT_IGNORES_LOCK_MASK=t
-export JS_FEEDBACK_CONVERT=t
diff --git a/app-i18n/atokx3/metadata.xml b/app-i18n/atokx3/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-i18n/atokx3/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- cjk@gentoo.org
- Cjk
-
-
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 59e03d4e48c9..2f344da17c37 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 732ca89676c6..559252090869 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1 +1,2 @@
DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 BLAKE2B 3bc93ca1dc45756121a4a3838093539957bba4ddffbbd7d27c5df6c63422a8694ea7d805cc9585ab1ce2d9092e35b91cd3bde97ee2fabb91c8c870eefa8ded1d SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3
+DIST docbook-xsl-ns-1.79.1.tar.bz2 21962317 BLAKE2B a68cc31ea8cb98fc07e198fe55f242c6438284d6fa75d4920a9ca7b5038732f966cc6653e058d7fafb26c0ff49f2039025a48a0f8c0392ee892951723703bce3 SHA512 23fd06870bd5afe4efcd08c8ad679821c202a62442b50657c093cbe9cd71b585a3c56a5534a0d41119f58bf98b1f9014a53ff2e48ab59075ec1827e7363980e9
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
new file mode 100644
index 000000000000..3ad9535de821
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ruby"
+
+RDEPEND=">=app-text/build-docbook-catalog-1.4
+ ruby? ( dev-lang/ruby )"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+# Makefile is broken since 1.76.0
+RESTRICT=test
+
+# The makefile runs tests, not builds.
+src_compile() { :; }
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ # The changelog is now zipped, and copied as the RELEASE-NOTES, so we
+ # don't need to install it
+ dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
+
+ insinto ${DOCBOOKDIR}
+ doins VERSION VERSION.xsl
+
+ local i
+ for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
+ [[ "${i}" == "epub" ]] && ! use ruby && continue
+
+ cd "${S}"/${i}
+ for doc in ChangeLog README; do
+ if [[ -e "${doc}" ]] ; then
+ mv ${doc} ${doc}.${i} || die
+ dodoc ${doc}.${i}
+ rm ${doc}.${i} || die
+ fi
+ done
+
+ doins -r "${S}"/${i}
+ done
+
+ if use ruby; then
+ local cmd="dbtoepub${MY_PN#docbook-xsl}"
+
+ # we can't use a symlink or it'll look for the library in the
+ # wrong path.
+ dodir /usr/bin
+ cat - > "${ED}"/usr/bin/${cmd} < ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/pango[introspection]
+ app-text/poppler[introspection,cairo]"
+DEPEND="${RDEPEND}
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5fb716c5b3db..1b0e8ffc8fe8 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 1dfcffb05139..09f043e27b5c 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,2 +1,3 @@
DIST pikepdf-1.13.0.tar.gz 2140229 BLAKE2B 886bb9395e8fa1105385908a06d076f78bb1712186a8cb0eafbe54d22a0c95fa2bc8eba8f2e3d60ec3b1392d550cd38c6486c601eba2ef167c718fa26b472f9e SHA512 48304f85e73148dbcfae50ecc5767686b46ce9d44b13eb3f991ab3b358b99208383627abdb5ef3c17cf31a422872ea0bae7560e9c7c36130c6009563b6169f4d
+DIST pikepdf-1.14.0.tar.gz 2140844 BLAKE2B 75a408ded51e82cd7970eb94214d2e4f40ea0fa0a4915d83caace9b1fcad75fe2d7f7f1917e307d5ba8f2107dc1ae4fd46125b05d7ea175444c479945293d5a7 SHA512 bbd6a024324812f2ecee7c424fe53a2e32a6534c909cef60661faea40e58bfc067017f26d8676fb336e618e6cd7b008729cb6753202a18ed6fd86bbfbb36662b
DIST pikepdf-1.8.3.tar.gz 1649370 BLAKE2B c655eb2a9304eb624b5f3dd3ea68ff3194f5a508b4249ef0643689945c28bbe9eaad015df481516d6cfce6768a70a34377725a7995b448f22a2eb025b4967e71 SHA512 5cb674042dca6850df7cf9476743956967d0ad168ac6bdadda03895a604f6c3670849e33ab863e7686eaa46922489d6dd1da9883d19a721c8021323d768086a9
diff --git a/dev-python/pikepdf/pikepdf-1.14.0.ebuild b/dev-python/pikepdf/pikepdf-1.14.0.ebuild
new file mode 100644
index 000000000000..ea2da43b0439
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-1.14.0.ebuild
@@ -0,0 +1,53 @@
+# 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="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/qpdf:0=
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+ test? ( >=dev-python/attrs-19.1.0
+ >=dev-python/hypothesis-4.24
+ =dev-python/pillow-5.0.0
+ >=dev-python/pytest-4.4.0
+ =dev-python/pytest-xdist-1.28
+ =dev-python/pytest-helpers-namespace-2019.1.8
+ >=dev-python/pytest-timeout-1.3.3
+ >=dev-python/python-xmp-toolkit-2.0.1 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
+
+python_test() {
+ pytest
+}
+
+# When ipython and matplotlib will get python3_8 support, we'll be able to add
+#
+#IUSE="doc"
+#DEPEND="doc? ( dev-python/ipython
+# dev-python/matplotlib
+# dev-python/sphinx-1.4
+# dev-python/sphinx_rtd_theme )"
+#python_compile_all() {
+# use doc && emake -C docs html
+#}
+#python_install_all() {
+# use doc && local HTML_DOCS=( docs/_build/html/. )
+# distutils-r1_python_install_all
+#}
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index 0a04503d5421..450d3e73077f 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1 +1,2 @@
DIST tld-0.12.1.tar.gz 1346595 BLAKE2B 393c052872218212ef13ee60d011ed5fc0ee8eea37530081b43004c3e4d9e64a6198df1191a4e28032a1ee8ab884d52297995e138f830d81a4bd8484e9aa72f2 SHA512 eeaab86528fdd516f8e8ff42bd04432d6c1bea995c673563630a2b849705ec08450e592c39f9f5e649ced93548443a766507474222cce31b86ef0fc400d766f2
+DIST tld-0.12.2.tar.gz 1347015 BLAKE2B d284581917a9ddee026d316961f2cdc6efc8a3c8dee8112c7266d55a9493f1aca831db0635db02b737bb3e02b3910a8822e121a5317ab02f5078075839e02c91 SHA512 b997bd3cdf22f65862c9b3e7d446014325d9538dd06eeed86f4b9b6c6ba440829b5d611cc19fed9bf8bf039ef01c4258c71b5c765bbecdfc345dd00e73c7fca1
diff --git a/dev-python/tld/tld-0.12.2.ebuild b/dev-python/tld/tld-0.12.2.ebuild
new file mode 100644
index 000000000000..73e336742d2e
--- /dev/null
+++ b/dev-python/tld/tld-0.12.2.ebuild
@@ -0,0 +1,19 @@
+# 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="Extract the top level domain (TLD) from the URL given"
+HOMEPAGE="https://github.com/barseghyanartur/tld"
+SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index fdb497193037..e3a5fde62f59 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index c6bef6eab775..3ddc37fd68a9 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,2 +1,2 @@
DIST glfw-3.2.1.tar.gz 472450 BLAKE2B abffe6580dee968baa23f8f4f38af164f7479fe0bf3c4d64cc6386b1450aee4a8e8de5f963faecd536e2bbbc925da7ac1dcc16f219984758950263e6b6d022e1 SHA512 c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc
-DIST glfw-3.3.1.tar.gz 760014 BLAKE2B 72d23a612157b2083dc6950ff7a2531490d1440f24008fca39646860ea7f9e61eedc5d3c96edb024a125f2e9a1ef65780b4a672aa001bcbc6f41d908e904f966 SHA512 f9376002314eae5518ca63738cf1558433007dbf628fb6093a6f54c330f72d85e0ac30049877c50bc99f029e3eb6f69e69508f412d1ec9bdde0ac721dbbeba1e
+DIST glfw-3.3.2.tar.gz 759972 BLAKE2B a246681d580dd569a045b76db71c18f8dbfacb8483c2d825aa68094d655468d093c52ba3770b2b5d566de62149a775001f5acd7c7539a8235c43e3e9ab58df28 SHA512 f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56
diff --git a/media-libs/glfw/glfw-3.3.1.ebuild b/media-libs/glfw/glfw-3.3.2.ebuild
similarity index 96%
rename from media-libs/glfw/glfw-3.3.1.ebuild
rename to media-libs/glfw/glfw-3.3.2.ebuild
index 762e43166413..344e650b9d62 100644
--- a/media-libs/glfw/glfw-3.3.1.ebuild
+++ b/media-libs/glfw/glfw-3.3.2.ebuild
@@ -34,6 +34,7 @@ DEPEND="
wayland? ( dev-libs/wayland-protocols )
"
BDEPEND="
+ !wayland? ( x11-libs/libXi )
wayland? ( kde-frameworks/extra-cmake-modules )
"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c9e9f8f00597..9d5042f6c3bd 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b9c51cf7cceb..4fc1aa2a256a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jun 2020 09:08:26 +0000
+Tue, 16 Jun 2020 13:08:31 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b9c51cf7cceb..4fc1aa2a256a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jun 2020 09:08:26 +0000
+Tue, 16 Jun 2020 13:08:31 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 575c07436231..089164eef8f2 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index c035058f44d2..d985fdea8206 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/atokx3-3.0.0-r12 b/metadata/md5-cache/app-i18n/atokx3-3.0.0-r12
deleted file mode 100644
index 8afe64e9c7ad..000000000000
--- a/metadata/md5-cache/app-i18n/atokx3-3.0.0-r12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DESCRIPTION=ATOK X3 for Linux - The most famous Japanese Input Method Engine
-EAPI=6
-HOMEPAGE=https://www.justsystems.com/jp/products/atok_linux/
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=ATOK MIT
-PROPERTIES=interactive
-RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 media-libs/fontconfig media-libs/libpng sys-apps/tcp-wrappers sys-libs/pam x11-libs/cairo >=x11-libs/gtk+-2.4.13:2 x11-libs/libICE x11-libs/libSM x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXxf86vm x11-libs/libdrm x11-libs/pangox-compat amd64? ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/libpng-1.2.51[abi_x86_32(-)] >=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] >=sys-libs/pam-0-r1[abi_x86_32(-)] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)] )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=https://gate.justsystems.com/download/atok/up/lin/atokx3up2.tar.gz https://gate.justsystems.com/download/atok/up/lin/atokx3gtk216.tar.gz https://gate.justsystems.com/download/zipcode/up/lin/a20y1406lx.tgz
-_eclasses_=cdrom 6ffe90ac67bc6ac95249cae335323907 desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 portability e8f7ef3a41965b21a734550f8a94c1c6 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=bce9c01ae7eafbcb56095ae65c4a1d66
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 7b0df4b57c88..cdba69738acd 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.79.1 b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.79.1
new file mode 100644
index 000000000000..e3e3c1ae856f
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.79.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm test
+DESCRIPTION=XSL Stylesheets for Docbook
+EAPI=7
+HOMEPAGE=https://github.com/docbook/wiki/wiki
+IUSE=ruby
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=app-text/build-docbook-catalog-1.4 ruby? ( dev-lang/ruby )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/docbook/docbook-xsl-ns-1.79.1.tar.bz2
+_md5_=d25457f95d422235e5b05296f30d8e2a
diff --git a/metadata/md5-cache/app-text/foliate-2.2.1 b/metadata/md5-cache/app-text/foliate-2.2.1
index 944f310d33a0..ac2654dbc3f6 100644
--- a/metadata/md5-cache/app-text/foliate-2.2.1
+++ b/metadata/md5-cache/app-text/foliate-2.2.1
@@ -1,12 +1,12 @@
-BDEPEND=sys-devel/gettext >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=>=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 sys-devel/gettext >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
DEFINED_PHASES=compile configure install postinst postrm prepare test
DESCRIPTION=gtk ebook reader built with gjs
EAPI=7
HOMEPAGE=https://github.com/johnfactotum/foliate/
KEYWORDS=~amd64
LICENSE=GPL-3+
-RDEPEND=sys-devel/gettext dev-libs/gjs net-libs/webkit-gtk
+RDEPEND=dev-libs/gjs net-libs/webkit-gtk
SLOT=0
SRC_URI=https://github.com/johnfactotum/foliate/archive/2.2.1.tar.gz -> foliate-2.2.1.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 l10n 97f2753e3f1f3753d53d856c7c0bbb0b meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6b215b6082b93199b7b206cbd0547eb
+_md5_=5ec92f696b893cb73bb533c9ef2f7d50
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.5.3 b/metadata/md5-cache/app-text/pdfarranger-1.5.3
new file mode 100644
index 000000000000..897f1914fe76
--- /dev/null
+++ b/metadata/md5-cache/app-text/pdfarranger-1.5.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pikepdf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),cairo] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] app-text/poppler[introspection,cairo] dev-python/python-distutils-extra[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Merge or split pdfs; rearrange, rotate, crop pages.
+EAPI=7
+HOMEPAGE=https://github.com/jeromerobert/pdfarranger
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-python/pikepdf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),cairo] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] app-text/poppler[introspection,cairo] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.5.3.tar.gz -> pdfarranger-1.5.3.tar.gz
+_eclasses_=distutils-r1 89b310c534a033a3566e0f26419daa81 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=6267cd865e66dc86ae884a6cc34d476f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8ace8dbeaebc..3da16c07c7f0 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/pikepdf-1.14.0 b/metadata/md5-cache/dev-python/pikepdf-1.14.0
new file mode 100644
index 000000000000..420275842475
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-1.14.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/qpdf:0= dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/attrs-19.1.0 >=dev-python/hypothesis-4.24 =dev-python/pillow-5.0.0 >=dev-python/pytest-4.4.0 =dev-python/pytest-xdist-1.28 =dev-python/pytest-helpers-namespace-2019.1.8 >=dev-python/pytest-timeout-1.3.3 >=dev-python/python-xmp-toolkit-2.0.1 )
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RDEPEND=app-text/qpdf:0= dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pikepdf/pikepdf/archive/v1.14.0.tar.gz -> pikepdf-1.14.0.tar.gz
+_eclasses_=distutils-r1 89b310c534a033a3566e0f26419daa81 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=71643dbb91daacc003c9efcb61981532
diff --git a/metadata/md5-cache/dev-python/tld-0.12.2 b/metadata/md5-cache/dev-python/tld-0.12.2
new file mode 100644
index 000000000000..617a6217868a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tld-0.12.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Extract the top level domain (TLD) from the URL given
+EAPI=7
+HOMEPAGE=https://github.com/barseghyanartur/tld
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/barseghyanartur/tld/archive/0.12.2.tar.gz -> tld-0.12.2.tar.gz
+_eclasses_=distutils-r1 89b310c534a033a3566e0f26419daa81 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=733760565920d77c1d9bbb714db0b559
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 9c73dfddd283..e9cb13c45e84 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.1 b/metadata/md5-cache/media-libs/glfw-3.3.2
similarity index 81%
rename from metadata/md5-cache/media-libs/glfw-3.3.1
rename to metadata/md5-cache/media-libs/glfw-3.3.2
index 92698280f1f5..309a980182a4 100644
--- a/metadata/md5-cache/media-libs/glfw-3.3.1
+++ b/metadata/md5-cache/media-libs/glfw-3.3.2
@@ -1,4 +1,4 @@
-BDEPEND=wayland? ( kde-frameworks/extra-cmake-modules ) dev-util/ninja dev-util/cmake
+BDEPEND=!wayland? ( x11-libs/libXi ) wayland? ( kde-frameworks/extra-cmake-modules ) dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare test
DEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] ) wayland? ( dev-libs/wayland-protocols )
DESCRIPTION=The Portable OpenGL FrameWork
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm64 ~hppa ~x86
LICENSE=ZLIB
RDEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] )
SLOT=0
-SRC_URI=https://github.com/glfw/glfw/archive/3.3.1.tar.gz -> glfw-3.3.1.tar.gz
+SRC_URI=https://github.com/glfw/glfw/archive/3.3.2.tar.gz -> glfw-3.3.2.tar.gz
_eclasses_=cmake 19b0421555865baefd505831dd4303e3 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=1464cb54b5871693e0ec61d32dba13b3
+_md5_=027c4d03f2228d244f04c266fdae7fd9
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 3a3190d3f82b..100054e7cf80 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.61.0.95 b/metadata/md5-cache/net-im/skypeforlinux-8.61.0.95
new file mode 100644
index 000000000000..1ee1b6f4e84d
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.61.0.95
@@ -0,0 +1,16 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=7
+HOMEPAGE=https://www.skype.com/
+IUSE=kernel_linux abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.61.0.95-1.x86_64.rpm
+_eclasses_=chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop 7fd20552ce4cc97e8acb132a499a7dd8 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 pax-utils a41d1fd1c111289ffa04490de6ee79d7 rpm 760ff223c2c4299b68ea901e24c4cabd toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a8f802f06f1c6ed7df1bf48f2d3302f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index f7497850cbe8..1064fd31d70b 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.0_pre2 b/metadata/md5-cache/net-misc/rsync-3.2.0_pre2
new file mode 100644
index 000000000000..a9913e2dbb7a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rsync-3.2.0_pre2
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.8 dev-python/commonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) lz4? ( app-arch/lz4[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) system-zlib? ( sys-libs/zlib[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) xxhash? ( dev-libs/xxhash[static-libs(+)] ) zstd? ( app-arch/zstd[static-libs(+)] ) >=dev-libs/popt-1.5[static-libs(+)] )
+DESCRIPTION=File transfer program to keep remote files into sync
+EAPI=7
+HOMEPAGE=https://rsync.samba.org/
+IUSE=acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd
+LICENSE=GPL-3
+RDEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
+SLOT=0
+SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.0pre2.tar.gz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 2477ebe553d3e4d2c606191fe6c33602 prefix c2993e4c430c1ee24f278983d6189501 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=5a184617da1783aeb46ebec99a036608
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.06.06 b/metadata/md5-cache/net-misc/youtube-dl-2020.06.06
deleted file mode 100644
index bdd94bc6e88e..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.06.06
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2020.06.06/youtube-dl-2020.06.06.tar.gz
-_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef distutils-r1 89b310c534a033a3566e0f26419daa81 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=918ead4df120b59067b3d7087ea5d91b
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.06.16 b/metadata/md5-cache/net-misc/youtube-dl-2020.06.16
deleted file mode 100644
index 504a8af41d46..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.06.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2020.06.16/youtube-dl-2020.06.16.tar.gz
-_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef distutils-r1 89b310c534a033a3566e0f26419daa81 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=e77ba5b55a1b3060154281fa5ab77f57
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.06.16.1 b/metadata/md5-cache/net-misc/youtube-dl-2020.06.16.1
index e5a8df74cfd1..e3a9976b63ae 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.06.16.1
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.06.16.1
@@ -5,7 +5,7 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
EAPI=7
HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
LICENSE=public-domain
RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://youtube-dl.org/downloads/2020.06.16.1/youtube-dl-2020.06.16.1.tar.gz
_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef distutils-r1 89b310c534a033a3566e0f26419daa81 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=e77ba5b55a1b3060154281fa5ab77f57
+_md5_=918ead4df120b59067b3d7087ea5d91b
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 36922b97c81b..d74a717dc7dc 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-7.30 b/metadata/md5-cache/sci-geosciences/gpxsee-7.30
new file mode 100644
index 000000000000..dbbd2d55fa9f
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-7.30
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
+EAPI=7
+HOMEPAGE=https://www.gpxsee.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://github.com/tumic0/GPXSee/archive/7.30.tar.gz -> gpxsee-7.30.tar.gz
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 estack 686eaab303305a908fd57b2fd7617800 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 2477ebe553d3e4d2c606191fe6c33602 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4b10a11bd1445907188de31e4162047
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b9c51cf7cceb..4fc1aa2a256a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jun 2020 09:08:26 +0000
+Tue, 16 Jun 2020 13:08:31 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 33e386501258..a97ee22b49f1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue 16 Jun 2020 09:08:26 AM UTC
+Tue 16 Jun 2020 01:08:31 PM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fa5cc130bd1b..b8b19b9283b5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jun 2020 09:30:02 +0000
+Tue, 16 Jun 2020 13:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f61275578b95..72df7fa8f409 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-04e2ba6168d858065a598e80ef88a0dc58bba9c1 1592297665 2020-06-16T08:54:25+00:00
+bb04fe44a8e5c8e07d644d4a3898182c6ce21418 1592311816 2020-06-16T12:50:16+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3dc2fa6e28d3..826f7136b0dc 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1592298301 Tue 16 Jun 2020 09:05:01 AM UTC
+1592312701 Tue 16 Jun 2020 01:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b9c51cf7cceb..4fc1aa2a256a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Jun 2020 09:08:26 +0000
+Tue, 16 Jun 2020 13:08:31 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 472a5f230b95..d9200a60990a 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 0d5552cfecbf..27da505f8a2e 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,3 +1,4 @@
DIST skypeforlinux_8.59.0.77-1.x86_64.rpm 108914465 BLAKE2B 9d8300b9d315b95528e7e453a4b2175a22cc598634f0b517e6e0b45dfd7c04d6cee92d46d455486ee00ea1953617132e6c97576d5cc344988912aa3df03609e8 SHA512 4faa158605c13ee66bf49aad8e1b06f0429772c676088559fb28f6012cf263c1425f830678edd9605cfd69a4a0fb75f051fd96acd0a8a4fb636bb3a5beceb211
DIST skypeforlinux_8.60.0.76-1.x86_64.rpm 108325497 BLAKE2B 84304111a215d0e0ddb7cdad218913feb961b490ab5bdee3ca506c1666b1a37dfdb8360fa84fb36c56cd47458012c92d6eea2f437e2b9787b7b232dc797adf76 SHA512 a7a1e3ae3c13d235c951c5aad006df668287e82914aa333ad5429ba1a2ac0ebb84cd703f4c5e620385469c91db437105dafac93dcde7af7bb774f48dbe2370d4
DIST skypeforlinux_8.61.0.77-1.x86_64.rpm 113617464 BLAKE2B 4e3b16cd0119e6bf1900aaa8b9a81bfc87d6ae20a109656001fd63220064c9418dac1ce8114db385ba08f7c7d915f94b9bc368a51f1c2b91d778942d1519abf0 SHA512 81b7797f2e77382358033db80b11870202aeeec4dac771161ec18c2f589b7110b6813bf5a0432e4db0926854da181641fbbeffda8ab644656af45afafa49b3a5
+DIST skypeforlinux_8.61.0.95-1.x86_64.rpm 113617440 BLAKE2B d09468c0bcca8551f8381f1af2d8b609bab40917582d184921ba054e60ab30cc58626fd3e0ccff8a93c5fbf6132091a461fa846bfedecda724b38dab47c9babd SHA512 f9b844675fc30208be04d317aaad4c82543789806766045e564cf9d71105c1c5122507b6719cdf4879d656e2423dbc43b98cc2aad8a242d9def95a5f797b46de
diff --git a/net-im/skypeforlinux/skypeforlinux-8.61.0.95.ebuild b/net-im/skypeforlinux/skypeforlinux-8.61.0.95.ebuild
new file mode 100644
index 000000000000..c2755ee5b06c
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.61.0.95.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit chromium-2 desktop pax-utils rpm multilib-build xdg
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+ app-crypt/libsecret[${MULTILIB_USEDEP}]
+ dev-libs/atk[${MULTILIB_USEDEP}]
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ dev-libs/nspr[${MULTILIB_USEDEP}]
+ dev-libs/nss[${MULTILIB_USEDEP}]
+ media-libs/alsa-lib[${MULTILIB_USEDEP}]
+ media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/libv4l[${MULTILIB_USEDEP}]
+ net-print/cups[${MULTILIB_USEDEP}]
+ sys-apps/dbus[${MULTILIB_USEDEP}]
+ sys-devel/gcc[cxx]
+ virtual/ttf-fonts
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]"
+
+pkg_setup() {
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+ rpm_src_unpack ${A}
+}
+
+src_prepare() {
+ default
+ sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+ -i usr/bin/skypeforlinux || die
+ sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+ -e "/^OnlyShowIn=/d" \
+ -i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+ dodir /opt
+ cp -a usr/share/skypeforlinux "${ED}"/opt || die
+
+ # remove chrome-sandbox binary, users should use kernel namespaces
+ # https://bugs.gentoo.org/692692#c18
+ rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
+
+ dobin usr/bin/skypeforlinux
+
+ dodoc usr/share/skypeforlinux/*.html
+ dodoc -r usr/share/doc/skypeforlinux/.
+ # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
+ dosym ${PF} usr/share/doc/skypeforlinux
+
+ doicon usr/share/pixmaps/skypeforlinux.png
+
+ local res
+ for res in 16 32 256 512; do
+ newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+ done
+
+ domenu usr/share/applications/skypeforlinux.desktop
+
+ pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+ pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 358135240f28..4272342a80eb 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 829c80d46fc4..8bcd788e14ce 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1 +1,2 @@
DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
+DIST rsync-3.2.0pre2.tar.gz 1044334 BLAKE2B 5069a09d6a24c4c4adfc2202a0845f156270c23e2c236a8a9d490d0156ece4e81ccca6aa9eefd552cd1512e60fff38fd79d3b4ba4e06b11a22ca591daaaae7b0 SHA512 e88093a44d5ac8ff235429aea6a7f93cd8b5a1de42eeee1b7d6d0ce2c23234ac670a775028e2eca22cbf1144b9bac827c0393c22eaf11fa5ec47dc64129462e7
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
index 148a18e18adc..1f39f5419f36 100644
--- a/net-misc/rsync/metadata.xml
+++ b/net-misc/rsync/metadata.xml
@@ -10,5 +10,7 @@
diff --git a/net-misc/rsync/rsync-3.2.0_pre2.ebuild b/net-misc/rsync/rsync-3.2.0_pre2.ebuild
new file mode 100644
index 000000000000..485c7b0379a9
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.0_pre2.ebuild
@@ -0,0 +1,125 @@
+# 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 flag-o-matic prefix python-any-r1 systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
+[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+ lz4? ( app-arch/lz4[static-libs(+)] )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+ libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ )
+ system-zlib? ( sys-libs/zlib[static-libs(+)] )
+ xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+ xxhash? ( dev-libs/xxhash[static-libs(+)] )
+ zstd? ( app-arch/zstd[static-libs(+)] )
+ >=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+
+BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/commonmark[${PYTHON_USEDEP}]
+ ')"
+
+S="${WORKDIR}/${P/_/}"
+
+python_check_deps() {
+ has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myeconfargs=(
+ --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+ --without-included-popt
+ $(use_enable acl acl-support)
+ $(use_enable iconv)
+ $(use_enable ipv6)
+ $(use_enable lz4)
+ $(use_enable ssl openssl)
+ $(use_with !system-zlib included-zlib)
+ $(use_enable xattr xattr-support)
+ $(use_enable xxhash)
+ $(use_enable zstd)
+ )
+ econf "${myeconfargs[@]}"
+ touch proto.h-tstamp #421625
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+ newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+ dodoc NEWS.md OLDNEWS.md README.md TODO tech_report.tex
+
+ insinto /etc
+ newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+ # Install stunnel helpers
+ if use stunnel ; then
+ emake DESTDIR="${D}" install-ssl-client
+ emake DESTDIR="${D}" install-ssl-daemon
+ fi
+
+ # Install the useful contrib scripts
+ if use examples ; then
+ exeinto /usr/share/rsync
+ doexe support/*
+ rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+ fi
+
+ eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+ systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+ if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+ "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+ ewarn "You have disabled chroot support in your rsyncd.conf. This"
+ ewarn "is a security risk which you should fix. Please check your"
+ ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+ fi
+ if use stunnel ; then
+ einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+ einfo
+ einfo "You maybe have to update the certificates configured in"
+ einfo "${EROOT}/etc/stunnel/rsync.conf"
+ fi
+ if use system-zlib ; then
+ ewarn "Using system-zlib is incompatible with =rsync-3.1.1 built with bundled zlib,"
+ ewarn "and the --compress option, add --new-compress (-zz)."
+ ewarn
+ ewarn "For syncing the portage tree, add:"
+ ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+ fi
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 3bacf14482a0..2c88023fad14 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1 @@
-DIST youtube-dl-2020.06.06.tar.gz 3176995 BLAKE2B 0971a8f82eedf3dc6a635b90318586988ffc8a8219386e0eda8ca020fb9981ceabb4b708c0d90c38f5eab2c17daa98d73cead473e33a1ed27b726a087d9a57f7 SHA512 b3c910f8b26a11e225cfdebc3612e04010e1af027bc48b88f0b8bd36ba83f10eaed05375cbc833b421da9b377152722aa74ab936ed238957165a6b5f0149589b
DIST youtube-dl-2020.06.16.1.tar.gz 3177873 BLAKE2B 8bf2df25b416c4a48b2b4a14466f15f99b1bbe0b4900c18e30bc3edab66a54b036f95025218cb584f820f3c45b2ab2e805f21e2d6548078d49c6a122fb52716d SHA512 2f0c01cd1a52293afd8c4fddc20b6f7baca94903fbe852769ad1d25740bd87e38d42ee4a275c2e3d611c639c432f6245d27f361471c6b566da03677384a04e54
-DIST youtube-dl-2020.06.16.tar.gz 3178801 BLAKE2B e0c724c8eb239622efa0528d37ef028d81eebea1ef601512166e48afa9edc4710c9f2f641db050afc34a82b0ed305fdf3ffe04d51f672d6e334ef83d3120b7d0 SHA512 83689b98b74f45bf13049eaf4c109081ef783d7978085b58b76a761a74facc1f4f19a3cac8542960359bf961fd4543c6ab2c4a130316fe4285b2d2d5855ed099
diff --git a/net-misc/youtube-dl/youtube-dl-2020.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2020.06.06.ebuild
deleted file mode 100644
index 9dc88dfb1591..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.06.06.ebuild
+++ /dev/null
@@ -1,74 +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 bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/flake8[${PYTHON_USEDEP}]
- )
-"
-S=${WORKDIR}/${PN}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-python_test() {
- emake offlinetest
-}
-
-python_install_all() {
- dodoc README.txt
- doman ${PN}.1
-
- newbashcomp ${PN}.bash-completion ${PN}
-
- insinto /usr/share/zsh/site-functions
- newins ${PN}.zsh _${PN}
-
- insinto /usr/share/fish/vendor_completions.d
- doins ${PN}.fish
-
- distutils-r1_python_install_all
-
- rm -r "${ED}"/usr/etc || die
- rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
- elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
- elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
- elog
- elog "${PN} works fine on its own on most sites. However, if you want"
- elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
- elog "On some sites - most notably YouTube - videos can be retrieved in"
- elog "a higher quality format without sound. ${PN} will detect whether"
- elog "ffmpeg is present and automatically pick the best option."
- elog
- elog "Videos or video formats streamed via RTMP protocol can only be"
- elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
- elog
- elog "Downloading MMS and RTSP videos requires either mplayer"
- elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
- elog
- elog "If you want ${PN} to embed thumbnails from the metadata into the"
- elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.06.16.1.ebuild b/net-misc/youtube-dl/youtube-dl-2020.06.16.1.ebuild
index 27edc068096a..9dc88dfb1591 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.06.16.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.06.16.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/net-misc/youtube-dl/youtube-dl-2020.06.16.ebuild b/net-misc/youtube-dl/youtube-dl-2020.06.16.ebuild
deleted file mode 100644
index 27edc068096a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.06.16.ebuild
+++ /dev/null
@@ -1,74 +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 bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/flake8[${PYTHON_USEDEP}]
- )
-"
-S=${WORKDIR}/${PN}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-python_test() {
- emake offlinetest
-}
-
-python_install_all() {
- dodoc README.txt
- doman ${PN}.1
-
- newbashcomp ${PN}.bash-completion ${PN}
-
- insinto /usr/share/zsh/site-functions
- newins ${PN}.zsh _${PN}
-
- insinto /usr/share/fish/vendor_completions.d
- doins ${PN}.fish
-
- distutils-r1_python_install_all
-
- rm -r "${ED}"/usr/etc || die
- rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
- elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
- elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
- elog
- elog "${PN} works fine on its own on most sites. However, if you want"
- elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
- elog "On some sites - most notably YouTube - videos can be retrieved in"
- elog "a higher quality format without sound. ${PN} will detect whether"
- elog "ffmpeg is present and automatically pick the best option."
- elog
- elog "Videos or video formats streamed via RTMP protocol can only be"
- elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
- elog
- elog "Downloading MMS and RTSP videos requires either mplayer"
- elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
- elog
- elog "If you want ${PN} to embed thumbnails from the metadata into the"
- elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7772cf232adc..56989b0891ff 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index a39d25fc2d76..7dc6827a250b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -247,12 +247,6 @@ sci-chemistry/nmrdepaker
# Removal in 30 days. Bug #544228.
dev-python/restkit
-# Andreas Sturmlechner (2020-05-17)
-# Depends on deprecated x11-libs/pangox-compat, commercial software that
-# since 2017 does no longer support Linux. Bugs #694920, #720848
-# Masked for removal in 30 days.
-app-i18n/atokx3
-
# Aaron W. Swenson (2020-05-15)
# PostgreSQL 9.4 series is EOL. Migrate your database cluster to a more recent
# version.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a13d2ef617ce..b31889a58826 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6637,6 +6637,8 @@ net-misc/remmina:spice - Support connecting to SPICE-enabled virtual machines
net-misc/remmina:ssh - Enable support for SSH/SFTP protocol
net-misc/remmina:telepathy - Enable telepathy support
net-misc/rsync:stunnel - Provide helper scripts for using rsync via >=net-misc/stunnel-4
+net-misc/rsync:system-zlib - Use system zlib instead of bundled one. This is incompatible with older rsync releases!
+net-misc/rsync:xxhash - Enable dev-libs/xxhash support for hashing
net-misc/rygel:tracker - Install dependencies for the tracker plugin
net-misc/rygel:transcode - Install dependencies for transcoding support
net-misc/scponly:chroot - Enables adding and configuring an 'scponlyc' chrooted user
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 51b4b8b036f7..ec2a15a2b2e5 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index f41f1380d6eb..7cbf67ba4396 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1 +1,2 @@
DIST gpxsee-7.29.tar.gz 5363181 BLAKE2B 4d3a5693a7b5939847c2dc32bff205649264766975c6313220e305770e40602f40e03c74db22e043860f1a2953a43e7ec0a58624f4882de93f3320a32dc6292e SHA512 e4133ad7a9b5e25f3c0bdd2397e02b6219e81f8632385e6423244e7c400ff72a5be85720f1ec123428ae3aeca79cac81e03b7f40de83d309e55ee69ee7cc933f
+DIST gpxsee-7.30.tar.gz 5371435 BLAKE2B 49f257dc50201b2fd5a621d51fba67fd8511399c2fb97bd30087e0daedb3db78b678d658bfc6e5c3faedeea84940a8fb1ebe7df16cf3002e40d934c3798ce44a SHA512 b1771cc63df538e6ed5b9c7f47a0aaf4f31969a03a1727870372a249c36f3504adfbb31fdc321cc0da3547f02be7f33639f6e5569a83c98092f2d9a998690c00
diff --git a/sci-geosciences/gpxsee/gpxsee-7.30.ebuild b/sci-geosciences/gpxsee/gpxsee-7.30.ebuild
new file mode 100644
index 000000000000..c5b1bd5f1e11
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.30.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en es fi fr hu nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+ rm_ts() {
+ sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+ }
+
+ l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+ lrelease gpxsee.pro
+ eqmake5 gpxsee.pro
+ emake
+}
+
+src_install() {
+ local lang
+ dobin ${PN}
+ dodoc README.md
+ insinto /usr/share/${PN}
+ doins -r pkg/maps pkg/csv
+
+ insinto /usr/share/${PN}/translations
+ for lang in lang/*.qm; do
+ [ -f "${lang}" ] && doins "${lang}"
+ done
+
+ domenu pkg/${PN}.desktop
+ insinto /usr/share/mime/packages
+ doins pkg/${PN}.xml
+ doicon icons/${PN}.png
+}