trickle: fix build with newer glibc

libav is abandoned

packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.9-r1.exheres-0

@@ -23,7 +23,6 @@ LICENCES="wxWinLL-3 LGPL-2.1"
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
 MYOPTIONS="
-    ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
     ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
 "
 
@@ -33,6 +32,7 @@ DEPENDENCIES="
     build+run:
         app-text/poppler[cairo]
         dev-libs/glib:2
+        media/ffmpeg
         media-libs/freetype:2
         media-libs/giflib:=
         media-libs/gstreamer:1.0
@@ -49,10 +49,8 @@ DEPENDENCIES="
         x11-libs/cairo
         x11-libs/libX11
         x11-libs/libXrandr
-        providers:ffmpeg? ( media/ffmpeg )
         providers:ijg-jpeg? ( media-libs/jpeg:= )
         providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
-        providers:libav? ( media/libav )
 "
 
 CMAKE_SRC_CONFIGURE_PARAMS=(

packages/dev-haskell/ghcup/ghcup-0.1.10.exheres-0

@@ -16,8 +16,10 @@ MYOPTIONS="
 "
 
 DEPENDENCIES="
-    run:
-        net-misc/curl
+    recommendation:
+        net-misc/curl [[ description = [ GHCup uses curl by default for downloads ] ]]
+    suggestion:
+        net-misc/wget [[ description = [ GHCup can use wget instead of curl ] ]]
 "
 
 BUGS_TO="hasufell@posteo.de"
@@ -25,7 +27,7 @@ BUGS_TO="hasufell@posteo.de"
 WORK=${WORKBASE}
 
 src_unpack() {
-    edo mv "${FETCHEDDIR}/${ARCHIVES}" ghcup
+    edo cp "${FETCHEDDIR}/${ARCHIVES}" ghcup
 }
 
 src_install() {

packages/dev-python/mypy/mypy-0.782.exheres-0

@@ -24,7 +24,7 @@ MYOPTIONS=""
 DEPENDENCIES="
     build+run:
         dev-python/typed-ast[>=1.4.0&<1.5.0][python_abis:*(-)?]
-        dev-python/mypy_extensions[>=0.4.0&<0.5.0][python_abis:*(-)?]
+        dev-python/mypy_extensions[>=0.4.3&<0.5.0][python_abis:*(-)?]
         dev-python/typing-extensions[>=3.7.4][python_abis:*(-)?]
     test:
         dev-python/attrs[>=18.0][python_abis:*(-)?]

packages/dev-python/python-sipsimple/python-sipsimple-3.4.2-r1.exheres-0

@@ -12,7 +12,6 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 MYOPTIONS="
     ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
-    ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
 "
 
 DEPENDENCIES="
@@ -23,12 +22,11 @@ DEPENDENCIES="
         dev-db/sqlite:3
         dev-libs/icu:=
         dev-python/python-application[>=2.5.0][python_abis:*(-)?]
+        media/ffmpeg[h264]
         media-libs/libvpx
         media-libs/v4l-utils
         sys-apps/util-linux
         sys-sound/alsa-lib
-        providers:ffmpeg? ( media/ffmpeg[h264] )
-        providers:libav? ( media/libav[h264] )
         providers:libressl? ( dev-libs/libressl:= )
         providers:openssl? ( dev-libs/openssl )
     run:

packages/dev-util/github-cli/github-cli-1.0.0.exheres-0

@@ -0,0 +1,44 @@
+# Copyright 2020 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require bash-completion zsh-completion
+require github [ user='cli' pn='cli' tag="v${PV}" ]
+
+SUMMARY="Github CLI"
+
+LICENCES="MIT"
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    build:
+        dev-lang/go
+    run:
+        dev-scm/git
+"
+
+BUGS_TO="hasufell@posteo.de"
+
+src_compile() {
+    export GOPATH="${WORK}"/.gopath
+    export GOBIN="${WORK}"/.bin
+    unset LDFLAGS
+
+    esandbox disable_net
+    emake
+    emake manpages
+
+	edo go run ./cmd/gh completion -s bash > gh.bash-completion
+	edo go run ./cmd/gh completion -s zsh > gh.zsh-completion
+    esandbox enable_net
+}
+
+src_install() {
+    dobin bin/gh
+    emagicdocs
+
+    doman share/man/man?/gh*.?
+    dobashcompletion gh.bash-completion
+    dozshcompletion gh.zsh-completion
+}

packages/media-gfx/pinta/files/pinta-1.6-mono-4.patch

@@ -1,74 +0,0 @@
-Source: Gentoo
-Reason: fix build with mono-4
-Upstream: just a simple backport of a series of more complicated fixes
-
-diff -Naur pinta-1.6_orig/Pinta/Pinta.csproj pinta-1.6/Pinta/Pinta.csproj
---- pinta-1.6_orig/Pinta/Pinta.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta/Pinta.csproj	2015-12-12 15:02:28.796155090 +0100
-@@ -80,7 +80,7 @@
-     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-       <Package>gtk-sharp-2.0</Package>
-     </Reference>
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-       <Package>gtk-sharp-2.0</Package>
-diff -Naur pinta-1.6_orig/Pinta.Core/Pinta.Core.csproj pinta-1.6/Pinta.Core/Pinta.Core.csproj
---- pinta-1.6_orig/Pinta.Core/Pinta.Core.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta.Core/Pinta.Core.csproj	2015-12-12 15:02:28.798155090 +0100
-@@ -55,7 +55,7 @@
-     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-   </PropertyGroup>
-   <ItemGroup>
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="System.Core" />
-diff -Naur pinta-1.6_orig/Pinta.Effects/Pinta.Effects.csproj pinta-1.6/Pinta.Effects/Pinta.Effects.csproj
---- pinta-1.6_orig/Pinta.Effects/Pinta.Effects.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta.Effects/Pinta.Effects.csproj	2015-12-12 15:02:28.797155090 +0100
-@@ -58,7 +58,7 @@
-     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="System.Core">
-     </Reference>
-diff -Naur pinta-1.6_orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj pinta-1.6/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj
---- pinta-1.6_orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2015-12-12 15:02:28.797155090 +0100
-@@ -54,7 +54,7 @@
-     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-   </PropertyGroup>
-   <ItemGroup>
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-diff -Naur pinta-1.6_orig/Pinta.Install.proj pinta-1.6/Pinta.Install.proj
---- pinta-1.6_orig/Pinta.Install.proj	2015-03-01 23:14:37.000000000 +0100
-+++ pinta-1.6/Pinta.Install.proj	2015-12-12 15:05:20.974156635 +0100
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
- 
-   <!-- Set some paths -->
-   <PropertyGroup>
-diff -Naur pinta-1.6_orig/Pinta.Tools/Pinta.Tools.csproj pinta-1.6/Pinta.Tools/Pinta.Tools.csproj
---- pinta-1.6_orig/Pinta.Tools/Pinta.Tools.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta.Tools/Pinta.Tools.csproj	2015-12-12 15:02:28.795155090 +0100
-@@ -54,7 +54,7 @@
-     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-   </PropertyGroup>
-   <ItemGroup>
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="System.Core" />
-     <Reference Include="System.Xml" />

packages/media-gfx/pinta/files/pinta-1.6-pkg-config.patch

@@ -1,32 +0,0 @@
-From 2dfeb6f3fcec7d620a5a5a6f0d6d437c55bd3109 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Sun, 5 Jun 2016 19:26:37 +0200
-Subject: [PATCH] Use PKG_PROG_PKG_CONFIG macro to check for pkg-config
-Upstream: submitted, https://github.com/PintaProject/Pinta/pull/120
-
-Using AC_PATH_PROG isn't the standard way and breaks if
-the distribution provides only prefixed (as in: <arch>-pkg-config)
-versions.
----
- configure.ac | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 18b7199..7eb3f93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,10 +7,7 @@ YELP_HELP_INIT
- AC_PROG_INSTALL
- 
- dnl pkg-config
--AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--if test "x$PKG_CONFIG" = "xno"; then
--        AC_MSG_ERROR([You need to install pkg-config])
--fi
-+PKG_PROG_PKG_CONFIG([0.20])
- 
- AC_PATH_PROG(XBUILD, xbuild, no)
- AC_PATH_PROG(MONO, mono, no)
--- 
-2.8.3
-

packages/media-gfx/pinta/pinta-1.7.exheres-0

@@ -17,8 +17,3 @@ DEPENDENCIES="
         gnome-bindings/gtk-sharp:2
 "
 
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/pinta-1.6-pkg-config.patch
-    "${FILES}"/pinta-1.6-mono-4.patch
-)
-

packages/media-gfx/pinta/pinta.exlib

@@ -1,9 +1,9 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 1.15 ] ]
 require github [ user=PintaProject project=Pinta ]
-require gtk-icon-cache freedesktop-desktop freedesktop-mime
+require gtk-icon-cache freedesktop-desktop
 
 export_exlib_phases src_prepare pkg_postinst pkg_postrm
 
@@ -23,13 +23,11 @@ pinta_src_prepare() {
 }
 
 pinta_pkg_postinst() {
-    freedesktop-mime_pkg_postinst
     freedesktop-desktop_pkg_postinst
     gtk-icon-cache_pkg_postinst
 }
 
 pinta_pkg_postrm() {
-    freedesktop-mime_pkg_postrm
     freedesktop-desktop_pkg_postrm
     gtk-icon-cache_pkg_postrm
 }

packages/net-misc/remmina/files/fix-share-paths.patch

@@ -0,0 +1,35 @@
+Upstream: yes https://gitlab.com/Remmina/Remmina/-/merge_requests/2108
+
+commit db8cc0e3bb260c316832d4dfdb308641fcb100af
+Author: Alexander Kapshuna <kapsh@kap.sh>
+Date:   Sat Aug 22 17:43:29 2020 +0300
+
+    Use previously defined DATADIR to install Kiosk files
+
+diff --git a/data/desktop/CMakeLists.txt b/data/desktop/CMakeLists.txt
+index 4f492ce8..eb586af3 100644
+--- a/data/desktop/CMakeLists.txt
++++ b/data/desktop/CMakeLists.txt
+@@ -154,19 +154,19 @@ if(WITH_KIOSK_SESSION)
+     message(STATUS "Kiosk desktop session files will be installed")
+     install(
+         FILES remmina-gnome-xsession.desktop
+-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/xsessions
++        DESTINATION ${REMMINA_DATADIR}/xsessions
+         RENAME remmina-gnome.desktop
+         PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+         )
+     install(
+         FILES remmina-gnome.desktop
+-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
++        DESTINATION ${REMMINA_DATADIR}/applications
+         RENAME remmina-gnome.desktop
+         PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+         )
+     install(
+         FILES remmina-gnome.session
+-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gnome-session/sessions
++        DESTINATION ${REMMINA_DATADIR}/gnome-session/sessions
+         RENAME remmina-gnome.session
+         PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+         )

packages/net-misc/remmina/remmina.exlib

@@ -13,6 +13,7 @@ HOMEPAGE+=" http://remmina.org/"
 
 LICENCES="GPL-2"
 MYOPTIONS="
+    cups
     ssh
     ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
     "
@@ -27,14 +28,18 @@ DEPENDENCIES="
         dev-libs/glib:2[>=2.30]
         dev-libs/libgcrypt
         dev-libs/libsecret:1
+        dev-libs/libsodium
         gnome-desktop/libsoup:2.4
         net-libs/libvncserver
-        net-remote/FreeRDP
+        net-remote/FreeRDP[>=2.0.0]
         x11-libs/cairo
         x11-libs/gdk-pixbuf:2.0
         x11-libs/gtk+:3
         x11-libs/libX11
         x11-libs/libxkbfile
+        cups? (
+            net-print/cups
+        )
         ssh? (
             net-libs/libssh
             dev-libs/vte:2.91
@@ -45,6 +50,10 @@ DEPENDENCIES="
 
 BUGS_TO="hasufell@posteo.de"
 
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}/fix-share-paths.patch"
+)
+
 CMAKE_SRC_CONFIGURE_PARAMS=(
     # on
     -DWITH_FREERDP=ON
@@ -59,9 +68,11 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
     -DWITH_AVAHI=OFF
     -DWITH_SPICE=OFF
     -DWITH_TELEPATHY=OFF
+    -DWITH_WWW=OFF
 )
 
 CMAKE_SRC_CONFIGURE_OPTION_WITHS=(
+    "cups CUPS"
     "ssh LIBSSH"
     "ssh VTE"
 )

packages/net-misc/trickle/trickle-1.07_p20180405.exheres-0

@@ -4,5 +4,5 @@
 GITHUB_REVISION=596bb13f2bc323fc8e7783b8dcba627de4969e07
 require trickle
 
-PLATFORMS="~amd64 ~x86"
+PLATFORMS="~amd64 ~armv8 ~x86"
 

packages/net-misc/trickle/trickle.exlib

@@ -17,6 +17,7 @@ MYOPTIONS=""
 DEPENDENCIES="
     build+run:
         dev-libs/libevent:=
+        net-libs/libtirpc
 "
 
 BUGS_TO="hasufell@posteo.de"
@@ -27,3 +28,10 @@ DEFAULT_SRC_PREPARE_PATCHES=(
     "${FILES}"/fix-install.patch
 )
 
+src_prepare(){
+    CFLAGS+=" -I/usr/$(exhost --target)/include/tirpc"
+    LDFLAGS+=" -ltirpc"
+
+    autotools_src_prepare
+}
+

packages/net-misc/youtube-viewer/youtube-viewer-3.7.7.exheres-0

@@ -31,8 +31,8 @@ DEPENDENCIES="
         dev-perl/Text-Tabs+Wrap
         dev-perl/libwww-perl
         gtk? (
+            dev-perl/Gtk3-Perl
             dev-perl/File-ShareDir
-            dev-perl/Gtk2-Perl
             x11-libs/gdk-pixbuf:2.0[X]
         )
     suggestion:
@@ -55,7 +55,7 @@ DEPENDENCIES="
 src_configure() {
     edo rm Makefile.PL
     if option gtk ; then
-        PERL_MODULE_SRC_CONFIGURE_PARAMS=( --gtk )
+        PERL_MODULE_SRC_CONFIGURE_PARAMS=( --gtk3 )
     fi
     perl-module_src_configure
 }

packages/x11-misc/zim/files/Fix-reading-preformatted-text-under-Python-3.9.patch

@@ -0,0 +1,27 @@
+Upstream: sent https://github.com/zim-desktop-wiki/zim-desktop-wiki/pull/1261
+
+From 1e63570eb941b985dc70df31043c7f4279c6a935 Mon Sep 17 00:00:00 2001
+From: Alexander Kapshuna <kapsh@kap.sh>
+Date: Fri, 18 Sep 2020 01:15:16 +0300
+Subject: [PATCH] Fix reading preformatted text under Python 3.9
+
+---
+ zim/formats/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zim/formats/__init__.py b/zim/formats/__init__.py
+index e1149f7f..f22b0b0b 100644
+--- a/zim/formats/__init__.py
++++ b/zim/formats/__init__.py
+@@ -822,7 +822,7 @@ class ParseTreeBuilder(Builder):
+ 		self._last_char = None
+
+ 	def append(self, tag, attrib=None, text=None):
+-		attrib = attrib.copy() if attrib is not None else None
++		attrib = attrib.copy() if attrib is not None else {}
+ 		if tag in BLOCK_LEVEL:
+ 			if text and not text.endswith('\n'):
+ 				text += '\n'
+--
+2.28.0
+

packages/x11-misc/zim/files/Replace-usage-of-getchildren-and-getiterator-with-li.patch

@@ -0,0 +1,239 @@
+Upstream: master
+
+From 0c7d355a76236b0c687fb7c59cd974c2c7f35657 Mon Sep 17 00:00:00 2001
+From: Robin Lee <cheeselee@fedoraproject.org>
+Date: Thu, 10 Sep 2020 21:31:22 +0800
+Subject: [PATCH] Replace usage of `getchildren` and `getiterator` with `list`
+ or `iter`
+
+Methods getchildren() and getiterator() of classes ElementTree and Element in
+the ElementTree module have been deprecated since Python 3.2 and removed since
+Python 3.9.
+
+Fixes #1258
+Closes #1259
+---
+ tests/__init__.py       |  2 +-
+ zim/formats/__init__.py | 44 ++++++++++++++++++++---------------------
+ zim/gui/pageview.py     |  2 +-
+ 3 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/tests/__init__.py b/tests/__init__.py
+index 20e5b8df..88f87f87 100644
+--- a/tests/__init__.py
++++ b/tests/__init__.py
+@@ -559,7 +559,7 @@ class _TestData(object):
+ 		tree = etree.ElementTree(file=root + '/tests/data/notebook-wiki.xml')
+
+ 		test_data = []
+-		for node in tree.getiterator(tag='page'):
++		for node in tree.iter(tag='page'):
+ 			name = node.attrib['name']
+ 			text = str(node.text.lstrip('\n'))
+ 			test_data.append((name, text))
+diff --git a/zim/formats/__init__.py b/zim/formats/__init__.py
+index 9e00c169..e1149f7f 100644
+--- a/zim/formats/__init__.py
++++ b/zim/formats/__init__.py
+@@ -262,7 +262,7 @@ class ParseTree(object):
+ 		'''Returns True if the tree contains any content at all.'''
+ 		root = self._etree.getroot()
+ 		return root is not None and (
+-			bool(root.getchildren()) or (root.text and not root.text.isspace())
++			bool(list(root)) or (root.text and not root.text.isspace())
+ 		)
+
+ 	@property
+@@ -284,14 +284,14 @@ class ParseTree(object):
+ 		myroot = self._etree.getroot()
+ 		otherroot = tree._etree.getroot()
+ 		if otherroot.text:
+-			children = myroot.getchildren()
++			children = list(myroot)
+ 			if children:
+ 				last = children[-1]
+ 				last.tail = (last.tail or '') + otherroot.text
+ 			else:
+ 				myroot.text = (myroot.text or '') + otherroot.text
+
+-		for element in otherroot.getchildren():
++		for element in iter(otherroot):
+ 			myroot.append(element)
+
+ 		return self
+@@ -312,7 +312,7 @@ class ParseTree(object):
+
+ 		# HACK: Force sorting of attrib - else change in python3.8 breaks test cases
+ 		# Ensure all attrib are string, else ElementTree fails
+-		for element in self._etree.getiterator('*'):
++		for element in self._etree.iter('*'):
+ 			myattrib = element.attrib.copy()
+ 			element.attrib.clear()
+ 			for key in sorted(myattrib.keys()):
+@@ -342,8 +342,8 @@ class ParseTree(object):
+ 		from zim.notebook.page import HRef # XXX
+ 		seen = set()
+ 		for elt in itertools.chain(
+-			self._etree.getiterator(LINK),
+-			self._etree.getiterator(IMAGE)
++			self._etree.iter(LINK),
++			self._etree.iter(IMAGE)
+ 		):
+ 			href = elt.attrib.get('href')
+ 			if href and href not in seen:
+@@ -359,7 +359,7 @@ class ParseTree(object):
+ 		@returns: yields an unordered list of tag names
+ 		'''
+ 		seen = set()
+-		for elt in self._etree.getiterator(TAG):
++		for elt in self._etree.iter(TAG):
+ 			name = elt.text
+ 			if not name in seen:
+ 				seen.add(name)
+@@ -367,7 +367,7 @@ class ParseTree(object):
+
+ 	def _get_heading_element(self, level=1):
+ 		root = self._etree.getroot()
+-		children = root.getchildren()
++		children = list(root)
+ 		if root.text and not root.text.isspace():
+ 			return None
+
+@@ -424,7 +424,7 @@ class ParseTree(object):
+ 		'''
+ 		root = self._etree.getroot()
+ 		roottext = root.text and not root.text.isspace()
+-		children = root.getchildren()
++		children = list(root)
+
+ 		if children and not roottext:
+ 			first = children[0]
+@@ -442,7 +442,7 @@ class ParseTree(object):
+ 		and a max depth.
+ 		'''
+ 		path = []
+-		for heading in self._etree.getiterator('h'):
++		for heading in self._etree.iter('h'):
+ 			level = int(heading.attrib['level'])
+ 			# find parent header in path using old level
+ 			while path and path[-1][0] >= level:
+@@ -461,11 +461,11 @@ class ParseTree(object):
+ 		adds a '_src_file' attribute to the elements with the full file path.
+ 		'''
+ 		if notebook is None:
+-			for element in self._etree.getiterator('img'):
++			for element in self._etree.iter('img'):
+ 				filepath = element.attrib['src']
+ 				element.attrib['_src_file'] = File(filepath)
+ 		else:
+-			for element in self._etree.getiterator('img'):
++			for element in self._etree.iter('img'):
+ 				filepath = element.attrib['src']
+ 				element.attrib['_src_file'] = notebook.resolve_file(element.attrib['src'], path)
+
+@@ -473,7 +473,7 @@ class ParseTree(object):
+ 		'''Undo effect of L{resolve_images()}, mainly intended for
+ 		testing.
+ 		'''
+-		for element in self._etree.getiterator('img'):
++		for element in self._etree.iter('img'):
+ 			if '_src_file' in element.attrib:
+ 				element.attrib.pop('_src_file')
+
+@@ -481,7 +481,7 @@ class ParseTree(object):
+ 		'''Calls encode_url() on all links that contain urls.
+ 		See zim.parsing for details. Modifies the parse tree.
+ 		'''
+-		for link in self._etree.getiterator('link'):
++		for link in self._etree.iter('link'):
+ 			href = link.attrib['href']
+ 			if href and is_url_re.match(href):
+ 				link.attrib['href'] = url_encode(href, mode=mode)
+@@ -492,7 +492,7 @@ class ParseTree(object):
+ 		'''Calls decode_url() on all links that contain urls.
+ 		See zim.parsing for details. Modifies the parse tree.
+ 		'''
+-		for link in self._etree.getiterator('link'):
++		for link in self._etree.iter('link'):
+ 			href = link.attrib['href']
+ 			if href and is_url_re.match(href):
+ 				link.attrib['href'] = url_decode(href, mode=mode)
+@@ -502,7 +502,7 @@ class ParseTree(object):
+ 	def count(self, text):
+ 		'''Returns the number of occurences of 'text' in this tree.'''
+ 		count = 0
+-		for element in self._etree.getiterator():
++		for element in self._etree.iter():
+ 			if element.text:
+ 				count += element.text.count(text)
+ 			if element.tail:
+@@ -515,7 +515,7 @@ class ParseTree(object):
+ 		in this tree.
+ 		'''
+ 		count = 0
+-		for element in self._etree.getiterator():
++		for element in self._etree.iter():
+ 			if element.text:
+ 				newstring, n = regex.subn('', element.text)
+ 				count += n
+@@ -535,7 +535,7 @@ class ParseTree(object):
+ 			elif element.tag in ('li', 'h'):
+ 				return True # implicit newline
+ 			else:
+-				children = element.getchildren()
++				children = list(element)
+ 				if children:
+ 					return self._get_element_ends_with_newline(children[-1]) # recurs
+ 				elif element.text:
+@@ -586,7 +586,7 @@ class ParseTree(object):
+ 		@param tag: tag name
+ 		@returns: yields L{Node} objects
+ 		'''
+-		for elt in self._etree.getiterator(tag):
++		for elt in self._etree.iter(tag):
+ 			yield Element.new_from_etree(elt)
+
+ 	def replace(self, tag, func):
+@@ -932,7 +932,7 @@ class OldParseTreeBuilder(object):
+ 		if len(self._stack) > 1 and not (
+ 			tag in (IMAGE, OBJECT, HEADDATA, TABLEDATA)
+ 			or (self._last.text and not self._last.text.isspace())
+-			or self._last.getchildren()
++			or bool(list(self._last))
+ 		):
+ 			# purge empty tags
+ 			if self._last.text and self._last.text.isspace():
+@@ -940,7 +940,7 @@ class OldParseTreeBuilder(object):
+
+ 			empty = self._stack.pop()
+ 			self._stack[-1].remove(empty)
+-			children = self._stack[-1].getchildren()
++			children = list(self._stack[-1])
+ 			if children:
+ 				self._last = children[-1]
+ 				if not self._last.tail is None:
+@@ -1053,7 +1053,7 @@ class OldParseTreeBuilder(object):
+ 	def _append_to_previous(self, text):
+ 		'''Add text before current element'''
+ 		parent = self._stack[-2]
+-		children = parent.getchildren()[:-1]
++		children = list(parent)[:-1]
+ 		if children:
+ 			if children[-1].tail:
+ 				children[-1].tail = children[-1].tail + text
+diff --git a/zim/gui/pageview.py b/zim/gui/pageview.py
+index 84fe99b4..c2c29cc5 100644
+--- a/zim/gui/pageview.py
++++ b/zim/gui/pageview.py
+@@ -857,7 +857,7 @@ class TextBuffer(Gtk.TextBuffer):
+ 				if not iter.starts_line():
+ 					self.insert_at_cursor('\n')
+
+-		for element in node.getchildren():
++		for element in iter(node):
+ 			if element.tag in ('p', 'div'):
+ 				# No force line start here on purpose
+ 				if 'indent' in element.attrib:
+--
+2.28.0
+

packages/x11-misc/zim/zim-0.73.2.exheres-0

@@ -25,14 +25,14 @@ DEPENDENCIES="
     recommendation:
         dev-python/pyxdg[python_abis:*(-)?]
     suggestion:
-        app-text/dvipng
-        app-text/texlive-core
+        app-text/dvipng [[ note = [ equation plugin ] ]]
+        app-text/texlive-core [[ note = [ equation plugin ] ]]
         dev-libs/zeitgeist:2.0
-        dev-scm/bzr
-        media-gfx/ImageMagick
-        media-gfx/graphviz
-        media-gfx/scrot
-        media-sound/lilypond
+        dev-scm/bzr [[ note = [ version control plugin ] ]]
+        media-gfx/graphviz [[ note = [ diagram editor plugin ] ]]
+        media-gfx/ImageMagick [[ note = [ screenshot plugin ] ]]
+        media-gfx/scrot [[ note = [ screenshot plugin ] ]]
+        media-sound/lilypond [[ note = [ music score plugin ] ]]
         sci-apps/gnuplot
 "
 
@@ -41,6 +41,11 @@ RESTRICT="test"
 
 WORK=${WORKBASE}/${PNV/_rc/-rc}
 
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/Fix-reading-preformatted-text-under-Python-3.9.patch
+    "${FILES}"/Replace-usage-of-getchildren-and-getiterator-with-li.patch
+)
+
 pkg_setup() {
     unset DISPLAY  # tries to access X socket
 }