licences/UPX-exception

@@ -1,140 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-
-
-                 ooooo     ooo ooooooooo.   ooooooo  ooooo
-                 `888'     `8' `888   `Y88.  `8888    d8'
-                  888       8   888   .d88'    Y888..8P
-                  888       8   888ooo88P'      `8888'
-                  888       8   888            .8PY888.
-                  `88.    .8'   888           d8'  `888b
-                    `YbodP'    o888o        o888o  o88888o
-
-
-                    The Ultimate Packer for eXecutables
-          Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar
-               http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
-                          http://www.nexus.hu/upx
-                            http://upx.tsx.org
-
-
-PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN
-TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION.
-
-
-ABSTRACT
-========
-
-   UPX and UCL are copyrighted software distributed under the terms
-   of the GNU General Public License (hereinafter the "GPL").
-
-   The stub which is imbedded in each UPX compressed program is part
-   of UPX and UCL, and contains code that is under our copyright. The
-   terms of the GNU General Public License still apply as compressing
-   a program is a special form of linking with our stub.
-
-   As a special exception we grant the free usage of UPX for all
-   executables, including commercial programs.
-   See below for details and restrictions.
-
-
-COPYRIGHT
-=========
-
-   UPX and UCL are copyrighted software. All rights remain with the authors.
-
-   UPX is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-   UPX is Copyright (C) 1996-2000 Laszlo Molnar
-
-   UCL is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-
-
-GNU GENERAL PUBLIC LICENSE
-==========================
-
-   UPX and the UCL library are free software; you can redistribute them
-   and/or modify them under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   UPX and UCL are distributed in the hope that they will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-
-
-SPECIAL EXCEPTION FOR COMPRESSED EXECUTABLES
-============================================
-
-   The stub which is imbedded in each UPX compressed program is part
-   of UPX and UCL, and contains code that is under our copyright. The
-   terms of the GNU General Public License still apply as compressing
-   a program is a special form of linking with our stub.
-
-   Hereby Markus F.X.J. Oberhumer and Laszlo Molnar grant you special
-   permission to freely use and distribute all UPX compressed programs
-   (including commercial ones), subject to the following restrictions:
-
-   1. You must compress your program with a completely unmodified UPX
-      version; either with our precompiled version, or (at your option)
-      with a self compiled version of the unmodified UPX sources as
-      distributed by us.
-   2. This also implies that the UPX stub must be completely unmodfied, i.e.
-      the stub imbedded in your compressed program must be byte-identical
-      to the stub that is produced by the official unmodified UPX version.
-   3. The decompressor and any other code from the stub must exclusively get
-      used by the unmodified UPX stub for decompressing your program at
-      program startup. No portion of the stub may get read, copied,
-      called or otherwise get used or accessed by your program.
-
-
-ANNOTATIONS
-===========
-
-  - You can use a modified UPX version or modified UPX stub only for
-    programs that are compatible with the GNU General Public License.
-
-  - We grant you special permission to freely use and distribute all UPX
-    compressed programs. But any modification of the UPX stub (such as,
-    but not limited to, removing our copyright string or making your
-    program non-decompressible) will immediately revoke your right to
-    use and distribute a UPX compressed program.
-
-  - UPX is not a software protection tool; by requiring that you use
-    the unmodified UPX version for your proprietary programs we
-    make sure that any user can decompress your program. This protects
-    both you and your users as nobody can hide malicious code -
-    any program that cannot be decompressed is highly suspicious
-    by definition.
-
-  - You can integrate all or part of UPX and UCL into projects that
-    are compatible with the GNU GPL, but obviously you cannot grant
-    any special exceptions beyond the GPL for our code in your project.
-
-  - We want to actively support manufacturers of virus scanners and
-    similar security software. Please contact us if you would like to
-    incorporate parts of UPX or UCL into such a product.
-
-
-
-Markus F.X.J. Oberhumer                   Laszlo Molnar
-markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-Linz, Austria, 25 Feb 2000
-
-
-
------BEGIN PGP SIGNATURE-----
-Version: 2.6.3ia
-Charset: noconv
-
-iQCVAwUBOLaLS210fyLu8beJAQFYVAP/ShzENWKLTvedLCjZbDcwaBEHfUVcrGMI
-wE7frMkbWT2zmkdv9hW90WmjMhOBu7yhUplvN8BKOtLiolEnZmLCYu8AGCwr5wBf
-dfLoClxnzfTtgQv5axF1awp4RwCUH3hf4cDrOVqmAsWXKPHtm4hx96jF6L4oHhjx
-OO03+ojZdO8=
-=CS52
------END PGP SIGNATURE-----
-
-

metadata/repository_mask.conf

@@ -3,6 +3,7 @@
     dev-lang/fsharp[~scm]
     dev-lang/fstar[~scm]
     dev-python/pytype[~scm]
+    dev-util/universal-ctags[~scm]
     games-emulation/gambatte[~scm]
     games-engines/OpenJK[~scm]
     games-engines/flare[~scm]

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

@@ -0,0 +1,34 @@
+# 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

@@ -1,41 +0,0 @@
-# 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.0.3.exheres-0

@@ -14,6 +14,8 @@ 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-arch/upx/upx-3.96.exheres-0

@@ -1,33 +0,0 @@
-# Copyright 2020 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-SUMMARY="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)"
-HOMEPAGE="http://upx.github.io/"
-DOWNLOADS="https://github.com/upx/upx/releases/download/v${PV}/${PNV}-src.tar.xz"
-
-LICENCES="GPL-2 UPX-exception"
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build:
-        dev-lang/perl
-    build+run:
-        dev-libs/ucl
-        sys-libs/zlib
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-WORK=${WORKBASE}/${PNV}-src
-
-src_compile() {
-    emake CXXFLAGS_WERROR="" all
-}
-
-src_install() {
-    newbin src/upx.out upx
-    dodoc BUGS NEWS PROJECTS README* THANKS doc/*.txt doc/upx.html
-    doman doc/upx.1
-}

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

@@ -1,50 +0,0 @@
-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.1.1-r2.exheres-0

@@ -11,13 +11,16 @@ DEPENDENCIES="
         app-editors/neovim
         dev-libs/glib:2
         x11-libs/cairo
-        x11-libs/gtk+:3[>=3.22.0]
+        x11-libs/gtk+:3[>=3.10.0]
         x11-libs/pango
-    run:
-        gnome-desktop/gsettings-desktop-schemas
 "
 
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/Try-to-fix-render-issues-due-to-changes-in-pango_1.4.patch
-)
+src_install() {
+    ecargo_install
 
+    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
+require neovim-gtk gtk-icon-cache
 
 DOWNLOADS=""
 
@@ -15,11 +15,27 @@ 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,26 +11,11 @@ HOMEPAGE="https://github.com/daa84/neovim-gtk ${HOMEPAGE}"
 LICENCES="GPL-3.0"
 MYOPTIONS=""
 
-src_install() {
-    ecargo_install
+BUGS_TO="hasufell@posteo.de"
 
-    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
+src_prepare() {
+    default
+    export PREFIX=/usr
 }
 
 pkg_postinst() {

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

@@ -0,0 +1,36 @@
+# 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-cpp/ctemplate/ctemplate-2.3.exheres-0

@@ -1,7 +1,7 @@
 # Copyright 2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require autotools [ supported_autoconf=[ 2.7 ] supported_automake=[ 1.16 ] ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 require github [ user="olafvdspek" tag="${PNV}" ]
 
 SUMMARY="A simple but powerful template language for C++"

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

@@ -0,0 +1,80 @@
+# Copyright 2013-2014 Thomas Witt
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+MY_PN="OpenSceneGraph"
+MY_PNV=${MY_PN}-${PV}
+
+require github [ user=openscenegraph project=${MY_PN} tag=${MY_PNV} ]
+require cmake [ api=2 ]
+
+SUMMARY="High performance 3D graphics toolkit"
+DESCRIPTION="
+The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application
+developers in fields such as visual simulation, games, virtual reality, scientific visualization
+and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX,
+GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well
+established as the world leading scene graph technology, used widely in the vis-sim, space,
+scientific, oil-gas, games and virtual reality industries.
+"
+HOMEPAGE+=" http://${PN}.org"
+
+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 ]]
+"
+
+DEPENDENCIES="
+    build:
+        virtual/unzip
+    build+run:
+        app-text/poppler[cairo]
+        dev-libs/glib:2
+        media-libs/freetype:2
+        media-libs/giflib:=
+        media-libs/gstreamer:1.0
+        media-libs/ilmbase
+        media-libs/jasper
+        media-libs/libpng:=
+        media-libs/openexr
+        media-libs/SDL:0
+        media-libs/tiff
+        media-plugins/gst-plugins-base:1.0
+        net-misc/curl
+        sys-libs/zlib
+        x11-dri/mesa
+        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=(
+    -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_FBX=
+    -DCMAKE_DISABLE_FIND_PACKAGE_Xine=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_Performer=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_OurDCMTK=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_RSVG=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_Lua51=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_Lua52=1
+    -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1
+    -DOSG_USE_LOCAL_LUA_SOURCE=OFF
+    -DOPENGL_PROFILE=GL2
+    -DDYNAMIC_OPENSCENEGRAPH=ON
+    -DLIB_POSTFIX=""
+)
+

packages/dev-games/mygui/files/mygui-3.2.2-Use-GNUInstallDirs.patch

@@ -0,0 +1,168 @@
+From fbdfac84763ce525e7d243eefbb23c013db93e32 Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Tue, 24 May 2016 18:06:54 +0200
+Subject: [PATCH] Use GNUInstallDirs
+
+This will probably not make it upstream since they try to
+be windows compatible.
+---
+ CMake/ConfigureBuild.cmake                     |  2 +-
+ CMake/Utils/MyGUIConfigTargets.cmake           | 40 +++++++++++++-------------
+ CMakeLists.txt                                 |  1 +
+ MyGUIEngine/CMakeLists.txt                     |  2 +-
+ Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt |  2 +-
+ 5 files changed, 24 insertions(+), 23 deletions(-)
+
+diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
+index 9c6aad9..b655848 100644
+--- a/CMake/ConfigureBuild.cmake
++++ b/CMake/ConfigureBuild.cmake
+@@ -47,7 +47,7 @@ if (UNIX)
+   else ()
+     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
+   endif ()
+-  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
++  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+   # configure additional packages
+   
+diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
+index d48d2a3..61b80a5 100644
+--- a/CMake/Utils/MyGUIConfigTargets.cmake
++++ b/CMake/Utils/MyGUIConfigTargets.cmake
+@@ -60,27 +60,27 @@ endfunction(mygui_create_vcproj_userfile)
+ # install targets according to current build type
+ function(mygui_install_target TARGETNAME SUFFIX)
+ 	install(TARGETS ${TARGETNAME}
+-		RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
+-		LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+-		ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
++		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
++		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
++		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ 		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None ""
+ 	)
+ 	install(TARGETS ${TARGETNAME}
+-		RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
+-		LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
+-		ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
++		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
++		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
++		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
+ 		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo
+ 	)
+ 	install(TARGETS ${TARGETNAME}
+-		RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
+-		LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
+-		ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
++		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
++		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
++		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
+ 		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel
+ 	)
+ 	install(TARGETS ${TARGETNAME}
+-		RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug
+-		LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
+-		ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
++		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug
++		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
++		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
+ 		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug
+ 	)
+ endfunction(mygui_install_target)
+@@ -364,11 +364,11 @@ function(mygui_install_app PROJECTNAME)
+ 	if (MYGUI_INSTALL_PDB)
+ 		# install debug pdb files
+ 		install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_DEBUG_PATH}/${PROJECTNAME}.pdb
+-			DESTINATION bin${MYGUI_DEBUG_PATH}
++			DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_DEBUG_PATH}
+ 			CONFIGURATIONS Debug
+ 		)
+ 		install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_RELWDBG_PATH}/${PROJECTNAME}.pdb
+-			DESTINATION bin${MYGUI_RELWDBG_PATH}
++			DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_RELWDBG_PATH}
+ 			CONFIGURATIONS RelWithDebInfo
+ 		)
+ 	endif ()
+@@ -400,7 +400,7 @@ function(mygui_plugin PROJECTNAME)
+ 	set_target_properties(${PROJECTNAME} PROPERTIES PREFIX "")
+ 
+ 	install(FILES ${HEADER_FILES}
+-		DESTINATION include/MYGUI
++		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/MYGUI
+ 	)
+ endfunction(mygui_plugin)
+ 
+@@ -431,20 +431,20 @@ function(mygui_config_lib PROJECTNAME)
+ 		# install debug pdb files
+ 		if (MYGUI_STATIC)
+ 			install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb
+-				DESTINATION lib${MYGUI_LIB_DEBUG_PATH}
++				DESTINATION ${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_DEBUG_PATH}
+ 				CONFIGURATIONS Debug
+ 			)
+ 			install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb
+-				DESTINATION lib${MYGUI_LIB_RELWDBG_PATH}
++				DESTINATION ${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELWDBG_PATH}
+ 				CONFIGURATIONS RelWithDebInfo
+ 			)
+ 		else ()
+ 			install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_DEBUG_PATH}/${PROJECTNAME}_d.pdb
+-				DESTINATION bin${MYGUI_DEBUG_PATH}
++				DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_DEBUG_PATH}
+ 				CONFIGURATIONS Debug
+ 			)
+ 			install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_RELWDBG_PATH}/${PROJECTNAME}.pdb
+-				DESTINATION bin${MYGUI_RELWDBG_PATH}
++				DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_RELWDBG_PATH}
+ 				CONFIGURATIONS RelWithDebInfo
+ 			)
+ 		endif ()
+@@ -459,7 +459,7 @@ function(mygui_config_sample PROJECTNAME)
+ 	# set install RPATH for Unix systems
+ 	if (UNIX AND MYGUI_FULL_RPATH)
+ 		set_property(TARGET ${PROJECTNAME} APPEND PROPERTY
+-			INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++			INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
+ 		set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 	endif ()
+ endfunction(mygui_config_sample)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9fc5694..0cddafa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,6 +17,7 @@ set(CMAKE_MODULE_PATH
+ 	"${MYGUI_SOURCE_DIR}/CMake/Utils"
+ 	"${MYGUI_SOURCE_DIR}/CMake/Packages"
+ )
++include(GNUInstallDirs)
+ include(CMakeDependentOption)
+ include(MacroLogFeature)
+ include(MyGUIConfigTargets)
+diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt
+index c5eab54..839ff43 100644
+--- a/MyGUIEngine/CMakeLists.txt
++++ b/MyGUIEngine/CMakeLists.txt
+@@ -64,5 +64,5 @@ endif ()
+ 
+ # install MyGUIEngine headers
+ install(FILES ${HEADER_FILES}
+-  DESTINATION include/MYGUI
++	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/MYGUI"
+ )
+diff --git a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
+index 169ad05..4bd7cd1 100644
+--- a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
++++ b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
+@@ -30,7 +30,7 @@ link_directories(${OPENGL_LIB_DIR} ${PNG_LIBRARY})
+ 
+ # installation rules
+ install(FILES ${HEADER_FILES}
+-        DESTINATION include/MYGUI
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/MYGUI
+ )
+ mygui_install_target(${PROJECTNAME} "")
+ 
+-- 
+2.8.3
+

packages/dev-games/mygui/files/mygui-3.2.2-underlinking.patch

@@ -0,0 +1,21 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Jun 15 10:42:42 UTC 2012
+Subject: build system
+Upstream: no
+
+fix underlinking
+
+--- MyGUIEngine/CMakeLists.txt
++++ MyGUIEngine/CMakeLists.txt
+@@ -48,7 +48,10 @@
+ if (MYGUI_USE_FREETYPE)
+ 	target_link_libraries(${PROJECTNAME}
+ 		${FREETYPE_LIBRARIES}
+-	)
++		dl)
++else()
++	target_link_libraries(${PROJECTNAME}
++		dl)
+ endif()
+ 
+ # platform specific dependencies

packages/dev-games/mygui/mygui-3.2.2-r1.exheres-0

@@ -0,0 +1,61 @@
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+MY_PNV=MyGUI${PV}
+WORK="${WORKBASE}/${PN}-${MY_PNV}"
+
+require cmake [ api=2 ]
+require github [ user=MyGUI tag=${MY_PNV} ]
+
+SUMMARY="A library for creating GUIs for games"
+HOMEPAGE="http://mygui.info/"
+
+LICENCES="MIT"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+
+DEPENDENCIES="
+    build:
+        virtual/pkg-config
+    build+run:
+        media-libs/freetype:2
+        media-libs/glew
+        x11-dri/mesa
+"
+
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+    -p0 "${FILES}"/${PNV}-underlinking.patch
+    -p1 "${FILES}"/${PNV}-Use-GNUInstallDirs.patch
+)
+
+CMAKE_SRC_CONFIGURE_PARAMS=(
+    -DCMAKE_INSTALL_BINDIR="/usr$(exhost --target)/bin"
+    -DCMAKE_INSTALL_INCLUDEDIR="/usr/$(exhost --target)/include"
+    -DCMAKE_INSTALL_LIBDIR="/usr/$(exhost --target)/lib"
+    -DCMAKE_INSTALL_PREFIX="/usr"
+    -DMYGUI_BUILD_DEMOS=OFF
+    -DMYGUI_BUILD_DOCS=OFF
+    -DMYGUI_BUILD_PLUGINS=ON
+    -DMYGUI_BUILD_TOOLS=OFF
+    -DCMAKE_BUILD_TYPE=Release
+    -DMYGUI_BUILD_WRAPPER=OFF
+    -DMYGUI_INSTALL_DOCS=OFF
+    -DMYGUI_INSTALL_MEDIA=ON
+    -DMYGUI_INSTALL_SAMPLES=OFF
+    -DMYGUI_INSTALL_TOOLS=OFF
+    -DMYGUI_RENDERSYSTEM=4
+    -DMYGUI_STATIC=OFF
+    -DMYGUI_USE_FREETYPE=ON
+    -DMYGUI_USE_SYSTEM_GLEW=ON
+)
+
+src_install() {
+    cmake_src_install
+
+    # test media not needed at runtime
+    edo rm -r "${IMAGE}"/usr/share/MYGUI/Media/UnitTests
+    # wrapper not available for linux, remove related media
+    edo rm -r "${IMAGE}"/usr/share/MYGUI/Media/Wrapper
+}
+

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

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

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

@@ -0,0 +1,94 @@
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+
+require github [ user=ARMmbed tag=mbedtls-${PV} ]
+WORK="${WORKBASE}/${PNV}" # because github.exlib is broken
+require cmake [ api=2 ]
+
+
+SUMMARY="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+DOWNLOADS="https://tls.mbed.org/download/${PNV}-gpl.tgz"
+
+LICENCES="|| ( Apache-2.0 GPL-2 )"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+
+MYOPTIONS="
+    doc
+    havege [[ description = [ Enable the HAVEGE random generator,
+                              not suitable for virtualized environments! ] ]]
+    threads [[ description = [ Enables the threading abstraction layer
+                               via pthread. This is used if you do intend
+                               to use contexts between threads. ] ]]
+    x86_cpu_features:
+        sse2
+"
+
+DEPENDENCIES="
+    build:
+        doc? (
+            app-doc/doxygen[>=1.8.4]
+            media-gfx/graphviz
+        )
+    build+run:
+        sys-libs/zlib
+    test:
+        dev-lang/perl:*
+        dev-lang/python[>=3]
+"
+
+CMAKE_SRC_CONFIGURE_PARAMS=(
+    -DENABLE_PROGRAMS=OFF
+    -DUSE_SHARED_MBEDTLS_LIBRARY=ON
+    -DINSTALL_MBEDTLS_HEADERS=ON
+    -DLIB_INSTALL_DIR="/usr/$(exhost --target)/lib"
+    -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+    -DENABLE_ZLIB_SUPPORT=ON
+)
+
+CMAKE_SRC_CONFIGURE_TESTS=(
+    '-DENABLE_TESTING=ON'
+)
+
+enable_mbedtls_option() {
+    local myopt="$@"
+    # check that config.h syntax is the same at version bump
+    edo sed -i \
+        -e "s://#define ${myopt}:#define ${myopt}:" \
+        "${CMAKE_SOURCE}"/include/mbedtls/config.h
+}
+
+src_prepare() {
+    option x86_cpu_features:sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+    enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+    option havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+    option threads && enable_mbedtls_option MBEDTLS_THREADING_C
+    option threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+    enable_mbedtls_option MBEDTLS_MD4_C
+    cmake_src_prepare
+}
+
+src_compile() {
+    default
+
+    if option doc ; then
+        emake apidoc
+    fi
+}
+
+src_test() {
+    LD_LIBRARY_PATH="${ECMAKE_BUILD_DIR}/library" \
+        emake test
+}
+
+src_install() {
+    cmake_src_install
+
+    if option doc ; then
+        docinto html
+        dodoc -r "${CMAKE_SOURCE}"/apidoc/*
+    fi
+}
+

packages/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch

@@ -1,134 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Respect CCASFLAGS (which often defaults to CFLAGS). Fixes
-	compilation for portage-multilib users.
-
-diff -r c090ed619e90 configure.ac
---- a/configure.ac	Sun Jun 26 16:00:09 2011 -0400
-+++ b/configure.ac	Sun Jun 26 20:52:01 2011 -0400
-@@ -47,14 +47,12 @@
- AC_CANONICAL_TARGET
- AM_MAINTAINER_MODE
- 
--if test -z "$ac_abs_top_srcdir"; then
--    _AC_SRCPATHS(.)
--fi
- if test -r .Conf.settings1; then
-     . ./.Conf.settings1
- fi
- 
- AC_PROG_CC
-+AM_PROG_AS
- AC_PROG_CPP
- mfx_PROG_CPPFLAGS
- AC_C_CONST
-@@ -84,13 +82,13 @@
- if test "X$enable_asm" != Xno; then
- mfx_compile_S='${CC-cc} -c conftest.S 1>&AS_MESSAGE_LOG_FD'
- cat > conftest.S <<EOF
--#include "$ac_abs_top_srcdir/asm/i386/src_gas/crc_asm.S"
-+#include "$srcdir/asm/i386/src_gas/crc_asm.S"
- EOF
- enable_asm=no
- if AC_TRY_EVAL(mfx_compile_S); then
-     if AC_TRY_COMMAND([test -s conftest.$ac_objext]); then
-         enable_asm=yes
--        UCL_ASM_VPATH=":$ac_abs_top_srcdir/asm/i386/src_gas"
-+        UCL_ASM_VPATH=":\$(top_srcdir)/asm/i386/src_gas"
-     fi
- fi
- if test "X$enable_asm" = Xno; then
-@@ -160,11 +158,6 @@
- AC_SUBST(UCL_CFLAGS)
- AC_SUBST(UCL_EXTRA_CFLAGS)
- 
--configure_CPPFLAGS=$CPPFLAGS
--configure_CFLAGS=$CFLAGS
--AC_SUBST(configure_CPPFLAGS)
--AC_SUBST(configure_CFLAGS)
--
- AC_CONFIG_FILES([Makefile examples/Makefile include/Makefile include/ucl/Makefile src/Makefile])
- AC_OUTPUT
- 
-diff -r c090ed619e90 src/Makefile.am
---- a/src/Makefile.am	Sun Jun 26 16:00:09 2011 -0400
-+++ b/src/Makefile.am	Sun Jun 26 20:52:01 2011 -0400
-@@ -4,11 +4,10 @@
- #
- 
- VPATH = @srcdir@@UCL_ASM_VPATH@
--SUFFIXES = .S
- 
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
--CPPFLAGS = $(UCL_CPPFLAGS) $(configure_CPPFLAGS) $(UCL_EXTRA_CPPFLAGS)
--CFLAGS = $(UCL_CFLAGS) $(configure_CFLAGS) $(UCL_EXTRA_CFLAGS)
-+AM_CPPFLAGS = $(UCL_CPPFLAGS) $(UCL_EXTRA_CPPFLAGS)
-+AM_CFLAGS = $(UCL_CFLAGS) $(UCL_EXTRA_CFLAGS)
- 
- lib_LTLIBRARIES = libucl.la
- 
-@@ -16,51 +15,37 @@
- 
- libucl_la_SOURCES = \
- 	alloc.c \
-+	getbit.h \
- 	n2b_99.c n2b_d.c n2b_ds.c n2b_to.c \
- 	n2d_99.c n2d_d.c n2d_ds.c n2d_to.c \
- 	n2e_99.c n2e_d.c n2e_ds.c n2e_to.c \
-+	ucl_conf.h \
- 	ucl_crc.c \
- 	ucl_init.c \
--	ucl_ptr.c \
-+	ucl_ptr.c ucl_ptr.h \
- 	ucl_str.c \
- 	ucl_util.c
- 
- EXTRA_DIST = \
--	getbit.h \
- 	n2_99.ch \
--	ucl_conf.h \
- 	ucl_dll.ch \
- 	ucl_mchw.ch \
--	ucl_ptr.h \
- 	ucl_swd.ch
- 
--libucl_la_LIBADD = $(UCL_ASM_OBJECTS)
--libucl_la_DEPENDENCIES = $(libucl_la_LIBADD)
--
--
- # /***********************************************************************
- # // assembler support
- # ************************************************************************/
- 
- if UCL_USE_ASM
--
--UCL_ASM_OBJECTS = \
--	cpuid.lo crc_asm.lo crcs_asm.lo rdtsc.lo rdtsca.lo \
--	n2b_d_f1.lo n2b_d_f2.lo n2b_d_f3.lo n2b_d_f4.lo n2b_d_f5.lo n2b_d_f6.lo \
--	n2b_d_n1.lo n2b_d_n2.lo n2b_d_n3.lo n2b_d_n4.lo n2b_d_n5.lo n2b_d_n6.lo \
--	n2b_d_s1.lo n2b_d_s2.lo n2b_d_s3.lo n2b_d_s4.lo n2b_d_s5.lo n2b_d_s6.lo \
--	n2d_d_f1.lo n2d_d_f2.lo n2d_d_f3.lo n2d_d_f4.lo n2d_d_f5.lo n2d_d_f6.lo \
--	n2d_d_n1.lo n2d_d_n2.lo n2d_d_n3.lo n2d_d_n4.lo n2d_d_n5.lo n2d_d_n6.lo \
--	n2d_d_s1.lo n2d_d_s2.lo n2d_d_s3.lo n2d_d_s4.lo n2d_d_s5.lo n2d_d_s6.lo \
--	n2e_d_f1.lo n2e_d_f2.lo n2e_d_f3.lo n2e_d_f4.lo n2e_d_f5.lo n2e_d_f6.lo \
--	n2e_d_n1.lo n2e_d_n2.lo n2e_d_n3.lo n2e_d_n4.lo n2e_d_n5.lo n2e_d_n6.lo \
--	n2e_d_s1.lo n2e_d_s2.lo n2e_d_s3.lo n2e_d_s4.lo n2e_d_s5.lo n2e_d_s6.lo
--
--.S.o:
--	$(CC) -c $<
--
--.S.lo:
--	$(LIBTOOL) --mode=compile $(CC) -c $<
--
-+libucl_la_SOURCES += \
-+	cpuid.S crc_asm.S crcs_asm.S rdtsc.S rdtsca.S \
-+	n2b_d_f1.S n2b_d_f2.S n2b_d_f3.S n2b_d_f4.S n2b_d_f5.S n2b_d_f6.S \
-+	n2b_d_n1.S n2b_d_n2.S n2b_d_n3.S n2b_d_n4.S n2b_d_n5.S n2b_d_n6.S \
-+	n2b_d_s1.S n2b_d_s2.S n2b_d_s3.S n2b_d_s4.S n2b_d_s5.S n2b_d_s6.S \
-+	n2d_d_f1.S n2d_d_f2.S n2d_d_f3.S n2d_d_f4.S n2d_d_f5.S n2d_d_f6.S \
-+	n2d_d_n1.S n2d_d_n2.S n2d_d_n3.S n2d_d_n4.S n2d_d_n5.S n2d_d_n6.S \
-+	n2d_d_s1.S n2d_d_s2.S n2d_d_s3.S n2d_d_s4.S n2d_d_s5.S n2d_d_s6.S \
-+	n2e_d_f1.S n2e_d_f2.S n2e_d_f3.S n2e_d_f4.S n2e_d_f5.S n2e_d_f6.S \
-+	n2e_d_n1.S n2e_d_n2.S n2e_d_n3.S n2e_d_n4.S n2e_d_n5.S n2e_d_n6.S \
-+	n2e_d_s1.S n2e_d_s2.S n2e_d_s3.S n2e_d_s4.S n2e_d_s5.S n2e_d_s6.S
- endif
--

packages/dev-libs/ucl/files/ucl-1.03-x32.patch

@@ -1,173 +0,0 @@
-port ucl to the x32 ABI
-
-https://bugs.gentoo.org/426334
-
---- a/acc/acc_arch.h
-+++ b/acc/acc_arch.h
-@@ -19,6 +19,7 @@
-  *   ACC_ARCH_UNKNOWN       [default]
-  *   ACC_ARCH_ALPHA
-  *   ACC_ARCH_AMD64         aka x86-64 or ia32e
-+ *   ACC_ARCH_X32           aka x86-32
-  *   ACC_ARCH_C166
-  *   ACC_ARCH_IA16          Intel Architecture (8088, 8086, 80186, 80286)
-  *   ACC_ARCH_IA32          Intel Architecture (80386+)
-@@ -42,8 +43,13 @@
- #  define ACC_ARCH_IA16             1
- #  define ACC_INFO_ARCH             "ia16"
- #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
-+# ifdef __ILP32__
-+#  define ACC_ARCH_X32              1
-+#  define ACC_INFO_ARCH             "x32"
-+# else
- #  define ACC_ARCH_AMD64            1
- #  define ACC_INFO_ARCH             "amd64"
-+# endif
- #elif (UINT_MAX <= ACC_0xffffL) && defined(__AVR__)
- #  define ACC_ARCH_AVR              1
- #  define ACC_INFO_ARCH             "avr"
-@@ -92,7 +98,7 @@
- #endif
- 
- 
--#if (ACC_ARCH_AMD64 || ACC_ARCH_IA16 || ACC_ARCH_IA32)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA16 || ACC_ARCH_IA32 || ACC_ARCH_X32)
- #  define ACC_ENDIAN_LITTLE_ENDIAN  1
- #  define ACC_INFO_ENDIAN           "little-endian"
- #elif (ACC_ARCH_M68K)
---- a/acc/acc_chk.ch
-+++ b/acc/acc_chk.ch
-@@ -407,7 +407,7 @@
- #if (ACC_ARCH_IA16)
-     ACCCHK_ASSERT(sizeof(size_t) == 2)
-     ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
--#elif (ACC_ARCH_IA32 || ACC_ARCH_M68K)
-+#elif (ACC_ARCH_IA32 || ACC_ARCH_M68K || ACC_ARCH_X32)
-     ACCCHK_ASSERT(sizeof(size_t) == 4)
-     ACCCHK_ASSERT(sizeof(ptrdiff_t) == 4)
-     ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
---- a/acc/acc_lib.h
-+++ b/acc/acc_lib.h
-@@ -423,13 +423,13 @@ ACCLIB_EXTERN(void, acc_set_le64) (acc_hvoid_p, acc_uint64l_t);
- #endif
- 
- /* inline versions */
--#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
- #  define ACC_GET_LE16(p)       (* (const unsigned short *) (p))
- #  define ACC_GET_LE32(p)       (* (const acc_uint32e_t *) (p))
- #  define ACC_SET_LE16(p,v)     (* (unsigned short *) (p) = (unsigned short) (v))
- #  define ACC_SET_LE32(p,v)     (* (acc_uint32e_t *) (p) = (acc_uint32e_t) (v))
- #endif
--#if (ACC_ARCH_AMD64)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_X32)
- #  define ACC_GET_LE64(p)       (* (const acc_uint64l_t *) (p))
- #  define ACC_SET_LE64(p,v)     (* (acc_uint64l_t *) (p) = (acc_uint64l_t) (v))
- #endif
---- a/acc/acclib/bele.ch
-+++ b/acc/acclib/bele.ch
-@@ -71,7 +71,7 @@ ACCLIB_PUBLIC(void, acc_set_be32) (acc_hvoid_p p, acc_uint32l_t v)
- 
- ACCLIB_PUBLIC(unsigned, acc_get_le16) (const acc_hvoid_p p)
- {
--#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
-     return (* (const unsigned short *) (p));
- #else
-     const acc_hbyte_p b = (const acc_hbyte_p) p;
-@@ -87,7 +87,7 @@ ACCLIB_PUBLIC(acc_uint32l_t, acc_get_le24) (const acc_hvoid_p p)
- 
- ACCLIB_PUBLIC(acc_uint32l_t, acc_get_le32) (const acc_hvoid_p p)
- {
--#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
-     return (* (const acc_uint32e_t *) (p));
- #else
-     const acc_hbyte_p b = (const acc_hbyte_p) p;
-@@ -102,7 +102,7 @@ ACCLIB_PUBLIC(acc_uint32l_t, acc_get_le32) (const acc_hvoid_p p)
- 
- ACCLIB_PUBLIC(void, acc_set_le16) (acc_hvoid_p p, unsigned v)
- {
--#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
-     (* (unsigned short *) (p) = (unsigned short) (v));
- #else
-     acc_hbyte_p b = (acc_hbyte_p) p;
-@@ -121,7 +121,7 @@ ACCLIB_PUBLIC(void, acc_set_le24) (acc_hvoid_p p, acc_uint32l_t v)
- 
- ACCLIB_PUBLIC(void, acc_set_le32) (acc_hvoid_p p, acc_uint32l_t v)
- {
--#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
-     (* (acc_uint32e_t *) (p) = (acc_uint32e_t) (v));
- #else
-     acc_hbyte_p b = (acc_hbyte_p) p;
-@@ -191,7 +191,7 @@ ACCLIB_PUBLIC(void, acc_set_be64) (acc_hvoid_p p, acc_uint64l_t v)
- 
- ACCLIB_PUBLIC(acc_uint64l_t, acc_get_le64) (const acc_hvoid_p p)
- {
--#if (ACC_ARCH_AMD64)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_X32)
-     return (* (const acc_uint64l_t *) (p));
- #elif (ACC_ARCH_IA32)
-     const acc_uint32e_t* b = (const acc_uint32e_t*) p;
-@@ -211,7 +211,7 @@ ACCLIB_PUBLIC(acc_uint64l_t, acc_get_le64) (const acc_hvoid_p p)
- 
- ACCLIB_PUBLIC(void, acc_set_le64) (acc_hvoid_p p, acc_uint64l_t v)
- {
--#if (ACC_ARCH_AMD64)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_X32)
-     (* (acc_uint64l_t *) (p)) = v;
- #elif (ACC_ARCH_IA32)
-     (((acc_uint32e_t *)(p))[0] = (acc_uint32e_t) (v >>  0));
---- a/acc/acclib/perfctr.ch
-+++ b/acc/acclib/perfctr.ch
-@@ -63,7 +63,7 @@ ACCLIB_PUBLIC(int, acc_perfctr_open) (acc_perfctr_handle_p h)
-         break;      /* no working TSC available */
-     case PERFCTR_X86_AMD_K7:
- #endif
--#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
-     case PERFCTR_X86_AMD_K8:
-     case PERFCTR_X86_AMD_K8C:
-         cc->tsc_on = 1; cc->nractrs = 2;
---- a/acc/acclib/rdtsc.ch
-+++ b/acc/acclib/rdtsc.ch
-@@ -21,7 +21,7 @@
- #if defined(acc_int32e_t)
- 
- 
--#if ((ACC_ARCH_AMD64 || ACC_ARCH_IA32) && ACC_CC_GNUC)
-+#if ((ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && ACC_CC_GNUC)
- #  if (ACC_CC_GNUC >= 0x020000ul)
- #    define __ACCLIB_RDTSC_REGS : : "r" (t) : "cc", "memory", "eax", "edx"
- #  else
-@@ -38,7 +38,7 @@
- 
- ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t)
- {
--#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && defined(__ACCLIB_RDTSC_REGS)
-     __asm__ __volatile__(
-         "clc \n" ".byte 0x0f, 0x31\n"
-         "movl %%eax,(%0)\n" "movl %%edx,4(%0)\n"
-@@ -73,7 +73,7 @@ ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t)
- 
- ACCLIB_PUBLIC(int, acc_tsc_read_add) (acc_uint32e_t* t)
- {
--#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS)
-+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && defined(__ACCLIB_RDTSC_REGS)
-     __asm__ __volatile__(
-         "clc \n" ".byte 0x0f, 0x31\n"
-         "addl %%eax,(%0)\n" "adcl $0,%%edx\n" "addl %%edx,4(%0)\n"
---- a/src/ucl_conf.h
-+++ b/src/ucl_conf.h
-@@ -172,7 +172,7 @@
- #undef UA_SET2
- #undef UA_GET4
- #undef UA_SET4
--#if 1 && (ACC_ARCH_AMD64 || ACC_ARCH_IA32)
-+#if 1 && (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32)
- #  define UA_GET2(p)    (* (const ucl_ushortp) (p))
- #  define UA_SET2(p)    (* (ucl_ushortp) (p))
- #  define UA_GET4(p)    (* (const acc_uint32e_t *) (p))

packages/dev-libs/ucl/ucl-1.03.exheres-0

@@ -1,35 +0,0 @@
-# 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.16 ] ]
-
-SUMMARY="The UCL Compression Library"
-HOMEPAGE="http://www.oberhumer.com/opensource/ucl/"
-DOWNLOADS="http://www.oberhumer.com/opensource/ucl/download/${PNV}.tar.gz"
-
-LICENCES="GPL-2"
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/${PNV}-CFLAGS.patch
-    "${FILES}"/${PNV}-x32.patch
-)
-
-src_prepare() {
-    edo sed -n -e '/^AC_DEFUN.*mfx_/,/^])#$/p' aclocal.m4 > acinclude.m4
-    edo sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
-
-    autotools_src_prepare
-}
-
-src_configure() {
-    econf --enable-shared CFLAGS="${CFLAGS} -std=c90"
-}
-

packages/dev-python/mypy/mypy-0.720-r1.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.3&<0.5.0][python_abis:*(-)?]
+        dev-python/mypy_extensions[>=0.4.0&<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-application/files/08c503bdd1e128118e45fa50be256e27415bbd41.patch

@@ -1,25 +0,0 @@
-Upstream: Yes
-
-From 08c503bdd1e128118e45fa50be256e27415bbd41 Mon Sep 17 00:00:00 2001
-From: Adrian Georgescu <ag@ag-projects.com>
-Date: Sat, 1 Jan 2022 15:19:37 +0000
-Subject: [PATCH] collections.MutableMapping was deprecated since Python 3.3
-
----
- application/python/weakref.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/application/python/weakref.py b/application/python/weakref.py
-index a785a7e..38fd664 100644
---- a/application/python/weakref.py
-+++ b/application/python/weakref.py
-@@ -1,7 +1,8 @@
- 
- import weakref
- 
--from collections import MutableMapping, deque
-+from collections.abc import MutableMapping
-+from collections import deque
- from copy import deepcopy
- from threading import local
- 

packages/dev-python/python-application/python-application-2.7.0.exheres-0

@@ -1,8 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require setup-py [ import=distutils blacklist="2" multibuild=false ]
-require github [ user="AGProjects" pn="python3-application" tag="${PV}" ]
+require pypi setup-py [ import=distutils blacklist="3" ]
 
 SUMMARY="Basic building blocks for python applications"
 HOMEPAGE="http://ag-projects.com/"
@@ -15,7 +14,4 @@ MYOPTIONS=""
 DEPENDENCIES="
     dev-python/zopeinterface[python_abis:*(-)?]
 "
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/08c503bdd1e128118e45fa50be256e27415bbd41.patch
-)
 

packages/dev-python/python-eventlib/python-eventlib-0.2.4-r1.exheres-0

@@ -1,8 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user="AGProjects" pn="python3-eventlib" tag="${PV}" ]
-require setup-py [ import=distutils blacklist="2" multibuild=false ]
+require github [ user="AGProjects" tag="release-${PV}" ]
+require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
 
 SUMMARY="Coroutine-based networking library"
 HOMEPAGE="http://sipsimpleclient.org"

packages/dev-python/python-gnutls/python-gnutls-3.1.2.exheres-0

@@ -1,8 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require setup-py [ import=distutils blacklist="2" multibuild=false ]
-require github [ user="AGProjects" pn="python3-gnutls" tag="${PV}" ]
+require pypi setup-py [ import=distutils blacklist="3" ]
 
 SUMMARY="High level object oriented wrapper around libgnutls"
 HOMEPAGE="http://ag-projects.com/"

packages/dev-python/python-msrplib/python-msrplib-0.19.2-r1.exheres-0

@@ -1,8 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user="AGProjects" pn="python3-msrplib" tag="${PV}" ]
-require setup-py [ import=distutils blacklist="2" multibuild=false ]
+require github [ user="AGProjects" tag="release-${PV}" ]
+require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
 
 SUMMARY="Client library for MSRP protocol and its relay extension"
 HOMEPAGE="http://sipsimpleclient.org"
@@ -14,9 +14,9 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     run:
-        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
-        dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
-        dev-python/python-gnutls[>=3.1.8][python_abis:*(-)?]
+        dev-python/python-application[python_abis:*(-)?]
+        dev-python/python-eventlib[python_abis:*(-)?]
+        dev-python/python-gnutls[>=3.0.0][python_abis:*(-)?]
         net-twisted/Twisted[python_abis:*(-)?]
 "
 

packages/dev-python/python-otr/python-otr-1.2.1.exheres-0

@@ -1,8 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require setup-py [ import=distutils blacklist="2" multibuild=false ]
-require github [ user="AGProjects" pn="python3-otr" tag="${PV}" ]
+require pypi setup-py [ import=distutils blacklist="3" ]
 
 SUMMARY="Off-The-Record Messaging protocol implementation for Python"
 HOMEPAGE="https://github.com/AGProjects/python-otr"
@@ -15,8 +14,9 @@ MYOPTIONS=""
 DEPENDENCIES="
     build+run:
         dev-python/cryptography[>=1.6][python_abis:*(-)?]
+        dev-python/enum34[python_abis:*(-)?]
         dev-python/gmpy2[python_abis:*(-)?]
-        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
+        dev-python/python-application[>=2.0.0][python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         net-libs/libotr
 "

packages/dev-python/python-sipsimple/files/0001-Fix-build-with-LibreSSL-2.7.patch

@@ -0,0 +1,26 @@
+From 8e0874b1be515abc8845e3ad41c4332f992e5687 Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Tue, 24 Dec 2019 22:17:28 +0100
+Subject: [PATCH] Fix build with LibreSSL 2.7
+Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/8
+
+---
+ deps/pjsip/third_party/zsrtp/include/openssl_compat.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/pjsip/third_party/zsrtp/include/openssl_compat.h b/deps/pjsip/third_party/zsrtp/include/openssl_compat.h
+index 5b6e183e..aebbf996 100644
+--- a/deps/pjsip/third_party/zsrtp/include/openssl_compat.h
++++ b/deps/pjsip/third_party/zsrtp/include/openssl_compat.h
+@@ -3,7 +3,7 @@
+ 
+ #include <openssl/hmac.h>
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ static HMAC_CTX *HMAC_CTX_new(void)
+ {
+     HMAC_CTX *ctx = (HMAC_CTX*)OPENSSL_malloc(sizeof(HMAC_CTX));
+-- 
+2.24.1
+

packages/dev-python/python-sipsimple/files/python-sipsimple-3.4.2-fix-build.patch

@@ -0,0 +1,45 @@
+From f786808a36deab01f301905ecdae27e6e17ce197 Mon Sep 17 00:00:00 2001
+From: Charles Barcza <info@blackpanther.hu>
+Date: Mon, 13 Mar 2017 14:46:34 +0100
+Subject: [PATCH 1/2] Build fix on Linux
+Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/1
+
+---
+ setup_pjsip.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup_pjsip.py b/setup_pjsip.py
+index 4760e64..a43533d 100644
+--- a/setup_pjsip.py
++++ b/setup_pjsip.py
+@@ -157,6 +157,7 @@ def configure_pjsip(self):
+         if sys_platform == "win32":
+             cmd = ["bash", "configure"]
+         else:
++    	    os.system("chmod +x "+ self.build_dir +"/*configure")
+             cmd = ["./configure"]
+         cmd.extend(["--disable-g7221-codec"])
+         ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None)
+
+From b80cf7ee9d4c32b4e068eb74492f31ccab1296b2 Mon Sep 17 00:00:00 2001
+From: Charles Barcza <info@blackpanther.hu>
+Date: Mon, 13 Mar 2017 14:55:29 +0100
+Subject: [PATCH 2/2] Build fix on Linux
+
+---
+ setup_pjsip.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup_pjsip.py b/setup_pjsip.py
+index a43533d..5f1b27b 100644
+--- a/setup_pjsip.py
++++ b/setup_pjsip.py
+@@ -157,7 +157,7 @@ def configure_pjsip(self):
+         if sys_platform == "win32":
+             cmd = ["bash", "configure"]
+         else:
+-    	    os.system("chmod +x "+ self.build_dir +"/*configure")
++	    os.system("chmod +x "+ self.build_dir +"/*configure")
+             cmd = ["./configure"]
+         cmd.extend(["--disable-g7221-codec"])
+         ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None)

packages/dev-python/python-sipsimple/files/python-sipsimple-fix-build.patch

@@ -1,22 +0,0 @@
-From f786808a36deab01f301905ecdae27e6e17ce197 Mon Sep 17 00:00:00 2001
-From: Charles Barcza <info@blackpanther.hu>
-Date: Mon, 13 Mar 2017 14:46:34 +0100
-Subject: [PATCH 1/2] Build fix on Linux
-Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/1
-
----
- setup_pjsip.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup_pjsip.py b/setup_pjsip.py
-index 7dd6c13ff..82e7bd1ca 100644
---- a/setup_pjsip.py
-+++ b/setup_pjsip.py
-@@ -160,6 +160,7 @@ class PJSIP_build_ext(build_ext):
-         if sys_platform == "win32":
-             cmd = ["bash", "configure"]
-         else:
-+            os.system("chmod +x "+ self.build_dir +"/*configure")
-             cmd = ["./configure"]
-         cmd.extend(["--disable-g7221-codec"])
-         ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None)

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

@@ -0,0 +1,61 @@
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user="AGProjects" tag="release-${PV}" ]
+require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
+
+SUMMARY="SIP SIMPLE client SDK is a Software Development Kit"
+HOMEPAGE="http://sipsimpleclient.org ${HOMEPAGE}"
+
+LICENCES="GPL-3"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS="
+    ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
+    ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
+"
+
+DEPENDENCIES="
+    build:
+        dev-python/Cython[python_abis:*(-)?]
+        virtual/pkg-config
+    build+run:
+        dev-db/sqlite:3
+        dev-libs/icu:=
+        dev-python/python-application[>=2.5.0][python_abis:*(-)?]
+        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:
+        dev-python/dnspython[python_abis:*(-)?]
+        dev-python/greenlet[python_abis:*(-)?]
+        dev-python/lxml[python_abis:*(-)?]
+        dev-python/python-cjson[python_abis:*(-)?]
+        dev-python/python-dateutil[python_abis:*(-)?]
+        dev-python/python-eventlib[python_abis:*(-)?]
+        dev-python/python-gnutls[python_abis:*(-)?]
+        dev-python/python-msrplib[>=0.19.0][python_abis:*(-)?]
+        dev-python/python-otr[>=1.2.0][python_abis:*(-)?]
+        dev-python/python-xcaplib[python_abis:*(-)?]
+        dev-python/zopeinterface[python_abis:*(-)?]
+        media-libs/x264[-10bit]
+        net-twisted/Twisted[python_abis:*(-)?]
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/${PNV}-fix-build.patch
+    "${FILES}"/0001-Fix-build-with-LibreSSL-2.7.patch
+)
+
+src_compile() {
+    # breaks horribly with 'ld'
+    export LD=${CC}
+
+    setup-py_src_compile
+}
+

packages/dev-python/python-sipsimple/python-sipsimple-5.2.6.exheres-0

@@ -1,98 +0,0 @@
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user="AGProjects" pn="python3-sipsimple" tag="${PV}" ]
-require setup-py [ import=distutils blacklist="2" multibuild=false ]
-
-SUMMARY="SIP SIMPLE client SDK is a Software Development Kit"
-HOMEPAGE="http://sipsimpleclient.org ${HOMEPAGE}"
-
-ZRTPCPP_SHA="6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03"
-
-DOWNLOADS+="
-    https://github.com/pjsip/pjproject/archive/2.10.tar.gz
-    https://github.com/wernerd/ZRTPCPP/archive/${ZRTPCPP_SHA}.tar.gz -> ZRTPCPP-${ZRTPCPP_SHA}.tar.gz
-"
-
-LICENCES="GPL-3"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
-"
-
-DEPENDENCIES="
-    build:
-        dev-python/Cython[python_abis:*(-)?]
-        virtual/pkg-config
-    build+run:
-        dev-db/sqlite:3
-        dev-libs/icu:=
-        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
-        media/ffmpeg[h264]
-        media-libs/libvpx
-        media-libs/v4l-utils
-        sys-apps/util-linux
-        sys-sound/alsa-lib
-        providers:libressl? ( dev-libs/libressl:= )
-        providers:openssl? ( dev-libs/openssl )
-    run:
-        dev-python/dnspython[python_abis:*(-)?]
-        dev-python/gevent[python_abis:*(-)?]
-        dev-python/greenlet[python_abis:*(-)?]
-        dev-python/lxml[python_abis:*(-)?]
-        dev-python/python-dateutil[python_abis:*(-)?]
-        dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
-        dev-python/python-gnutls[>=3.1.8][python_abis:*(-)?]
-        dev-python/python-msrplib[>=0.21.0][python_abis:*(-)?]
-        dev-python/python-otr[>=2.0.1][python_abis:*(-)?]
-        dev-python/python-xcaplib[>=2.0.0][python_abis:*(-)?]
-        dev-python/zopeinterface[python_abis:*(-)?]
-        media-libs/x264[-10bit]
-        net-twisted/Twisted[python_abis:*(-)?]
-"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/${PN}-fix-build.patch
-)
-
-src_prepare() {
-    setup-py_src_prepare
-
-    # MOst of this is straight from get_dependencies.sh but that
-    # wants to download the dependencies directly so we can't use it
-    edo mkdir "${WORK}"/deps/pjsip
-    edo mv "${WORKBASE}"/pjproject*/* "${WORK}"/deps/pjsip/
-
-    edo pushd "${WORK}"/deps/
-
-    # Copy wrapper from old version to third_party/zsrtp/
-    edo mkdir ./pjsip/third_party/zsrtp
-    cp -r zsrtp/include ./pjsip/third_party/zsrtp/
-    cp -r zsrtp/srtp    ./pjsip/third_party/zsrtp/
-    cp -r zsrtp/build   ./pjsip/third_party/build/zsrtp
-
-    # Copy new version to third_party/zsrtp/
-    mkdir ./pjsip/third_party/zsrtp/zrtp
-    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/bnlib ./pjsip/third_party/zsrtp/zrtp/
-    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/common ./pjsip/third_party/zsrtp/zrtp/
-    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/cryptcommon ./pjsip/third_party/zsrtp/zrtp/
-    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/srtp ./pjsip/third_party/zsrtp/zrtp/
-    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/zrtp ./pjsip/third_party/zsrtp/zrtp/
-    cp "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/COPYING ./pjsip/third_party/zsrtp/zrtp/
-    cp "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/README.md ./pjsip/third_party/zsrtp/zrtp/
-
-    for p in patches/*.patch; do
-        expatch -p0 "${p}"
-    done
-
-    edo popd
-}
-
-src_compile() {
-    # breaks horribly with 'ld'
-    export LD=${CC}
-
-    setup-py_src_compile
-}
-

packages/dev-python/python-xcaplib/python-xcaplib-1.2.1.exheres-0

@@ -1,11 +1,11 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require setup-py [ import=distutils blacklist="2" multibuild=false ]
-require github [ user="AGProjects" pn="python3-xcaplib" tag="${PV}" ]
+require setup-py [ import=distutils blacklist="3" ]
 
 SUMMARY="Python library for managing XML documents on XCAP server"
 HOMEPAGE="http://sipsimpleclient.org"
+DOWNLOADS="http://download.ag-projects.com/XCAP/${PNV}.tar.gz"
 
 LICENCES="GPL-2"
 SLOT="0"
@@ -14,8 +14,7 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     run:
-        dev-python/gevent[python_abis:*(-)?]
         dev-python/lxml[python_abis:*(-)?]
-        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
+        dev-python/python-application[python_abis:*(-)?]
 "
 

packages/dev-util/bakefile/bakefile-0.2.11.exheres-0

@@ -5,7 +5,7 @@ require python [ blacklist=3 has_bin=true has_lib=true multibuild=false ]
 require github [ user="vslavik" release="v${PV}" suffix=tar.gz ]
 
 SUMMARY="Bakefile makefiles generator"
-HOMEPAGE="https://bakefile.org/"
+HOMEPAGE="http://bakefile.org/"
 
 LICENCES="MIT"
 SLOT="0"

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

@@ -1,52 +0,0 @@
-# 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
-    export GH_VERSION="v${PV}"
-    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
-    esandbox enable_net
-}
-
-src_install() {
-    dobin bin/gh
-    emagicdocs
-
-    doman share/man/man?/gh*.?
-    dobashcompletion gh.bash-completion gh
-    dozshcompletion _gh
-}
-
-src_test() {
-    esandbox disable_net
-    default
-    esandbox enable_net
-}
-

packages/dev-util/gitui/gitui-0.7.0.exheres-0

@@ -1,21 +0,0 @@
-# Copyright 2020 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require cargo [ channel=stable ]
-require github [ user="extrawurst" tag="v${PV}" ]
-
-SUMMARY="Blazing fast terminal-ui for git written in rust"
-HOMEPAGE="https://crates.io/crates/gitui ${HOMEPAGE}"
-
-LICENCES="MIT"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-scm/libgit2
-"
-
-BUGS_TO="hasufell@posteo.de"
-

packages/dev-util/universal-ctags/universal-ctags-scm.exheres-0

@@ -0,0 +1,51 @@
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require alternatives github [ user='universal-ctags' pn='ctags' ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
+
+SUMMARY="Universal ctags"
+
+LICENCES="GPL-2"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS="
+    json [[ description = [ Add support for JSON format as output ] ]]
+    seccomp [[ description = [ Add support for libseccomp library ] ]]
+    xml
+    yaml [[ description = [ Add support for YAML format as output ] ]]
+"
+
+DEPENDENCIES="
+    build+run:
+        json? ( dev-libs/jansson )
+        seccomp? ( sys-libs/libseccomp )
+        xml? ( dev-libs/libxml2:2.0[>=2.7.7] )
+        yaml? ( dev-libs/libyaml )
+    build:
+        dev-python/docutils
+        virtual/pkg-config
+"
+
+# input-encoding-option and output-encoding-option fail as of 20-03-2020
+RESTRICT="test"
+
+DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
+    'json'
+    'seccomp'
+    'xml'
+    'yaml'
+)
+
+src_install() {
+    default
+
+    # alternatives collision
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{ctags,universal-ctags}
+    edo mv "${IMAGE}"/usr/share/man/man1/{ctags,universal-ctags}.1
+
+    alternatives_for ctags universal-ctags 500 \
+        /usr/$(exhost --target)/bin/ctags universal-ctags \
+        /usr/share/man/man1/ctags.1 universal-ctags.1
+}
+

packages/games-engines/openmw/openmw-0.44.0.exheres-0

@@ -0,0 +1,63 @@
+# Copyright 2014-2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require gtk-icon-cache
+require github [ user=OpenMW tag=${PNV} ]
+require cmake [ api=2 ]
+
+SUMMARY="An open source reimplementation of TES III: Morrowind"
+HOMEPAGE="http://openmw.org/"
+
+LICENCES="GPL-3 MIT bitstream-font OFL-1.1"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS="
+    ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
+"
+
+DEPENDENCIES="
+    build:
+        virtual/pkg-config
+    build+run:
+        app-arch/unshield
+        dev-games/OpenSceneGraph[>=3.3.4]
+        dev-games/mygui[>=3.2.1]
+        dev-libs/boost
+        dev-libs/tinyxml
+        media-libs/SDL:2[X]
+        media-libs/freetype:2
+        media-libs/openal
+        sci-physics/bullet[>=2.86]
+        x11-libs/qtbase:5
+        providers:ffmpeg? ( media/ffmpeg )
+        providers:libav? ( media/libav )
+"
+
+CMAKE_SRC_CONFIGURE_PARAMS=(
+    -DBINDIR="/usr/$(exhost --target)/bin"
+    -DBUILD_BSATOOL=ON
+    -DBUILD_DOCS=OFF
+    -DBUILD_ESMTOOL=ON
+    -DBUILD_LAUNCHER=ON
+    -DBUILD_NIFTEST=OFF
+    -DBUILD_OPENCS=ON
+    -DBUILD_OPENMW=ON
+    -DBUILD_UNITTESTS=OFF
+    -DBUILD_WITH_CODE_COVERAGE=OFF
+    -DBUILD_WIZARD=ON
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -DDATADIR="/usr/share/${PN}"
+    -DDESIRED_QT_VERSION=5
+    -DGLOBAL_CONFIG_PATH="/etc"
+    -DICONDIR="/usr/share/icons/hicolor/256x256/apps"
+    -DLIBDIR="/usr/$(exhost --target)/lib"
+    -DMORROWIND_DATA_FILES="/usr/share/${PN}/data"
+    -DOPENMW_RESOURCE_FILES="/usr/share/${PN}/resources"
+    -DUSE_SYSTEM_TINYXML=ON
+)
+
+src_install() {
+    default
+    keepdir /usr/share/openmw/data
+}
+

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

@@ -0,0 +1,74 @@
+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

@@ -0,0 +1,32 @@
+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.6-r1.exheres-0

@@ -17,3 +17,8 @@ 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.16 1.15 ] ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 require github [ user=PintaProject project=Pinta ]
-require gtk-icon-cache freedesktop-desktop
+require gtk-icon-cache freedesktop-desktop freedesktop-mime
 
 export_exlib_phases src_prepare pkg_postinst pkg_postrm
 
@@ -23,11 +23,13 @@ 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/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.exheres-0

@@ -0,0 +1,46 @@
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require scons
+
+SUMMARY="A simple converter to create Ogg Theora files"
+HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
+DOWNLOADS="http://www.v2v.cc/~j/${PN}/downloads/${PNV}.tar.bz2"
+
+LICENCES="GPL-3"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS="
+    ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
+"
+
+DEPENDENCIES="
+    build:
+        virtual/pkg-config
+    build+run:
+        media-libs/libvorbis
+        media-libs/libogg
+        media-libs/libtheora
+        providers:ffmpeg? ( media/ffmpeg )
+        providers:libav? ( media/libav )
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+    -p0 "${FILES}"/${PN}-0.30-underlinking.patch
+    -p1 "${FILES}"/${PN}-0.30-build.patch
+)
+
+SCONS_SRC_CONFIGURE_PARAMS=(
+    libkate=0
+    bindir="${IMAGE}/usr/$(exhost --target)/bin"
+    destdir=${IMAGE}
+    prefix=/usr
+)
+SCONS_SRC_COMPILE_PARAMS=( "${SCONS_SRC_CONFIGURE_PARAMS[@]}" )
+SCONS_SRC_INSTALL_PARAMS=( "${SCONS_SRC_CONFIGURE_PARAMS[@]}" )
+
+src_install() {
+    scons_src_install
+	dodoc AUTHORS ChangeLog README subtitles.txt TODO
+}
+

packages/media-video/ffmpeg2theora/files/ffmpeg2theora-0.30-build.patch

@@ -0,0 +1,76 @@
+Source: Julian Ospald <hasufell@posteo.de>
+Upstream: no
+Reason: fix build by respecting pkg-config, CC etc
+
+diff --git a/SConstruct b/SConstruct
+index 2458096..eda1c41 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -4,6 +4,7 @@ from glob import glob
+ import os
+ 
+ import SCons
++import SCons.Util
+ 
+ def version():
+     #return "0.29"
+@@ -41,6 +42,27 @@ opts.AddVariables(
+ env = Environment(options = opts)
+ Help(opts.GenerateHelpText(env))
+ 
++if os.environ.has_key('AR'):
++    env['AR'] = os.environ['AR']
++if os.environ.has_key('RANLIB'):
++    env['RANLIB'] = os.environ['RANLIB']
++if os.environ.has_key('CC'):
++    env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++    env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++    env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++    env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('CPPFLAGS'):
++    env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++if os.environ.has_key('PKG_CONFIG'):
++    env['PKG_CONFIG'] = os.environ['PKG_CONFIG']
++else:
++    env['PKG_CONFIG'] = 'pkg-config'
++
+ pkg_flags="--cflags --libs"
+ if env['static']:
+   pkg_flags+=" --static"
+@@ -75,9 +97,9 @@ if GetOption("help"):
+ 
+ def ParsePKGConfig(env, name): 
+   if os.environ.get('PKG_CONFIG_PATH', ''):
+-    action = 'PKG_CONFIG_PATH=%s pkg-config %s "%s"' % (os.environ['PKG_CONFIG_PATH'], pkg_flags, name)
++    action = 'PKG_CONFIG_PATH=%s %s %s "%s"' % (os.environ['PKG_CONFIG_PATH'], env['PKG_CONFIG'], pkg_flags, name)
+   else:
+-    action = 'pkg-config %s "%s"' % (pkg_flags, name)
++    action = '%s %s "%s"' % (env['PKG_CONFIG'], pkg_flags, name)
+   return env.ParseConfig(action)
+ 
+ def TryAction(action):
+@@ -89,16 +111,16 @@ def TryAction(action):
+ 
+ def CheckPKGConfig(context, version): 
+   context.Message( 'Checking for pkg-config... ' ) 
+-  ret = TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0] 
++  ret = TryAction('%s --atleast-pkgconfig-version=%s' % (env['PKG_CONFIG'], version))[0] 
+   context.Result( ret ) 
+   return ret 
+ 
+ def CheckPKG(context, name): 
+   context.Message( 'Checking for %s... ' % name )
+   if os.environ.get('PKG_CONFIG_PATH', ''):
+-    action = 'PKG_CONFIG_PATH=%s pkg-config --exists "%s"' % (os.environ['PKG_CONFIG_PATH'], name)
++    action = 'PKG_CONFIG_PATH=%s %s --exists "%s"' % (os.environ['PKG_CONFIG_PATH'], env['PKG_CONFIG'], name)
+   else:
+-    action = 'pkg-config --exists "%s"' % name
++    action = '%s --exists "%s"' % (env['PKG_CONFIG'], name)
+   ret = TryAction(action)[0]
+   context.Result( ret ) 
+   return ret

packages/media-video/ffmpeg2theora/files/ffmpeg2theora-0.30-underlinking.patch

@@ -0,0 +1,17 @@
+Source: Gentoo
+Upstream: unknown
+Reason: fix underlinking
+
+--- SConstruct
++++ SConstruct
+@@ -206,9 +206,8 @@
+   if env['crossmingw']:
+       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
+       env.Append(LIBS=['m'])
+-  elif env['static']:
+-      env.Append(LIBS=['m', 'dl'])
+ 
++  env.Append(LIBS=['m', 'dl'])
+ 
+ env = conf.Finish()
+ 

packages/net-im/discord-bin/discord-bin-0.0.19.exheres-0

@@ -1,88 +0,0 @@
-# Copyright 2020 <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require freedesktop-mime freedesktop-desktop gtk-icon-cache
-
-SUMMARY="All-in-one voice and text chat for gamers"
-HOMEPAGE="https://discordapp.com"
-DOWNLOADS="https://dl.discordapp.net/apps/linux/${PV}/discord-${PV}.tar.gz"
-
-LICENCES="all-rights-reserved"
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    run:
-        dev-libs/atk
-        dev-libs/at-spi2-atk
-        dev-libs/at-spi2-core
-        dev-libs/expat
-        dev-libs/glib:2
-        dev-libs/nspr
-        dev-libs/nss
-        net-print/cups
-        sys-apps/dbus
-        sys-sound/alsa-lib
-        x11-libs/cairo
-        x11-libs/gdk-pixbuf:2.0
-        x11-libs/gtk+:3
-        x11-libs/libX11
-        x11-libs/libxcb
-        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/libXScrnSaver
-        x11-libs/libXtst
-        x11-libs/pango
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-WORK=${WORKBASE}/Discord
-
-pkg_setup() {
-    exdirectory --allow /opt
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/share/discord/Discord:/opt/discord/Discord:g" \
-		discord.desktop
-}
-
-src_install() {
-    insinto /usr/share/icons/hicolor/256x256/apps
-    doins discord.png
-
-    insinto /usr/share/applications
-    doins discord.desktop
-
-    insinto /opt/discord
-    doins -r .
-
-    mkdir -p "${IMAGE}/usr/$(exhost --target)/bin"
-    dosym ../../../opt/discord/Discord /usr/$(exhost --target)/bin/discord
-    chmod +x "${IMAGE}/usr/$(exhost --target)/bin/discord"
-}
-
-pkg_postrm() {
-    freedesktop-desktop_pkg_postrm
-    freedesktop-mime_pkg_postrm
-    gtk-icon-cache_pkg_postrm
-}
-
-pkg_postinst() {
-    freedesktop-desktop_pkg_postinst
-    freedesktop-mime_pkg_postinst
-    gtk-icon-cache_pkg_postinst
-}
-
-

packages/net-im/slack/slack-4.4.2.exheres-0

@@ -5,7 +5,7 @@ require gtk-icon-cache freedesktop-desktop freedesktop-mime
 
 SUMMARY="Team collaboration tool"
 HOMEPAGE="http://www.slack.com/"
-DOWNLOADS="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/slack-desktop-${PV}-amd64.deb"
+DOWNLOADS="https://downloads.slack-edge.com/linux_releases/${PN/-bin/}-desktop-${PV}-amd64.deb"
 
 LICENCES="all-rights-reserved"
 SLOT="0"
@@ -70,7 +70,6 @@ src_install() {
     insinto /opt/slack
     doins -r usr/lib/slack/.
     edo chmod +x "${IMAGE}"/opt/slack/slack
-    edo chmod +x "${IMAGE}"/opt/slack/chrome_crashpad_handler
     dodir /usr/$(exhost --target)/bin
     dosym ../../../opt/slack/slack /usr/$(exhost --target)/bin/slack
 }

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

@@ -1,35 +0,0 @@
-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,7 +13,6 @@ HOMEPAGE+=" http://remmina.org/"
 
 LICENCES="GPL-2"
 MYOPTIONS="
-    cups
     ssh
     ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
     "
@@ -28,18 +27,14 @@ 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[>=2.0.0]
+        net-remote/FreeRDP
         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
@@ -50,10 +45,6 @@ DEPENDENCIES="
 
 BUGS_TO="hasufell@posteo.de"
 
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}/fix-share-paths.patch"
-)
-
 CMAKE_SRC_CONFIGURE_PARAMS=(
     # on
     -DWITH_FREERDP=ON
@@ -68,11 +59,9 @@ 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 ~armv8 ~x86"
+PLATFORMS="~amd64 ~x86"
 

packages/net-misc/trickle/trickle.exlib

@@ -17,7 +17,6 @@ MYOPTIONS=""
 DEPENDENCIES="
     build+run:
         dev-libs/libevent:=
-        net-libs/libtirpc
 "
 
 BUGS_TO="hasufell@posteo.de"
@@ -28,10 +27,3 @@ 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.4.1.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=( --gtk3 )
+        PERL_MODULE_SRC_CONFIGURE_PARAMS=( --gtk )
     fi
     perl-module_src_configure
 }

packages/sys-apps/evrouter/evrouter-0.4.exheres-0

@@ -1,31 +0,0 @@
-# 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

@@ -1,48 +0,0 @@
-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.41.2.exheres-0

@@ -47,10 +47,6 @@ 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/voip/blink/blink-3.2.0-r1.exheres-0

@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require desktop-utils gtk-icon-cache
-require setup-py [ import=distutils blacklist="2" multibuild=false ]
+require setup-py [ import=distutils blacklist="3" multibuild=false ]
+require github [ user="AGProjects" pn="blink-qt" tag="release-${PV}" ]
 
 SUMMARY="A state of the art, easy to use SIP client"
 HOMEPAGE="http://iCanBlink.com"
-DOWNLOADS="http://download.ag-projects.com/Blink/Linux/${PNV}.tar.gz"
 
 LICENCES="GPL-3"
 SLOT="0"
@@ -22,17 +22,17 @@ DEPENDENCIES="
         dev-python/PyQt5[>=5.0][webkit][python_abis:*(-)?]
         dev-python/google-api-python-client[python_abis:*(-)?]
         dev-python/lxml[python_abis:*(-)?]
-        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
+        dev-python/python-application[>=2.5.0][python_abis:*(-)?]
+        dev-python/python-cjson[python_abis:*(-)?]
         dev-python/python-dateutil[python_abis:*(-)?]
-        dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
-        dev-python/python-sipsimple[>=5.2.5][python_abis:*(-)?]
+        dev-python/python-eventlib[python_abis:*(-)?]
+        dev-python/python-sipsimple[>=3.0.0][python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         net-twisted/Twisted[python_abis:*(-)?]
 "
 
 DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}/${PN}-data-path.patch"
-    "${FILES}/33c7f377d173d27b4611d061ca36077805250e78.patch"
+    "${FILES}/${PNV}-data-path.patch"
 )
 
 src_install() {

packages/voip/blink/files/33c7f377d173d27b4611d061ca36077805250e78.patch

@@ -1,122 +0,0 @@
-Upstream: Yes
-
-From 33c7f377d173d27b4611d061ca36077805250e78 Mon Sep 17 00:00:00 2001
-From: Jose Lopes <josemslopes@gmail.com>
-Date: Tue, 8 Feb 2022 08:11:57 +0000
-Subject: [PATCH] Solve issues with python 3.10
-
-GH-3
----
- blink/chatwindow.py       |  3 ++-
- blink/sessions.py         |  6 +++---
- blink/widgets/buttons.py  |  4 ++--
- blink/widgets/lineedit.py | 14 +++++++-------
- blink/widgets/video.py    |  2 +-
- 5 files changed, 15 insertions(+), 14 deletions(-)
-
-diff --git a/blink/chatwindow.py b/blink/chatwindow.py
-index e55f590..40da6de 100644
---- a/blink/chatwindow.py
-+++ b/blink/chatwindow.py
-@@ -18,7 +18,8 @@
- from application.python.descriptor import WriteOnceAttribute
- from application.python.types import MarkerType
- from application.system import makedirs
--from collections import MutableSet, deque
-+from collections.abc import MutableSet
-+from collections import deque
- from datetime import datetime, timedelta
- from itertools import count
- from lxml import etree, html
-diff --git a/blink/sessions.py b/blink/sessions.py
-index 9805515..9928831 100644
---- a/blink/sessions.py
-+++ b/blink/sessions.py
-@@ -5094,13 +5094,13 @@ def showEvent(self, event):
-             total_width = width + window_frame_size.width()
-             total_height = height + window_frame_size.height()
- 
--            x = limit(screen_geometry.center().x() - total_width/2, min=available_geometry.left(), max=available_geometry.right()-total_width)
-+            x = int(limit(screen_geometry.center().x() - total_width/2, min=available_geometry.left(), max=available_geometry.right()-total_width))
-             if slot is None:
-                 y = -1
-             elif slot % 2 == 0:
--                y = screen_geometry.center().y() + (slot-1)*total_height/2
-+                y = int(screen_geometry.center().y() + (slot-1)*total_height/2)
-             else:
--                y = screen_geometry.center().y() - slot*total_height/2
-+                y = int(screen_geometry.center().y() - slot*total_height/2)
- 
-             if available_geometry.top() <= y <= available_geometry.bottom() - total_height:
-                 self.setGeometry(x, y, width, height)
-diff --git a/blink/widgets/buttons.py b/blink/widgets/buttons.py
-index c3b18bf..72aefd5 100644
---- a/blink/widgets/buttons.py
-+++ b/blink/widgets/buttons.py
-@@ -620,8 +620,8 @@ def pixmap(self, mode=QIcon.Normal, state=QIcon.Off):
-             return pixmap
- 
-         size = max(pixmap.width(), pixmap.height())
--        offset_x = (size - pixmap.width())/2
--        offset_y = (size - pixmap.height())/2
-+        offset_x = int((size - pixmap.width())/2)
-+        offset_y = int((size - pixmap.height())/2)
- 
-         new_pixmap = QPixmap(size, size)
-         new_pixmap.fill(Qt.transparent)
-diff --git a/blink/widgets/lineedit.py b/blink/widgets/lineedit.py
-index ee63e81..f03ac54 100644
---- a/blink/widgets/lineedit.py
-+++ b/blink/widgets/lineedit.py
-@@ -68,13 +68,13 @@ def _update_side_widget_locations(self):
-         text_rect.adjust(spacing, 0, -spacing, 0)
-         mid_height = text_rect.center().y() + 1 - (text_rect.height() % 2)  # need -1 correction for odd heights -Dan
-         if self.left_layout.count() > 0:
--            left_height = mid_height - self.left_widget.height()/2
-+            left_height = int(mid_height - self.left_widget.height()/2)
-             left_width = self.left_widget.width()
-             if left_width == 0:
--                left_height = mid_height - self.left_widget.sizeHint().height()/2
-+                left_height = int(mid_height - self.left_widget.sizeHint().height()/2)
-             self.left_widget.move(text_rect.x(), left_height)
-         text_rect.setX(self.left_margin)
--        text_rect.setY(mid_height - self.right_widget.sizeHint().height()/2.0)
-+        text_rect.setY(int(mid_height - self.right_widget.sizeHint().height()/2.0))
-         text_rect.setHeight(self.right_widget.sizeHint().height())
-         self.right_widget.setGeometry(text_rect)
- 
-@@ -201,8 +201,8 @@ def __init__(self, parent=None, size=16):
-     def paintEvent(self, event):
-         painter = QPainter(self)
-         if self.icon is not None:
--            x = (self.width() - self.icon.width()) / 2
--            y = (self.height() - self.icon.height()) / 2
-+            x = int((self.width() - self.icon.width()) / 2)
-+            y = int((self.height() - self.icon.height()) / 2)
-             painter.drawPixmap(x, y, self.icon)
- 
- 
-@@ -232,8 +232,8 @@ def paintEvent(self, event):
-         painter = QPainter(self)
-         icon = self.icon_pressed if self.isDown() else self.icon
-         if icon is not None:
--            x = (self.width() - icon.width()) / 2
--            y = (self.height() - icon.height()) / 2
-+            x = int((self.width() - icon.width()) / 2)
-+            y = int((self.height() - icon.height()) / 2)
-             painter.drawPixmap(x, y, icon)
-         else:
-             width = self.width()
-diff --git a/blink/widgets/video.py b/blink/widgets/video.py
-index eff4f7c..5ecab6a 100644
---- a/blink/widgets/video.py
-+++ b/blink/widgets/video.py
-@@ -56,7 +56,7 @@ def __init__(self, parent=None, framerate=None):
-         self.cursors.resize_bottom = QCursor(QIcon(Resources.get('icons/resize-bottom.svg')).pixmap(16), hotX=8,  hotY=16)
-         if framerate is not None:
-             self._clock = QTimer()
--            self._clock.setInterval(1000/framerate)
-+            self._clock.setInterval(int(1000/framerate))
-             self._clock.timeout.connect(self.update)
-         else:
-             self._clock = None

packages/voip/blink/files/blink-3.2.0-data-path.patch

@@ -3,17 +3,14 @@ Date: Tue Sep  8 10:10:18 UTC 2015
 Subject: Fix data path fallback
 Upstream: no, correct fix pending since 'sys.prefix' is broken in exherbo
 
-
-diff --git a/blink/resources.py b/blink/resources.py
-index e981ed8..f1f4f5c 100644
---- a/blink/resources.py
-+++ b/blink/resources.py
-@@ -81,7 +81,7 @@ class Resources(object):
-             elif os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')):
-                 cls._cached_directory = os.path.join(application_directory, 'resources')
+--- blink-1.4.1/blink/resources.py
++++ blink-1.4.1/blink/resources.py
+@@ -71,7 +71,7 @@
+             if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')):
+                 cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding())
              else:
--                cls._cached_directory = os.path.join(application_directory, 'share', 'blink')
-+                cls._cached_directory = os.path.join('/usr', 'share', 'blink')
+-                cls._cached_directory = os.path.join(application_directory, 'share', 'blink').decode(sys.getfilesystemencoding())
++                cls._cached_directory = os.path.join('/usr', 'share', 'blink').decode(sys.getfilesystemencoding())
          return DirectoryContextManager(cls._cached_directory)
  
      @classmethod

packages/x11-apps/picom/picom-7.5.exheres-0

@@ -23,9 +23,9 @@ DEPENDENCIES="
         x11-proto/xorgproto
     build+run:
         dev-libs/libev
-        dev-libs/pcre[>=8.20]
+        dev-libs/pcre[>=8.10]
         x11-libs/libX11
-        x11-libs/libxcb[>=1.12.0]
+        x11-libs/libxcb[>=1.9.2]
         x11-libs/libXext
         x11-libs/pixman:1
         x11-utils/xcb-util-image
@@ -40,6 +40,7 @@ DEPENDENCIES="
             x11-dri/mesa
         )
     run:
+        dev-lang/python:*[>3.5] [[ note = [ bin/compton-convgen.py ] ]]
         x11-apps/xprop
         x11-apps/xwininfo
 "
@@ -49,9 +50,8 @@ DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
 )
 
 MESON_SRC_CONFIGURE_PARAMS=(
-    "-Dcompton=false"
     "-Dunittest=true"
-    "-Dwith_docs=true"
+    "-Dbuild_docs=true"  # with_docs in "next" branch
 )
 MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
     "dbus"
@@ -59,6 +59,13 @@ MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
     "opengl"
 )
 
+src_prepare() {
+    meson_src_prepare
+    # don't install compat symlink
+    # this script is also broken
+    echo "#!/bin/sh" > meson/install.sh
+}
+
 src_install() {
     meson_src_install
     option dbus && dodoc -r dbus-examples

packages/x11-apps/sakura/files/sakura-3.7.0-Use-GNUInstallDirs.patch

@@ -1,84 +0,0 @@
-From c116f39931e57713f485664717841f858dd6c8d9 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Tue, 24 May 2016 21:32:40 +0200
-Subject: [PATCH] Use GNUInstallDirs
-Upstream: no
-
-This allows better control over the install destinations.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5f63cf1..689d2eb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,7 @@ SET (AUTHOR "David Gómez Espinosa" INTERNAL "Author")
- SET (VERSION "3.7.0")
- 
- 
-+INCLUDE (GNUInstallDirs)
- INCLUDE (FindPkgConfig)
- 
- IF (NOT PKG_CONFIG_FOUND)
-@@ -35,7 +36,8 @@ FIND_PROGRAM(POD2MAN pod2man)
- MESSAGE ("pod2man executable is" ${POD2MAN})	
- 
- ADD_DEFINITIONS (-DVERSION="${VERSION}")
--ADD_DEFINITIONS (-DDATADIR="${CMAKE_INSTALL_PREFIX}/share")
-+ADD_DEFINITIONS (-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
-+ADD_DEFINITIONS (-DPIXMAPSDIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps")
- ADD_DEFINITIONS (-DBUILDTYPE="${CMAKE_BUILD_TYPE}")
- 
- IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-@@ -51,13 +53,13 @@ ADD_EXECUTABLE (sakura src/sakura.c)
- 
- ADD_SUBDIRECTORY (po)
- 
--INSTALL (TARGETS sakura RUNTIME DESTINATION bin)	
--INSTALL (FILES sakura.desktop DESTINATION share/applications)
--INSTALL (FILES terminal-tango.svg DESTINATION share/pixmaps)
-+INSTALL (TARGETS sakura RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+INSTALL (FILES sakura.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-+INSTALL (FILES terminal-tango.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
- IF (POD2MAN)	
--	INSTALL (FILES ${sakura_BINARY_DIR}/sakura.1 DESTINATION share/man/man1)	
-+	INSTALL (FILES ${sakura_BINARY_DIR}/sakura.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- ENDIF (POD2MAN)
--INSTALL (FILES INSTALL DESTINATION share/doc/sakura)	
-+INSTALL (FILES INSTALL DESTINATION ${CMAKE_INSTALL_DOCDIR})
- 
- FILE (GLOB MO_FILES po/*.mo)
- 
-diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
-index a710347..cfe380a 100644
---- a/po/CMakeLists.txt
-+++ b/po/CMakeLists.txt
-@@ -27,7 +27,7 @@ ELSE(NOT MSGFMT)
- 				COMMAND ${MSGFMT} --check -o ${_moFile} ${_poFile} 
- 				DEPENDS ${_poFile})
- 		INSTALL(FILES ${CMAKE_BINARY_DIR}/po/${_moFile}
--			   	DESTINATION share/locale/${_lang}/LC_MESSAGES/
-+			   	DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${_lang}/LC_MESSAGES/
- 			   	RENAME ${catalogname}.mo)
- 	ENDFOREACH(_poFile ${PO_FILES})
- 
-diff --git a/src/sakura.c b/src/sakura.c
-index a0084c2..f1437fe 100644
---- a/src/sakura.c
-+++ b/src/sakura.c
-@@ -2243,7 +2243,7 @@ sakura_init()
- 	if (option_icon) {
- 		icon_path = g_strdup_printf("%s", option_icon);
- 	} else {
--		icon_path = g_strdup_printf(DATADIR "/pixmaps/%s", sakura.icon);
-+		icon_path = g_strdup_printf(PIXMAPSDIR "/%s", sakura.icon);
- 	}
- 	gtk_window_set_icon_from_file(GTK_WINDOW(sakura.main_window), icon_path, &error);
- 	g_free(icon_path); icon_path=NULL;
-@@ -3405,7 +3405,7 @@ main(int argc, char **argv)
- 
- 	/* Localization */
- 	setlocale(LC_ALL, "");
--	localedir=g_strdup_printf("%s/locale", DATADIR);
-+	localedir=g_strdup_printf("%s", LOCALEDIR);
- 	textdomain(GETTEXT_PACKAGE);
- 	bindtextdomain(GETTEXT_PACKAGE, localedir);
- 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");

packages/x11-apps/sakura/sakura-3.7.0.exheres-0

@@ -1,25 +0,0 @@
-# Copyright 2013 Tod Jackson <tod.jackson@gmail.com>
-# Distributed under the terms of the GNU General Public License v2
-# Which is based upon the exheres:
-# Copyright 2012 Kevin Decherf <kevin@kdecherf.com>
-# Distributed under the terms of the GNU General Public License v2
-
-require freedesktop-desktop launchpad [ suffix=tar.gz branch=trunk ] sakura
-
-PLATFORMS="~amd64 ~x86"
-
-DEPENDENCIES="
-    build:
-        dev-lang/perl:* [[ note = [ For pod2man ] ]]
-        virtual/pkg-config
-    build+run:
-        dev-libs/glib:2[>=2.40]
-        dev-libs/vte:2.91
-        x11-libs/gtk+:3[>=3.12]
-        x11-libs/libXft
-"
-
-DEFAULT_SRC_PREPARE_PATCHES+=(
-    "${FILES}"/${PNV}-Use-GNUInstallDirs.patch
-)
-

packages/x11-apps/sakura/sakura.exlib

@@ -1,24 +0,0 @@
-# Copyright 2010 Julien Pivotto <roidelapluie@gmail.com>
-# Distributed under the terms of the GNU General Public License v2
-
-require cmake [ api=2 ]
-
-SUMMARY="sakura is a vte-based terminal emulator."
-DESCRIPTION="sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator with few
-dependencies, so you don't need a full GNOME desktop installed to have a decent terminal emulator.
-
-Current terminal emulators based on VTE are  gnome-terminal, XFCE Terminal, TermIt and a small
-sample program included in the vte sources. The differences between sakura and the last one are
-that it uses a notebook to provide several terminals in one window and adds a contextual menu with
-some basic options. No more no less."
-HOMEPAGE="http://pleyades.net/david/projects/sakura"
-
-LICENCES="GPL-2"
-SLOT="0"
-
-REMOTE_IDS="freshmeat:sakura launchpad:sakura"
-
-CMAKE_SRC_CONFIGURE_PARAMS=(
-    -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PNVR}
-)
-

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

@@ -1,37 +0,0 @@
-# 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.72.0.exheres-0

@@ -25,13 +25,14 @@ DEPENDENCIES="
     recommendation:
         dev-python/pyxdg[python_abis:*(-)?]
     suggestion:
-        app-text/dvipng [[ note = [ equation plugin ] ]]
-        app-text/texlive-core [[ note = [ equation plugin ] ]]
-        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 ] ]]
+        app-text/dvipng
+        app-text/texlive-core
+        dev-libs/zeitgeist:2.0
+        dev-scm/bzr
+        media-gfx/ImageMagick
+        media-gfx/graphviz
+        media-gfx/scrot
+        media-sound/lilypond
         sci-apps/gnuplot
 "