zim: version bump to 0.73.5

Drop upstreamed patches.

packages/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.exheres-0

@@ -1,34 +0,0 @@
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require cmake [ api=2 ]
-
-SUMMARY="A system information and benchmark tool for Linux systems"
-HOMEPAGE="http://hardinfo.org/"
-DOWNLOADS="https://dev.gentoo.org/~hasufell/distfiles/${PNV}.tar.xz"
-
-LICENCES="GPL-2"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build:
-        virtual/pkg-config
-    build+run:
-        dev-libs/glib:2
-        gnome-desktop/libsoup
-        x11-libs/gdk-pixbuf
-        x11-libs/gtk+:2
-        x11-libs/pango
-"
-
-REMOTE_IDS="github:lpereira/${PN}"
-
-src_prepare() {
-    edo sed -i \
-        -e '/PREFIX/s:@CMAKE_INSTALL_PREFIX@/share:@CMAKE_INSTALL_DATAROOTDIR@:' \
-        "${CMAKE_SOURCE}"/config.h.cmake
-    cmake_src_prepare
-}
-

packages/app-admin/hardinfo/hardinfo-0.6_pre20201229.exheres-0

@@ -0,0 +1,41 @@
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+# Snapshot until release work in progress: https://github.com/lpereira/hardinfo/issues/530
+GITHUB_REVISION=f6a4f52868c2404f3ad58ef04e513ffe5fa090c7
+require github [ user=lpereira ]
+require cmake
+require gtk-icon-cache
+
+SUMMARY="A system information and benchmark tool for Linux systems"
+HOMEPAGE="http://hardinfo.org/"
+
+LICENCES="GPL-2"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    build:
+        sys-devel/gettext
+        virtual/pkg-config
+    build+run:
+        core/json-glib
+        dev-libs/glib:2
+        gnome-desktop/libsoup
+        x11-libs/cairo
+        x11-libs/gdk-pixbuf
+        x11-libs/gtk+:3
+        x11-libs/libX11
+        x11-libs/pango
+    suggestion:
+        app-benchmarks/sysbench [[ description = [ additional cpu/memory benchmarks ] ]]
+        sys-apps/fwupd [[ description = [ read firmware details ] ]]
+        sys-apps/udisks [[ description = [ read nvme storage information ] ]]
+        x11-dri/mesa-demos [[ description = [ show GLX info ] ]]
+"
+
+CMAKE_SRC_CONFIGURE_PARAMS=(
+    -DHARDINFO_GTK3:BOOL=TRUE
+)
+

packages/app-admin/supervisor/supervisor-4.2.1.exheres-0

@@ -14,8 +14,6 @@ PLATFORMS="~amd64 ~x86"
 MYOPTIONS=""
 
 DEPENDENCIES="
-    run:
-        dev-python/meld3[python_abis:*(-)?]
     test:
         dev-python/pexpect[python_abis:*(-)?]
         python_abis:2.7? ( dev-python/mock[python_abis:2.7] )

packages/app-editors/neovim-gtk/files/Try-to-fix-render-issues-due-to-changes-in-pango_1.4.patch

@@ -0,0 +1,50 @@
+Upstream: yes
+Reason: https://github.com/daa84/neovim-gtk/issues/208
+
+From c1dbe9b9549383b22807a2de9c76094ca9204f51 Mon Sep 17 00:00:00 2001
+From: daa <daa@localhost.localdomain>
+Date: Tue, 26 Nov 2019 19:25:42 +0300
+Subject: [PATCH] Try to fix render issues due to changes in pango_1.44 (#208)
+
+---
+ src/render/context.rs | 20 +++++++++-----------
+ 1 file changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/src/render/context.rs b/src/render/context.rs
+index 8168296..0c19437 100644
+--- a/src/render/context.rs
++++ b/src/render/context.rs
+@@ -111,21 +111,19 @@ pub struct CellMetrics {
+
+ impl CellMetrics {
+     fn new(font_metrics: &pango::FontMetrics, line_space: i32) -> Self {
++        let ascent = (f64::from(font_metrics.get_ascent()) / f64::from(pango::SCALE)).ceil();
++        let descent = (f64::from(font_metrics.get_descent()) / f64::from(pango::SCALE)).ceil();
++        let underline_position = (f64::from(font_metrics.get_underline_position()) / f64::from(pango::SCALE)).ceil();
+         CellMetrics {
+             pango_ascent: font_metrics.get_ascent(),
+             pango_descent: font_metrics.get_descent(),
+             pango_char_width: font_metrics.get_approximate_digit_width(),
+-            ascent: f64::from(font_metrics.get_ascent()) / f64::from(pango::SCALE),
+-            line_height: f64::from(font_metrics.get_ascent() + font_metrics.get_descent())
+-                / f64::from(pango::SCALE)
+-                + f64::from(line_space),
+-            char_width: f64::from(font_metrics.get_approximate_digit_width())
+-                / f64::from(pango::SCALE),
+-            underline_position: f64::from(
+-                font_metrics.get_ascent() - font_metrics.get_underline_position(),
+-            ) / f64::from(pango::SCALE),
+-            underline_thickness: f64::from(font_metrics.get_underline_thickness())
+-                / f64::from(pango::SCALE),
++            ascent,
++            line_height: ascent + descent + f64::from(line_space),
++            char_width: (f64::from(font_metrics.get_approximate_digit_width())
++                / f64::from(pango::SCALE)).ceil(),
++            underline_position: ascent - underline_position,
++            underline_thickness: f64::from(font_metrics.get_underline_thickness()) / f64::from(pango::SCALE),
+         }
+     }
+
+--
+2.30.0
+

packages/app-editors/neovim-gtk/neovim-gtk-0.2.0.exheres-0

@@ -11,16 +11,13 @@ DEPENDENCIES="
         app-editors/neovim
         dev-libs/glib:2
         x11-libs/cairo
-        x11-libs/gtk+:3[>=3.10.0]
+        x11-libs/gtk+:3[>=3.22.0]
         x11-libs/pango
+    run:
+        gnome-desktop/gsettings-desktop-schemas
 "
 
-src_install() {
-    ecargo_install
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/Try-to-fix-render-issues-due-to-changes-in-pango_1.4.patch
+)
 
-    insinto /usr/share/applications
-    doins desktop/*.desktop
-
-    insinto /usr/share/icons/hicolor/128x128/apps
-    doins desktop/nvim-gtk.png
-}

packages/app-editors/neovim-gtk/neovim-gtk-scm.exheres-0

@@ -1,7 +1,7 @@
 # Copyright 2018 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require neovim-gtk gtk-icon-cache
+require neovim-gtk
 
 DOWNLOADS=""
 
@@ -15,27 +15,11 @@ DEPENDENCIES="
         x11-libs/cairo
         x11-libs/gtk+:3[>=3.22.0]
         x11-libs/pango[>=1.38]
+    run:
+        gnome-desktop/gsettings-desktop-schemas
 "
 
 src_unpack() {
     cargo_src_unpack
 }
 
-src_install() {
-    ecargo_install
-
-    insinto /usr/share/nvim-gtk
-    doins -r runtime
-
-    insinto /usr/share/applications
-    doins desktop/*.desktop
-
-    insinto /usr/share/icons/hicolor/128x128/apps
-    newins desktop/org.daa.NeovimGtk_128.png org.daa.NeovimGtk.png
-    insinto /usr/share/icons/hicolor/48x48/apps
-    newins desktop/org.daa.NeovimGtk_48.png org.daa.NeovimGtk.png
-    insinto /usr/share/icons/hicolor/scalable/apps
-    newins desktop/org.daa.NeovimGtk.svg org.daa.NeovimGtk.png
-    insinto /usr/share/icons/hicolor/symbolic/apps
-    newins desktop/org.daa.NeovimGtk-symbolic.svg org.daa.NeovimGtk.png
-}

packages/app-editors/neovim-gtk/neovim-gtk.exlib

@@ -11,11 +11,26 @@ HOMEPAGE="https://github.com/daa84/neovim-gtk ${HOMEPAGE}"
 LICENCES="GPL-3.0"
 MYOPTIONS=""
 
-BUGS_TO="hasufell@posteo.de"
+src_install() {
+    ecargo_install
 
-src_prepare() {
-    default
-    export PREFIX=/usr
+    insinto /usr/share/nvim-gtk
+    doins -r runtime
+
+    insinto /usr/share/applications
+    doins desktop/*.desktop
+
+    local s
+    for s in 48 128; do
+        insinto /usr/share/icons/hicolor/${s}x${s}/apps
+        newins desktop/org.daa.NeovimGtk_${s}.png org.daa.NeovimGtk.png
+    done
+
+    insinto /usr/share/icons/hicolor/scalable/apps
+    newins desktop/org.daa.NeovimGtk.svg org.daa.NeovimGtk.png
+
+    insinto /usr/share/icons/hicolor/symbolic/apps
+    newins desktop/org.daa.NeovimGtk-symbolic.svg org.daa.NeovimGtk.png
 }
 
 pkg_postinst() {

packages/app-misc/nnn/nnn-2.5.exheres-0

@@ -1,36 +0,0 @@
-# Copyright 2019 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user="jarun" tag="v${PV}" ]
-require bash-completion zsh-completion
-
-SUMMARY="Lean, fast, zero-config, full-featured file manager with batteries "
-
-LICENCES="BSD-2"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build:
-        virtual/pkg-config
-    build+run:
-        sys-libs/ncurses:=
-        sys-libs/readline:=
-    suggestion:
-        app-arch/libarchive [[ description = [ create, list and extract archives ] ]]
-        media/mediainfo [[ description = [ multimedia file details ] ]]
-        sys-auth/vlock [[ description = [ terminal locker ] ]]
-        sys-fs/sshfs-fuse [[ description = [ mount, unmount over SSHFS ] ]]
-        x11-apps/xdg-utils [[ description = [ desktop opener ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-src_install() {
-    emake PREFIX="/usr/$(exhost --target)" MANPREFIX="/usr/share/man" DESTDIR="${IMAGE}" install
-    emagicdocs
-
-    dobashcompletion scripts/auto-completion/bash/*
-    dozshcompletion scripts/auto-completion/zsh/*
-}

packages/dev-libs/mbedtls/mbedtls-2.16.0-r1.exheres-0

@@ -36,7 +36,7 @@ DEPENDENCIES="
         sys-libs/zlib
     test:
         dev-lang/perl:*
-        dev-lang/python[>=3]
+        dev-lang/python:*[>=3]
 "
 
 CMAKE_SRC_CONFIGURE_PARAMS=(

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/sys-apps/evrouter/evrouter-0.4.exheres-0

@@ -0,0 +1,31 @@
+# Copyright 2020 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 ] ]
+
+SUMMARY="An input event router"
+DOWNLOADS="https://files.bedroomlan.org/debian/pool/main/e/evrouter/evrouter_${PV}.tar.gz"
+
+LICENCES="GPL-2"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS=""
+
+RESTRICT="test"
+
+DEPENDENCIES="
+    build+run:
+        x11-libs/libX11
+        x11-libs/libXtst
+"
+
+BUGS_TO="hasufell@posteo.de"
+
+DEFAULT_SRC_CONFIGURE_PARAMS=(
+    --without-xmms
+)
+
+src_prepare() {
+    default
+    eautoreconf
+}

packages/sys-apps/openrc/files/src-rc-rc-logger.h-fix-build-failure-against-gcc-10.patch

@@ -0,0 +1,48 @@
+From 375ef42393f3dc6edbaa2cb70c79b2366072db38 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 19 Jan 2020 15:24:20 +0000
+Subject: [PATCH] src/rc/rc-logger.h: fix build failure against gcc-10
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+cc  -L../librc -L../libeinfo -O2 -g -std=c99 -Wall -Wextra -Wimplicit -Wshadow \
+  -Wformat=2 -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn \
+  -Wmissing-format-attribute -Wnested-externs -Winline -Wwrite-strings \
+  -Wcast-align -Wcast-qual -Wpointer-arith -Wdeclaration-after-statement \
+  -Wsequence-point -Werror=implicit-function-declaration    \
+  -Wl,-rpath=/lib   -o openrc rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o -lutil -lrc -leinfo -Wl,-Bdynamic -ldl
+ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:16:
+  multiple definition of `rc_logger_pid'; rc.o:openrc/src/rc/rc-logger.h:16: first defined here
+ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:17:
+  multiple definition of `rc_logger_tty'; rc.o:openrc/src/rc/rc-logger.h:17: first defined here
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+This fixes #348.
+---
+ src/rc/rc-logger.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rc/rc-logger.h b/src/rc/rc-logger.h
+index bf6e3e57..1da294b0 100644
+--- a/src/rc/rc-logger.h
++++ b/src/rc/rc-logger.h
+@@ -13,8 +13,8 @@
+ #ifndef RC_LOGGER_H
+ #define RC_LOGGER_H
+ 
+-pid_t rc_logger_pid;
+-int rc_logger_tty;
++extern pid_t rc_logger_pid;
++extern int rc_logger_tty;
+ extern bool rc_in_logger;
+ 
+ void rc_logger_open(const char *runlevel);
+-- 
+2.29.0
+

packages/sys-apps/openrc/openrc-0.42.1.exheres-0

@@ -47,6 +47,10 @@ DEPENDENCIES="
 
 REMOTE_IDS="github:OpenRC/${PN}"
 
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/src-rc-rc-logger.h-fix-build-failure-against-gcc-10.patch
+)
+
 DEFAULT_SRC_COMPILE_PARAMS=(
     LIBNAME=lib
     LIBEXECDIR=/usr/$(exhost --target)/libexec/rc

packages/x11-misc/xvkbd/xvkbd-4.1.exheres-0

@@ -0,0 +1,37 @@
+# Copyright 2020 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+SUMMARY="Virtual keyboard for X window system"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+DOWNLOADS="http://t-sato.in.coocan.jp/xvkbd/${PNV}.tar.gz"
+
+LICENCES="GPL-2"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+
+DEPENDENCIES="
+    build:
+        virtual/pkg-config
+        x11-proto/xorgproto
+    build+run:
+        x11-libs/libX11
+        x11-libs/libXaw
+        x11-libs/libXmu
+        x11-libs/libXt
+        x11-libs/libXtst
+"
+
+src_prepare() {
+    edo sed -i -e 's/shell pkg-config/shell ${PKG_CONFIG}/' \
+        Makefile.{am,in}
+}
+
+src_install() {
+    dodir /usr/share/X11/app-defaults
+
+    default
+
+    dodoc ChangeLog README
+    newman ${PN}.man ${PN}.1
+}
+

packages/x11-misc/zim/zim-0.73.5.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
 "