blink: Switch Twisted{Core,Name} dependency to Twisted

It's no longer needed after the port to Qt5, which has JSON support
of it's own (although qjson has also been ported to qt5 in the
meantime, but our exheres doesn't provide that version nor does
any package use it AFAIK).

metadata/repository_mask.conf

@@ -1,5 +1,6 @@
 (
     app-editors/neovim-gtk[~scm]
+    dev-haskell/ghcup[~scm]
     dev-lang/fsharp[~scm]
     dev-lang/fstar[~scm]
     dev-python/pytype[~scm]
@@ -22,8 +23,10 @@
     net-misc/trickle[~scm]
     sys-apps/fd[~scm]
     sys-apps/lenovo-throttling-fix[~scm]
+    sys-apps/lsd[~scm]
     x11-apps/terminator[~scm]
     x11-misc/cbatticon[~scm]
+    x11-misc/fsearch[~scm]
     x11-wm/i3[~scm]
 ) [[
     *author = [ Julian Ospald <hasufell@posteo.de> ]

packages/app-ergonomics/workrave/workrave-1.10.23.exheres-0

@@ -21,6 +21,7 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
 MYOPTIONS="
+    gconf [[ description = [ compile with Gnome gconf2 support ] ]]
     gnome [[ description = [ Add support for gnome panel ] ]]
     pulseaudio
     xfce4-panel [[ description = [ Add support for XFCE panel ] ]]
@@ -35,21 +36,26 @@ DEPENDENCIES="
         virtual/pkg-config
         x11-proto/xorgproto
     build+run:
+        dev-cpp/cairomm:1.0
         dev-cpp/libsigc++:2
+        dev-libs/atk
         dev-libs/glib:2
+        gnome-bindings/atkmm:1.6
         gnome-bindings/glibmm:2.4
         gnome-bindings/gtkmm:3
+        gnome-bindings/pangomm:1.4
         gnome-desktop/gobject-introspection:=
         media-libs/gstreamer:1.0[gobject-introspection]
         media-plugins/gst-plugins-base:1.0[gobject-introspection]
         media-plugins/gst-plugins-good:1.0
+        x11-libs/cairo
+        x11-libs/gdk-pixbuf:2.0
         x11-libs/gtk+:3[gobject-introspection]
-        x11-libs/libSM
         x11-libs/libX11
         x11-libs/libXScrnSaver
-        x11-libs/libXmu
-        x11-libs/libXt
         x11-libs/libXtst
+        x11-libs/pango:0
+        gconf? ( gnome-platform/GConf:2 )
         gnome? ( gnome-base/gnome-shell )
         pulseaudio? ( media-sound/pulseaudio )
         xfce4-panel? (
@@ -65,7 +71,6 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
     --disable-distribution
     --enable-exercises
     --disable-experimental
-    --disable-gnome2
     --disable-static
     --disable-xml
     --disable-indicator
@@ -77,6 +82,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
 )
 
 DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
+    'gconf gconf'
     'gnome gnome3'
     'pulseaudio pulse'
     'xfce4-panel xfce'

packages/dev-haskell/cabal-install-bin/cabal-install-bin-2.4.1.0.exheres-0

@@ -0,0 +1,30 @@
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+SUMMARY="cabal-install is the command line interface to Cabal and hackage"
+HOMEPAGE="https://www.haskell.org/cabal/"
+DOWNLOADS="https://downloads.haskell.org/~cabal/cabal-install-${PV}/cabal-install-${PV}-x86_64-unknown-linux.tar.xz"
+
+LICENCES="BSD-3"
+SLOT="0"
+PLATFORMS="-* ~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    run:
+        virtual/GHC
+        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
+        !dev-haskell/cabal-install [[
+            description = [ Both install the same binary ]
+            resolution = uninstall-blocked-after
+        ]]
+"
+
+BUGS_TO="hasufell@posteo.de"
+
+WORK=${WORKBASE}
+
+src_install() {
+    dobin cabal
+}
+

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

@@ -0,0 +1,38 @@
+# Copyright 2019 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user=haskell ]
+
+SUMMARY="Painless installation of GHC toolchain"
+HOMEPAGE="https://www.haskell.org/ghcup/ ${HOMEPAGE}"
+
+LICENCES="BSD-3"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+
+
+DEPENDENCIES="
+    run:
+        app-arch/gzip
+        app-arch/tar
+        app-arch/xz
+        net-misc/curl
+        sys-apps/coreutils
+        virtual/awk
+        suggestion:
+            net-misc/wget [[ description = [ alternative downloader ] ]]
+        recommendation:
+            (
+                dev-lang/llvm[>=2.7]
+                dev-lang/perl:*[>=5.6.1]
+                dev-libs/gmp[>=5]
+                dev-libs/libffi
+            ) [[ *description = [ Dependency for GHC ] *group-name = [ ghc-deps ] ]]
+"
+
+BUGS_TO="hasufell@posteo.de"
+
+src_install() {
+    dobin ghcup
+    emagicdocs
+}

packages/dev-lang/GHC/GHC-8.6.3.exheres-0

@@ -0,0 +1,180 @@
+# Copyright 2008 Santiago M. Mola
+# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
+# Copyright 2011 Markus Rothe
+# Distributed under the terms of the GNU General Public License v2
+# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
+#     Copyright 1999-2008 Gentoo Foundation
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+
+MY_PN="ghc"
+MY_PNV="${MY_PN}-${PV}"
+MY_PNVR="${MY_PN}-${PVR}"
+
+require bash-completion flag-o-matic alternatives
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+
+SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
+DESCRIPTION="
+GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
+language Haskell.
+"
+HOMEPAGE="https://www.haskell.org/ghc/"
+DOWNLOADS="
+    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
+    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
+    https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz
+"
+
+PLATFORMS="-* ~amd64"
+
+BUGS_TO=""
+REMOTE_IDS="freecode:${MY_PN}"
+UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
+
+LICENCES="BSD-3"
+SLOT="${PV}"
+MYOPTIONS="
+    doc
+    llvm [[ description = [ Code generation using LLVM ] ]]
+"
+
+# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
+# case of unexpected failures. There are always unexpected failures.
+# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
+# which runs the same tests as `make test`, but includes more test cases per test.
+RESTRICT="test"
+
+DEPENDENCIES="
+    build:
+        dev-python/Sphinx
+    build+run:
+        dev-lang/perl:*[>=5.6.1]
+        dev-libs/gmp:=[>=5]
+        dev-libs/libffi
+        llvm? ( dev-lang/llvm[>=2.7] )
+        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
+        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
+"
+
+WORK=${WORKBASE}/${MY_PNV}
+
+src_unpack() {
+    unpack ghc-${PV}-x86_64-fedora27-linux.tar.xz
+    edo mv "${WORK}" "${WORK}-pre"
+    unpack ${MY_PNV}-src.tar.xz
+    unpack ${MY_PNV}-testsuite.tar.xz
+}
+
+src_prepare() {
+    # prepare pre-built ghc
+    edo pushd "${WORK}-pre"
+    edo ./configure \
+        --prefix="${TEMP}/ghc-pre" \
+        --target=$(exhost --target)
+    emake install
+    edo popd
+
+    autotools_src_prepare
+}
+
+src_configure() {
+    # Initialize build.mk
+    echo '# Exherbo changes' > mk/build.mk
+
+    cat <<EOF >> mk/build.mk
+# Put docs into the right place
+docdir = /usr/share/doc/${MY_PNVR}
+htmldir = /usr/share/doc/${MY_PNVR}/html
+EOF
+
+    if option doc; then
+        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
+        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+        echo "HADDOCK_DOCS=YES" >> mk/build.mk
+    else
+        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+        echo "HADDOCK_DOCS=NO" >> mk/build.mk
+    fi
+
+    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
+    export PATH="${WORKBASE}/usr/bin:${PATH}"
+
+    if option llvm; then
+        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
+    else
+        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
+    fi
+
+    GHC_SRC_CONFIGURE_OPTIONS+=(
+        --with-system-libffi
+        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
+    )
+
+    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
+    # cross-compilation.
+    econf \
+        AR=${AR} \
+        CC=${CC} \
+        --target=$(exhost --target) \
+        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
+
+    # don't strip anything. Very useful when stage2 SIGSEGVs on you
+    echo "STRIP_CMD = :" >> mk/build.mk
+}
+
+src_install() {
+    default
+
+    # libraries/ is a partial dupe of the html/ dir hierarchy, but
+    # containing only LICENSE files
+    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
+
+    dobashcompletion "${FILES}/ghc-bash-completion"
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
+
+    # some scripts are not versioned, move
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
+
+    # remove unversioned symlinks, we create alternatives later
+    local ghc_bin
+    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
+        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
+    done
+    unset ghc_bin
+
+    # create alternatives for scripts/binaries
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
+        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
+        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
+
+    # alternatives for manpages
+    if [[ -d ${IMAGE}/usr/share/man ]]; then
+        local file alternatives=()
+        for file in "${IMAGE}"/usr/share/man/*/*; do
+            alternatives+=(
+            ${file#${IMAGE}}
+            ${file#${IMAGE}}-${SLOT}
+            )
+        done
+
+        alternatives_for \
+            ghc ${SLOT} ${SLOT} \
+            "${alternatives[@]}"
+    fi
+}
+
+src_test_expensive() {
+    emake fulltest
+}
+

packages/dev-lang/GHC/GHC-8.6.4.exheres-0

@@ -0,0 +1,180 @@
+# Copyright 2008 Santiago M. Mola
+# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
+# Copyright 2011 Markus Rothe
+# Distributed under the terms of the GNU General Public License v2
+# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
+#     Copyright 1999-2008 Gentoo Foundation
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+
+MY_PN="ghc"
+MY_PNV="${MY_PN}-${PV}"
+MY_PNVR="${MY_PN}-${PVR}"
+
+require bash-completion flag-o-matic alternatives
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+
+SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
+DESCRIPTION="
+GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
+language Haskell.
+"
+HOMEPAGE="https://www.haskell.org/ghc/"
+DOWNLOADS="
+    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
+    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
+    https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz
+"
+
+PLATFORMS="-* ~amd64"
+
+BUGS_TO=""
+REMOTE_IDS="freecode:${MY_PN}"
+UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
+
+LICENCES="BSD-3"
+SLOT="${PV}"
+MYOPTIONS="
+    doc
+    llvm [[ description = [ Code generation using LLVM ] ]]
+"
+
+# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
+# case of unexpected failures. There are always unexpected failures.
+# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
+# which runs the same tests as `make test`, but includes more test cases per test.
+RESTRICT="test"
+
+DEPENDENCIES="
+    build:
+        dev-python/Sphinx
+    build+run:
+        dev-lang/perl:*[>=5.6.1]
+        dev-libs/gmp:=[>=5]
+        dev-libs/libffi
+        llvm? ( dev-lang/llvm[>=2.7] )
+        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
+        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
+"
+
+WORK=${WORKBASE}/${MY_PNV}
+
+src_unpack() {
+    unpack ghc-${PV}-x86_64-fedora27-linux.tar.xz
+    edo mv "${WORK}" "${WORK}-pre"
+    unpack ${MY_PNV}-src.tar.xz
+    unpack ${MY_PNV}-testsuite.tar.xz
+}
+
+src_prepare() {
+    # prepare pre-built ghc
+    edo pushd "${WORK}-pre"
+    edo ./configure \
+        --prefix="${TEMP}/ghc-pre" \
+        --target=$(exhost --target)
+    emake install
+    edo popd
+
+    autotools_src_prepare
+}
+
+src_configure() {
+    # Initialize build.mk
+    echo '# Exherbo changes' > mk/build.mk
+
+    cat <<EOF >> mk/build.mk
+# Put docs into the right place
+docdir = /usr/share/doc/${MY_PNVR}
+htmldir = /usr/share/doc/${MY_PNVR}/html
+EOF
+
+    if option doc; then
+        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
+        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+        echo "HADDOCK_DOCS=YES" >> mk/build.mk
+    else
+        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+        echo "HADDOCK_DOCS=NO" >> mk/build.mk
+    fi
+
+    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
+    export PATH="${WORKBASE}/usr/bin:${PATH}"
+
+    if option llvm; then
+        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
+    else
+        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
+    fi
+
+    GHC_SRC_CONFIGURE_OPTIONS+=(
+        --with-system-libffi
+        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
+    )
+
+    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
+    # cross-compilation.
+    econf \
+        AR=${AR} \
+        CC=${CC} \
+        --target=$(exhost --target) \
+        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
+
+    # don't strip anything. Very useful when stage2 SIGSEGVs on you
+    echo "STRIP_CMD = :" >> mk/build.mk
+}
+
+src_install() {
+    default
+
+    # libraries/ is a partial dupe of the html/ dir hierarchy, but
+    # containing only LICENSE files
+    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
+
+    dobashcompletion "${FILES}/ghc-bash-completion"
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
+
+    # some scripts are not versioned, move
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
+
+    # remove unversioned symlinks, we create alternatives later
+    local ghc_bin
+    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
+        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
+    done
+    unset ghc_bin
+
+    # create alternatives for scripts/binaries
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
+        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
+        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
+
+    # alternatives for manpages
+    if [[ -d ${IMAGE}/usr/share/man ]]; then
+        local file alternatives=()
+        for file in "${IMAGE}"/usr/share/man/*/*; do
+            alternatives+=(
+            ${file#${IMAGE}}
+            ${file#${IMAGE}}-${SLOT}
+            )
+        done
+
+        alternatives_for \
+            ghc ${SLOT} ${SLOT} \
+            "${alternatives[@]}"
+    fi
+}
+
+src_test_expensive() {
+    emake fulltest
+}
+

packages/dev-lang/GHC/GHC-8.6.5.exheres-0

@@ -0,0 +1,180 @@
+# Copyright 2008 Santiago M. Mola
+# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
+# Copyright 2011 Markus Rothe
+# Distributed under the terms of the GNU General Public License v2
+# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
+#     Copyright 1999-2008 Gentoo Foundation
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+
+MY_PN="ghc"
+MY_PNV="${MY_PN}-${PV}"
+MY_PNVR="${MY_PN}-${PVR}"
+
+require bash-completion flag-o-matic alternatives
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+
+SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
+DESCRIPTION="
+GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
+language Haskell.
+"
+HOMEPAGE="https://www.haskell.org/ghc/"
+DOWNLOADS="
+    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
+    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
+    https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz
+"
+
+PLATFORMS="-* ~amd64"
+
+BUGS_TO=""
+REMOTE_IDS="freecode:${MY_PN}"
+UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
+
+LICENCES="BSD-3"
+SLOT="${PV}"
+MYOPTIONS="
+    doc
+    llvm [[ description = [ Code generation using LLVM ] ]]
+"
+
+# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
+# case of unexpected failures. There are always unexpected failures.
+# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
+# which runs the same tests as `make test`, but includes more test cases per test.
+RESTRICT="test"
+
+DEPENDENCIES="
+    build:
+        dev-python/Sphinx
+    build+run:
+        dev-lang/perl:*[>=5.6.1]
+        dev-libs/gmp:=[>=5]
+        dev-libs/libffi
+        llvm? ( dev-lang/llvm[>=2.7] )
+        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
+        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
+"
+
+WORK=${WORKBASE}/${MY_PNV}
+
+src_unpack() {
+    unpack ghc-${PV}-x86_64-fedora27-linux.tar.xz
+    edo mv "${WORK}" "${WORK}-pre"
+    unpack ${MY_PNV}-src.tar.xz
+    unpack ${MY_PNV}-testsuite.tar.xz
+}
+
+src_prepare() {
+    # prepare pre-built ghc
+    edo pushd "${WORK}-pre"
+    edo ./configure \
+        --prefix="${TEMP}/ghc-pre" \
+        --target=$(exhost --target)
+    emake install
+    edo popd
+
+    autotools_src_prepare
+}
+
+src_configure() {
+    # Initialize build.mk
+    echo '# Exherbo changes' > mk/build.mk
+
+    cat <<EOF >> mk/build.mk
+# Put docs into the right place
+docdir = /usr/share/doc/${MY_PNVR}
+htmldir = /usr/share/doc/${MY_PNVR}/html
+EOF
+
+    if option doc; then
+        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
+        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+        echo "HADDOCK_DOCS=YES" >> mk/build.mk
+    else
+        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+        echo "HADDOCK_DOCS=NO" >> mk/build.mk
+    fi
+
+    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
+    export PATH="${WORKBASE}/usr/bin:${PATH}"
+
+    if option llvm; then
+        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
+    else
+        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
+    fi
+
+    GHC_SRC_CONFIGURE_OPTIONS+=(
+        --with-system-libffi
+        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
+    )
+
+    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
+    # cross-compilation.
+    econf \
+        AR=${AR} \
+        CC=${CC} \
+        --target=$(exhost --target) \
+        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
+
+    # don't strip anything. Very useful when stage2 SIGSEGVs on you
+    echo "STRIP_CMD = :" >> mk/build.mk
+}
+
+src_install() {
+    default
+
+    # libraries/ is a partial dupe of the html/ dir hierarchy, but
+    # containing only LICENSE files
+    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
+
+    dobashcompletion "${FILES}/ghc-bash-completion"
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
+
+    # some scripts are not versioned, move
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
+
+    # remove unversioned symlinks, we create alternatives later
+    local ghc_bin
+    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
+        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
+    done
+    unset ghc_bin
+
+    # create alternatives for scripts/binaries
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
+        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
+        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
+
+    # alternatives for manpages
+    if [[ -d ${IMAGE}/usr/share/man ]]; then
+        local file alternatives=()
+        for file in "${IMAGE}"/usr/share/man/*/*; do
+            alternatives+=(
+            ${file#${IMAGE}}
+            ${file#${IMAGE}}-${SLOT}
+            )
+        done
+
+        alternatives_for \
+            ghc ${SLOT} ${SLOT} \
+            "${alternatives[@]}"
+    fi
+}
+
+src_test_expensive() {
+    emake fulltest
+}
+

packages/dev-lang/ghc-bin/ghc-bin-8.4.4.exheres-0

@@ -20,6 +20,10 @@ DEPENDENCIES="
         dev-lang/perl:*[>=5.6.1]
         dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
         sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
+        !dev-lang/GHC [[
+            description = [ different provider ]
+            resolution = uninstall-blocked-after
+        ]]
         !dev-lang/ghc [[
             description = [ Both install the same binaries/libs and alternatives ]
             resolution = uninstall-blocked-before

packages/dev-lang/ghc-bin/ghc-bin-8.6.2-r1.exheres-0

@@ -0,0 +1,96 @@
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require bash-completion alternatives
+
+SUMMARY="The Glorious Glasgow Haskell Compilation System"
+DESCRIPTION="
+GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
+language Haskell."
+HOMEPAGE="https://www.haskell.org/ghc/"
+DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
+
+LICENCES="BSD-3"
+SLOT="${PV}"
+PLATFORMS="-* ~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    build+run:
+        dev-lang/perl:*[>=5.6.1]
+        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
+        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
+        !dev-lang/GHC [[
+            description = [ different provider ]
+            resolution = uninstall-blocked-after
+        ]]
+        !dev-lang/ghc [[
+            description = [ Both install the same binaries/libs and alternatives ]
+            resolution = uninstall-blocked-before
+        ]]
+    suggestion:
+        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
+        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
+"
+
+BUGS_TO="hasufell@posteo.de"
+REMOTE_IDS="freecode:${PN}"
+UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
+
+RESTRICT="test"
+
+WORK=${WORKBASE}/ghc-${PV}
+
+src_configure() {
+    econf \
+        --target=$(exhost --target)
+}
+
+src_compile() {
+    :
+}
+
+src_install() {
+    default
+
+    # bashcomp
+    dobashcompletion "${FILES}/ghc-bash-completion"
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
+
+    # some scripts are not versioned, move
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
+
+    # remove unversioned symlinks, we create alternatives later
+    local ghc_bin
+    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
+        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
+    done
+    unset ghc_bin
+
+    # create alternatives for scripts/binaries
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
+        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
+
+    # alternatives for manpages
+    local file alternatives=()
+    for file in "${IMAGE}"/usr/share/man/*/*; do
+        alternatives+=(
+            ${file#${IMAGE}}
+            ${file#${IMAGE}}-${SLOT}
+        )
+    done
+    alternatives_for \
+        ghc ${SLOT} ${SLOT} \
+        "${alternatives[@]}"
+}

packages/dev-lang/ghc-bin/ghc-bin-8.6.3.exheres-0

@@ -0,0 +1,96 @@
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require bash-completion alternatives
+
+SUMMARY="The Glorious Glasgow Haskell Compilation System"
+DESCRIPTION="
+GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
+language Haskell."
+HOMEPAGE="https://www.haskell.org/ghc/"
+DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
+
+LICENCES="BSD-3"
+SLOT="${PV}"
+PLATFORMS="-* ~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    build+run:
+        dev-lang/perl:*[>=5.6.1]
+        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
+        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
+        !dev-lang/GHC [[
+            description = [ different provider ]
+            resolution = uninstall-blocked-after
+        ]]
+        !dev-lang/ghc [[
+            description = [ Both install the same binaries/libs and alternatives ]
+            resolution = uninstall-blocked-before
+        ]]
+    suggestion:
+        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
+        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
+"
+
+BUGS_TO="hasufell@posteo.de"
+REMOTE_IDS="freecode:${PN}"
+UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
+
+RESTRICT="test"
+
+WORK=${WORKBASE}/ghc-${PV}
+
+src_configure() {
+    econf \
+        --target=$(exhost --target)
+}
+
+src_compile() {
+    :
+}
+
+src_install() {
+    default
+
+    # bashcomp
+    dobashcompletion "${FILES}/ghc-bash-completion"
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
+
+    # some scripts are not versioned, move
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
+
+    # remove unversioned symlinks, we create alternatives later
+    local ghc_bin
+    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
+        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
+    done
+    unset ghc_bin
+
+    # create alternatives for scripts/binaries
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
+        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
+
+    # alternatives for manpages
+    local file alternatives=()
+    for file in "${IMAGE}"/usr/share/man/*/*; do
+        alternatives+=(
+            ${file#${IMAGE}}
+            ${file#${IMAGE}}-${SLOT}
+        )
+    done
+    alternatives_for \
+        ghc ${SLOT} ${SLOT} \
+        "${alternatives[@]}"
+}

packages/dev-lang/ghc-bin/ghc-bin-8.6.4.exheres-0

@@ -0,0 +1,96 @@
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require bash-completion alternatives
+
+SUMMARY="The Glorious Glasgow Haskell Compilation System"
+DESCRIPTION="
+GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
+language Haskell."
+HOMEPAGE="https://www.haskell.org/ghc/"
+DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
+
+LICENCES="BSD-3"
+SLOT="${PV}"
+PLATFORMS="-* ~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    build+run:
+        dev-lang/perl:*[>=5.6.1]
+        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
+        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
+        !dev-lang/GHC [[
+            description = [ different provider ]
+            resolution = uninstall-blocked-after
+        ]]
+        !dev-lang/ghc [[
+            description = [ Both install the same binaries/libs and alternatives ]
+            resolution = uninstall-blocked-before
+        ]]
+    suggestion:
+        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
+        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
+"
+
+BUGS_TO="hasufell@posteo.de"
+REMOTE_IDS="freecode:${PN}"
+UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
+
+RESTRICT="test"
+
+WORK=${WORKBASE}/ghc-${PV}
+
+src_configure() {
+    econf \
+        --target=$(exhost --target)
+}
+
+src_compile() {
+    :
+}
+
+src_install() {
+    default
+
+    # bashcomp
+    dobashcompletion "${FILES}/ghc-bash-completion"
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
+
+    # some scripts are not versioned, move
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
+
+    # remove unversioned symlinks, we create alternatives later
+    local ghc_bin
+    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
+        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
+    done
+    unset ghc_bin
+
+    # create alternatives for scripts/binaries
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
+        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
+
+    # alternatives for manpages
+    local file alternatives=()
+    for file in "${IMAGE}"/usr/share/man/*/*; do
+        alternatives+=(
+            ${file#${IMAGE}}
+            ${file#${IMAGE}}-${SLOT}
+        )
+    done
+    alternatives_for \
+        ghc ${SLOT} ${SLOT} \
+        "${alternatives[@]}"
+}

packages/dev-lang/ghc-bin/ghc-bin-8.6.5.exheres-0

@@ -0,0 +1,96 @@
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require bash-completion alternatives
+
+SUMMARY="The Glorious Glasgow Haskell Compilation System"
+DESCRIPTION="
+GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
+language Haskell."
+HOMEPAGE="https://www.haskell.org/ghc/"
+DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
+
+LICENCES="BSD-3"
+SLOT="${PV}"
+PLATFORMS="-* ~amd64"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    build+run:
+        dev-lang/perl:*[>=5.6.1]
+        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
+        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
+        !dev-lang/GHC [[
+            description = [ different provider ]
+            resolution = uninstall-blocked-after
+        ]]
+        !dev-lang/ghc [[
+            description = [ Both install the same binaries/libs and alternatives ]
+            resolution = uninstall-blocked-before
+        ]]
+    suggestion:
+        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
+        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
+"
+
+BUGS_TO="hasufell@posteo.de"
+REMOTE_IDS="freecode:${PN}"
+UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
+
+RESTRICT="test"
+
+WORK=${WORKBASE}/ghc-${PV}
+
+src_configure() {
+    econf \
+        --target=$(exhost --target)
+}
+
+src_compile() {
+    :
+}
+
+src_install() {
+    default
+
+    # bashcomp
+    dobashcompletion "${FILES}/ghc-bash-completion"
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
+
+    # some scripts are not versioned, move
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
+    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
+
+    # remove unversioned symlinks, we create alternatives later
+    local ghc_bin
+    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
+        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
+    done
+    unset ghc_bin
+
+    # create alternatives for scripts/binaries
+    alternatives_for ghc ${SLOT} ${SLOT} \
+        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
+        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
+        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
+
+    # alternatives for manpages
+    local file alternatives=()
+    for file in "${IMAGE}"/usr/share/man/*/*; do
+        alternatives+=(
+            ${file#${IMAGE}}
+            ${file#${IMAGE}}-${SLOT}
+        )
+    done
+    alternatives_for \
+        ghc ${SLOT} ${SLOT} \
+        "${alternatives[@]}"
+}

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

@@ -23,7 +23,7 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     build+run:
-        dev-python/typed-ast[>=1.1.0&<1.2.0][python_abis:*(-)?]
+        dev-python/typed-ast[>=1.3.1&<1.4.0][python_abis:*(-)?]
         dev-python/mypy_extensions[>=0.4.0&<0.5.0][python_abis:*(-)?]
         python_abis:3.4? (
             dev-python/typing[>=3.5.3][python_abis:3.4]
@@ -41,7 +41,6 @@ DEPENDENCIES="
 
 BUGS_TO="hasufell@posteo.de"
 
-# Require upstream release with https://github.com/python/mypy/pull/5191 included
 # Require unpackaged: flake8-bugbear, flake8-pyi
 RESTRICT="test"
 

packages/dev-python/oauth2client/oauth2client-4.1.2.exheres-0

@@ -7,7 +7,7 @@ SUMMARY="OAuth 2.0 client library"
 
 LICENCES="Apache-2.0"
 SLOT="0"
-PLATFORMS="~amd64 ~armv7 ~x86"
+PLATFORMS="~amd64 ~armv7 ~armv8 ~x86"
 MYOPTIONS=""
 
 DEPENDENCIES="

packages/dev-python/python-eventlib/files/python-eventlib-0.2.2-libressl.patch

@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Sep  8 01:22:40 UTC 2015
-Subject: fix compatibility with libressl
-Upstream: not yet
-
---- a/eventlib/green/socket.py
-+++ b/eventlib/green/socket.py
-@@ -89,7 +89,6 @@
- else:
-     # some constants the SSL module exports but not in __all__
-     from eventlib.green.ssl import (RAND_add,
--                                    RAND_egd,
-                                     RAND_status,
-                                     SSL_ERROR_ZERO_RETURN,
-                                     SSL_ERROR_WANT_READ,

packages/dev-python/python-eventlib/python-eventlib-0.2.4-r1.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="3" ]
+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"
-DOWNLOADS="http://download.ag-projects.com/SipClient/${PNV}.tar.gz"
 
 LICENCES="MIT"
 SLOT="0"
@@ -16,8 +16,6 @@ MYOPTIONS=""
 DEPENDENCIES="
     run:
         dev-python/greenlet[python_abis:*(-)?]
-        net-twisted/TwistedCore[python_abis:*(-)?]
+        net-twisted/Twisted[python_abis:*(-)?]
 "
 
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-libressl.patch" )
-

packages/dev-python/python-msrplib/python-msrplib-0.19.2-r1.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="3" ]
+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"
-DOWNLOADS="http://download.ag-projects.com/MSRP/${PNV}.tar.gz"
 
 LICENCES="LGPL-2"
 SLOT="0"
@@ -17,7 +17,6 @@ DEPENDENCIES="
         dev-python/python-application[python_abis:*(-)?]
         dev-python/python-eventlib[python_abis:*(-)?]
         dev-python/python-gnutls[>=3.0.0][python_abis:*(-)?]
-        net-twisted/TwistedCore[python_abis:*(-)?]
-        net-twisted/TwistedNames[python_abis:*(-)?]
+        net-twisted/Twisted[python_abis:*(-)?]
 "
 

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

@@ -13,10 +13,10 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     build+run:
-        dev-python/cryptography[python_abis:*(-)?]
+        dev-python/cryptography[>=1.6][python_abis:*(-)?]
         dev-python/enum34[python_abis:*(-)?]
         dev-python/gmpy2[python_abis:*(-)?]
-        dev-python/python-application[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/python-sipsimple-3.1.1-pjmedia-ffmpeg-fix.patch

@@ -1,30 +0,0 @@
-Upstream: https://github.com/AGProjects/python-sipsimple/pull/3
-
-From f96d1e8637f817dc76188742d2e0e1b7b2776581 Mon Sep 17 00:00:00 2001
-From: Benjamin Lamowski <benjamin@lamowski.net>
-Date: Tue, 22 May 2018 10:11:06 -0400
-Subject: [PATCH] pjsip: fix compilation error with FFmpeg 2.8.14
-
----
- deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c b/deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
-index cf859408..097479f6 100644
---- a/deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
-+++ b/deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
-@@ -1684,12 +1684,12 @@ static pj_status_t ffmpeg_codec_decode_whole(pjmedia_vid_codec *codec,
-     avpacket.size = (int)input->size;
- 
-     /* ffmpeg warns:
--     * - input buffer padding, at least FF_INPUT_BUFFER_PADDING_SIZE
-+     * - input buffer padding, at least AV_INPUT_BUFFER_PADDING_SIZE
-      * - null terminated
-      * Normally, encoded buffer is allocated more than needed, so lets just
-      * bzero the input buffer end/pad, hope it will be just fine.
-      */
--    pj_bzero(avpacket.data+avpacket.size, FF_INPUT_BUFFER_PADDING_SIZE);
-+    pj_bzero(avpacket.data+avpacket.size, AV_INPUT_BUFFER_PADDING_SIZE);
- 
-     output->bit_info = 0;
-     output->timestamp = input->timestamp;

packages/dev-python/python-sipsimple/files/python-sipsimple-3.1.1-pjmedia-openh264-1.6.patch

@@ -1,173 +0,0 @@
-Upstream: https://trac.pjsip.org/repos/changeset/5405/pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp
-Reason: Support for OpenH264 v1.6.0 codec
-
-Index: deps/pjsip/pjmedia/src/pjmedia-codec/openh264.cpp
-===================================================================
---- deps/pjsip/pjmedia/src/pjmedia-codec/openh264.cpp	(revision 5045)
-+++ deps/pjsip/pjmedia/src/pjmedia-codec/openh264.cpp	(revision 5405)
-@@ -164,6 +164,6 @@
- struct SLayerPEncCtx
- {
--  pj_int32_t			iDLayerQp;
--  SSliceConfig			sSliceCfg;
-+    pj_int32_t			iDLayerQp;
-+    SSliceArgument		sSliceArgument;
- };
- 
-@@ -471,16 +471,17 @@
- 
-     /* Init encoder parameters */
--    pj_bzero(&eprm, sizeof(eprm));
--    eprm.iInputCsp			= videoFormatI420;
-+    oh264_data->enc->GetDefaultParams (&eprm);
-+    eprm.iComplexityMode    		= MEDIUM_COMPLEXITY;
-     eprm.sSpatialLayers[0].uiProfileIdc	= PRO_BASELINE;
-     eprm.iPicWidth			= param->enc_fmt.det.vid.size.w;
-+    eprm.iUsageType         		= CAMERA_VIDEO_REAL_TIME;
-     eprm.iPicHeight			= param->enc_fmt.det.vid.size.h;
-     eprm.fMaxFrameRate			= (param->enc_fmt.det.vid.fps.num *
- 					   1.0f /
- 					   param->enc_fmt.det.vid.fps.denum);
--    eprm.uiFrameToBeCoded		= (unsigned int) -1;
-     eprm.iTemporalLayerNum		= 1;
-     eprm.uiIntraPeriod			= 0; /* I-Frame interval in frames */
--    eprm.bEnableSpsPpsIdAddition	= (oh264_data->whole? false : true);
-+    eprm.eSpsPpsIdStrategy      	= (oh264_data->whole ? CONSTANT_ID :
-+    					   INCREASING_ID);
-     eprm.bEnableFrameCroppingFlag	= true;
-     eprm.iLoopFilterDisableIdc		= 0;
-@@ -505,16 +506,17 @@
-     pj_bzero(&elayer_ctx, sizeof (SLayerPEncCtx));
-     elayer_ctx.iDLayerQp		= 24;
--    elayer_ctx.sSliceCfg.uiSliceMode	= (oh264_data->whole ?
--					    SM_SINGLE_SLICE : SM_DYN_SLICE);
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceSizeConstraint = param->enc_mtu;
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceNum      = 1;
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum[0] = 960;
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum[1] = 0;
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum[2] = 0;
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum[3] = 0;
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum[4] = 0;
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum[5] = 0;
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum[6] = 0;
--    elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum[7] = 0;
-+    elayer_ctx.sSliceArgument.uiSliceMode = (oh264_data->whole ?
-+                                             SM_SINGLE_SLICE : 
-+                                             SM_SIZELIMITED_SLICE);
-+    elayer_ctx.sSliceArgument.uiSliceSizeConstraint = param->enc_mtu;
-+    elayer_ctx.sSliceArgument.uiSliceNum      = 1;
-+    elayer_ctx.sSliceArgument.uiSliceMbNum[0] = 960;
-+    elayer_ctx.sSliceArgument.uiSliceMbNum[1] = 0;
-+    elayer_ctx.sSliceArgument.uiSliceMbNum[2] = 0;
-+    elayer_ctx.sSliceArgument.uiSliceMbNum[3] = 0;
-+    elayer_ctx.sSliceArgument.uiSliceMbNum[4] = 0;
-+    elayer_ctx.sSliceArgument.uiSliceMbNum[5] = 0;
-+    elayer_ctx.sSliceArgument.uiSliceMbNum[6] = 0;
-+    elayer_ctx.sSliceArgument.uiSliceMbNum[7] = 0;
- 
-     elayer->iVideoWidth			= eprm.iPicWidth;
-@@ -524,12 +526,12 @@
-     elayer->iSpatialBitrate		= eprm.iTargetBitrate;
-     elayer->iDLayerQp			= elayer_ctx.iDLayerQp;
--    elayer->sSliceCfg.uiSliceMode	= elayer_ctx.sSliceCfg.uiSliceMode;
--
--    memcpy( &elayer->sSliceCfg,
--            &elayer_ctx.sSliceCfg,
--            sizeof (SSliceConfig));
--    memcpy( &elayer->sSliceCfg.sSliceArgument.uiSliceMbNum[0],
--            &elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum[0],
--            sizeof (elayer_ctx.sSliceCfg.sSliceArgument.uiSliceMbNum));
-+    elayer->sSliceArgument.uiSliceMode = elayer_ctx.sSliceArgument.uiSliceMode;
-+
-+    memcpy ( &elayer->sSliceArgument,
-+             &elayer_ctx.sSliceArgument,
-+             sizeof (SSliceArgument));
-+    memcpy ( &elayer->sSliceArgument.uiSliceMbNum[0],
-+             &elayer_ctx.sSliceArgument.uiSliceMbNum[0],
-+             sizeof (elayer_ctx.sSliceArgument.uiSliceMbNum));
- 
-     /* Init input picture */
-@@ -553,11 +555,18 @@
-     }
- 
-+    int videoFormat = videoFormatI420;
-+    rc = oh264_data->enc->SetOption (ENCODER_OPTION_DATAFORMAT, &videoFormat);
-+    if (rc != cmResultSuccess) {
-+        PJ_LOG(4,(THIS_FILE, "SVC encoder SetOption videoFormatI420 failed, "
-+        		     "rc=%d", rc));
-+        return PJMEDIA_CODEC_EFAILED;
-+    }
-+    
-     /*
-      * Decoder
-      */
-     sDecParam.sVideoProperty.size	= sizeof (sDecParam.sVideoProperty);
--    sDecParam.iOutputColorFormat	= videoFormatI420;
-     sDecParam.uiTargetDqLayer		= (pj_uint8_t) - 1;
--    sDecParam.uiEcActiveFlag		= 1;
-+    sDecParam.eEcActiveIdc          	= ERROR_CON_SLICE_COPY;
-     sDecParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
- 
-@@ -575,12 +584,4 @@
- 	PJ_LOG(4,(THIS_FILE, "Decoder initialization failed, rc=%d", rc));
- 	return PJMEDIA_CODEC_EFAILED;
--    }
--
--    pj_int32_t color_fmt = videoFormatI420;
--    rc = oh264_data->dec->SetOption (DECODER_OPTION_DATAFORMAT,  &color_fmt);
--    if (rc) {
--	PJ_LOG(4,(THIS_FILE,
--		 "Warning: SetOption(DECODER_OPTION_DATAFORMAT) failed, rc=%d",
--		 rc));
-     }
- 
-@@ -662,5 +663,5 @@
-     }
- 
--    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeSkip) {
-+    if (oh264_data->bsi.eFrameType == videoFrameTypeSkip) {
- 	output->size = 0;
- 	output->type = PJMEDIA_FRAME_TYPE_NONE;
-@@ -682,11 +683,11 @@
- 	/* Find which layer with biggest payload */
- 	oh264_data->ilayer = 0;
--	payload_size = oh264_data->bsi.sLayerInfo[0].iNalLengthInByte[0];
-+        payload_size = oh264_data->bsi.sLayerInfo[0].pNalLengthInByte[0];
- 	for (i=0; i < (unsigned)oh264_data->bsi.iLayerNum; ++i) {
- 	    unsigned j;
- 	    pLayerBsInfo = &oh264_data->bsi.sLayerInfo[i];
- 	    for (j=0; j < (unsigned)pLayerBsInfo->iNalCount; ++j) {
--		if (pLayerBsInfo->iNalLengthInByte[j] > (int)payload_size) {
--		    payload_size = pLayerBsInfo->iNalLengthInByte[j];
-+		if (pLayerBsInfo->pNalLengthInByte[j] > (int)payload_size) {
-+                    payload_size = pLayerBsInfo->pNalLengthInByte[j];
- 		    oh264_data->ilayer = i;
- 		}
-@@ -704,5 +705,5 @@
- 	payload_size = 0;
- 	for (int inal = pLayerBsInfo->iNalCount - 1; inal >= 0; --inal) {
--	    payload_size += pLayerBsInfo->iNalLengthInByte[inal];
-+	    payload_size += pLayerBsInfo->pNalLengthInByte[inal];
- 	}
- 
-@@ -761,5 +762,5 @@
-         output->size = payload_len;
- 
--        if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) {
-+        if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) {
- 	    output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
-         }
-@@ -783,5 +784,5 @@
-     oh264_data->enc_frame_size = 0;
-     for (int inal = pLayerBsInfo->iNalCount - 1; inal >= 0; --inal) {
--	oh264_data->enc_frame_size += pLayerBsInfo->iNalLengthInByte[inal];
-+	oh264_data->enc_frame_size += pLayerBsInfo->pNalLengthInByte[inal];
-     }
- 
-@@ -810,5 +811,5 @@
-     output->size = payload_len;
- 
--    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) {
-+    if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) {
- 	output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
-     }

packages/dev-python/python-sipsimple/files/python-sipsimple-support-openssl-1.1_01.patch

@@ -1,234 +0,0 @@
-Upstream: Yes (pjsip)
-Source: Backported from https://trac.pjsip.org/repos/browser/pjproject/trunk
-
----
- deps/pjsip/aconfigure                   | 22 ++++++------
- deps/pjsip/aconfigure.ac                |  4 +--
- deps/pjsip/pjlib/src/pj/ssl_sock_ossl.c | 47 +++++++++++++++++++++----
- 3 files changed, 53 insertions(+), 20 deletions(-)
-
-diff --git a/deps/pjsip/aconfigure b/deps/pjsip/aconfigure
-index 530dbc3d..c413760b 100644
---- a/deps/pjsip/aconfigure
-+++ b/deps/pjsip/aconfigure
-@@ -6352,7 +6352,7 @@ if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
- fi
- 
- 
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&5
- $as_echo_n "checking for ERR_load_BIO_strings in -lcrypto... " >&6; }
- if ${ac_cv_lib_crypto_ERR_load_BIO_strings+:} false; then :
-   $as_echo_n "(cached) " >&6
-@@ -6392,9 +6392,9 @@ if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes; then :
-   libcrypto_present=1 && LIBS="-lcrypto $LIBS"
- fi
- 
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
--$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
--if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5
-+$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
-+if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -6408,27 +6408,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- #ifdef __cplusplus
- extern "C"
- #endif
--char SSL_library_init ();
-+char SSL_CTX_new ();
- int
- main ()
- {
--return SSL_library_init ();
-+return SSL_CTX_new ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_ssl_SSL_library_init=yes
-+  ac_cv_lib_ssl_SSL_CTX_new=yes
- else
--  ac_cv_lib_ssl_SSL_library_init=no
-+  ac_cv_lib_ssl_SSL_CTX_new=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
--$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
--if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
-+$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
-+if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then :
-   libssl_present=1 && LIBS="-lssl $LIBS"
- fi
- 
-diff --git a/deps/pjsip/aconfigure.ac b/deps/pjsip/aconfigure.ac
-index 89ff674e..54c65ad3 100644
---- a/deps/pjsip/aconfigure.ac
-+++ b/deps/pjsip/aconfigure.ac
-@@ -935,8 +935,8 @@ AC_ARG_ENABLE(ssl,
- 		AC_SUBST(libssl_present)
- 		AC_SUBST(libcrypto_present)
- 		AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1])
--		AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"])
--		AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && LIBS="-lssl $LIBS"])
-+    AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"])
-+    AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && LIBS="-lssl $LIBS"])
- 		if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
- 	        	AC_MSG_RESULT([OpenSSL library found, SSL support enabled])
- 			# PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
-diff --git a/deps/pjsip/pjlib/src/pj/ssl_sock_ossl.c b/deps/pjsip/pjlib/src/pj/ssl_sock_ossl.c
-index 926512ba..705ed63d 100644
---- a/deps/pjsip/pjlib/src/pj/ssl_sock_ossl.c
-+++ b/deps/pjsip/pjlib/src/pj/ssl_sock_ossl.c
-@@ -43,15 +43,31 @@
- /* 
-  * Include OpenSSL headers 
-  */
-+#include <openssl/asn1.h>
- #include <openssl/bio.h>
- #include <openssl/ssl.h>
- #include <openssl/err.h>
- #include <openssl/x509v3.h>
- 
- 
-+#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#  define OPENSSL_NO_SSL2	    /* seems to be removed in 1.1.0 */
-+#  define M_ASN1_STRING_data(x)	    ASN1_STRING_get0_data(x)
-+#  define M_ASN1_STRING_length(x)   ASN1_STRING_length(x)
-+#  if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10100000L
-+#     define X509_get_notBefore(x)  X509_get0_notBefore(x)
-+#     define X509_get_notAfter(x)   X509_get0_notAfter(x)
-+#  endif
-+#else
-+#  define SSL_CIPHER_get_id(c)	    (c)->id
-+#  define SSL_set_session(ssl, s)   (ssl)->session = (s)
-+#endif
-+
-+
- #ifdef _MSC_VER
- #  pragma comment( lib, "libeay32")
- #  pragma comment( lib, "ssleay32")
-+#  pragma comment( lib, "crypt32")
- #endif
- 
- 
-@@ -319,8 +335,12 @@ static pj_status_t init_openssl(void)
-     pj_assert(status == PJ_SUCCESS);
- 
-     /* Init OpenSSL lib */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     SSL_library_init();
-     SSL_load_error_strings();
-+#else
-+    OPENSSL_init_ssl(0, NULL);
-+#endif
- #if OPENSSL_VERSION_NUMBER < 0x009080ffL
-     /* This is now synonym of SSL_library_init() */
-     OpenSSL_add_all_algorithms();
-@@ -334,6 +354,7 @@ static pj_status_t init_openssl(void)
- 	STACK_OF(SSL_CIPHER) *sk_cipher;
- 	unsigned i, n;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	meth = (SSL_METHOD*)SSLv23_server_method();
- 	if (!meth)
- 	    meth = (SSL_METHOD*)TLSv1_server_method();
-@@ -345,6 +366,12 @@ static pj_status_t init_openssl(void)
- 	if (!meth)
- 	    meth = (SSL_METHOD*)SSLv2_server_method();
- #endif
-+
-+#else
-+	/* Specific version methods are deprecated in 1.1.0 */
-+	meth = (SSL_METHOD*)TLS_method();
-+#endif
-+
- 	pj_assert(meth);
- 
- 	ctx=SSL_CTX_new(meth);
-@@ -361,7 +388,7 @@ static pj_status_t init_openssl(void)
- 	    const SSL_CIPHER *c;
- 	    c = sk_SSL_CIPHER_value(sk_cipher,i);
- 	    openssl_ciphers[i].id = (pj_ssl_cipher)
--				    (pj_uint32_t)c->id & 0x00FFFFFF;
-+				    (pj_uint32_t)SSL_CIPHER_get_id(c) & 0x00FFFFFF;
- 	    openssl_ciphers[i].name = SSL_CIPHER_get_name(c);
- 	}
- 
-@@ -526,6 +553,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
- 	ssock->param.proto = PJ_SSL_SOCK_PROTO_SSL23;
- 
-     /* Determine SSL method to use */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     switch (ssock->param.proto) {
-     case PJ_SSL_SOCK_PROTO_TLS1:
- 	ssl_method = (SSL_METHOD*)TLSv1_method();
-@@ -541,6 +569,10 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
- #endif
- 	break;
-     }
-+#else
-+    /* Specific version methods are deprecated in 1.1.0 */
-+    ssl_method = (SSL_METHOD*)TLS_method();
-+#endif
- 
-     if (!ssl_method) {
- 	ssl_method = (SSL_METHOD*)SSLv23_method();
-@@ -869,7 +901,8 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssock)
- 	    const SSL_CIPHER *c;
- 	    c = sk_SSL_CIPHER_value(sk_cipher, j);
- 	    if (ssock->param.ciphers[i] == (pj_ssl_cipher)
--					   ((pj_uint32_t)c->id & 0x00FFFFFF))
-+					   ((pj_uint32_t)SSL_CIPHER_get_id(c) &
-+					   0x00FFFFFF))
- 	    {
- 		const char *c_name;
- 
-@@ -994,7 +1027,7 @@ static void get_cert_info(pj_pool_t *pool, pj_ssl_cert_info *ci, X509 *x,
-     pj_bool_t update_needed;
-     char buf[512];
-     pj_uint8_t serial_no[64] = {0}; /* should be >= sizeof(ci->serial_no) */
--    pj_uint8_t *q;
-+    const pj_uint8_t *q;
-     unsigned len;
-     GENERAL_NAMES *names = NULL;
- 
-@@ -1004,7 +1037,7 @@ static void get_cert_info(pj_pool_t *pool, pj_ssl_cert_info *ci, X509 *x,
-     X509_NAME_oneline(X509_get_issuer_name(x), buf, sizeof(buf));
- 
-     /* Get serial no */
--    q = (pj_uint8_t*) M_ASN1_STRING_data(X509_get_serialNumber(x));
-+    q = (const pj_uint8_t*) M_ASN1_STRING_data(X509_get_serialNumber(x));
-     len = M_ASN1_STRING_length(X509_get_serialNumber(x));
-     if (len > sizeof(ci->serial_no)) 
- 	len = sizeof(ci->serial_no);
-@@ -1075,8 +1108,8 @@ static void get_cert_info(pj_pool_t *pool, pj_ssl_cert_info *ci, X509 *x,
- 		    type = PJ_SSL_CERT_NAME_URI;
-                     break;
-                 case GEN_IPADD:
--		    p = ASN1_STRING_data(name->d.ip);
--		    len = ASN1_STRING_length(name->d.ip);
-+		    p = (unsigned char*)M_ASN1_STRING_data(name->d.ip);
-+		    len = M_ASN1_STRING_length(name->d.ip);
- 		    type = PJ_SSL_CERT_NAME_IP;
-                     break;
- 		default:
-@@ -2300,7 +2333,7 @@ PJ_DEF(pj_status_t) pj_ssl_sock_get_info (pj_ssl_sock_t *ssock,
- 
- 	/* Current cipher */
- 	cipher = SSL_get_current_cipher(ssock->ossl_ssl);
--	info->cipher = (cipher->id & 0x00FFFFFF);
-+	info->cipher = (SSL_CIPHER_get_id(cipher) & 0x00FFFFFF);
- 
- 	/* Remote address */
- 	pj_sockaddr_cp(&info->remote_addr, &ssock->rem_addr);
--- 
-2.19.2
-

packages/dev-python/python-sipsimple/files/python-sipsimple-support-openssl-1.1_02.patch

@@ -1,273 +0,0 @@
-Upstream: Patch Submitted
-
-
-commit 7ec01af311d21e339208c68d03c1430c8b210073
-Author: Tom Briden <tom@decompile.me.uk>
-Date:   Wed Nov 28 17:51:41 2018 +0000
-
-    zsrtp: Add support for openssl-1.1
-
-diff --git a/deps/pjsip/third_party/zsrtp/include/openssl_compat.h b/deps/pjsip/third_party/zsrtp/include/openssl_compat.h
-new file mode 100644
-index 00000000..cf2e8179
---- /dev/null
-+++ b/deps/pjsip/third_party/zsrtp/include/openssl_compat.h
-@@ -0,0 +1,22 @@
-+#ifndef _OPENSSL_COMPAT
-+#define _OPENSSL_COMPAT
-+
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
-+static HMAC_CTX *HMAC_CTX_new(void)
-+{
-+   HMAC_CTX *ctx = (HMAC_CTX*)OPENSSL_malloc(sizeof(*ctx));
-+   if (ctx != NULL)
-+       HMAC_CTX_init(ctx);
-+   return ctx;
-+}
-+
-+static void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+   if (ctx != NULL) {
-+       HMAC_CTX_cleanup(ctx);
-+       OPENSSL_free(ctx);
-+   }
-+}
-+#endif
-+
-+#endif
-diff --git a/deps/pjsip/third_party/zsrtp/zrtp/srtp/crypto/openssl/hmac.cpp b/deps/pjsip/third_party/zsrtp/zrtp/srtp/crypto/openssl/hmac.cpp
-index 6cdb6b14..605285dd 100644
---- a/deps/pjsip/third_party/zsrtp/zrtp/srtp/crypto/openssl/hmac.cpp
-+++ b/deps/pjsip/third_party/zsrtp/zrtp/srtp/crypto/openssl/hmac.cpp
-@@ -37,6 +37,8 @@
- #include <openssl/hmac.h>
- #include <crypto/hmac.h>
- 
-+#include <openssl_compat.h>
-+
- #if defined(__APPLE__)
- #  pragma GCC diagnostic push
- #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-@@ -55,23 +57,21 @@ void hmac_sha1( uint8_t* key, int32_t key_length,
-                 const uint8_t* data_chunks[],
-                 uint32_t data_chunck_length[],
-                 uint8_t* mac, int32_t* mac_length ) {
--    HMAC_CTX ctx;
--    HMAC_CTX_init(&ctx);
--    HMAC_Init_ex(&ctx, key, key_length, EVP_sha1(), NULL);
-+    HMAC_CTX* ctx = HMAC_CTX_new();
-+    HMAC_Init_ex(ctx, key, key_length, EVP_sha1(), NULL);
-     while (*data_chunks) {
--        HMAC_Update(&ctx, *data_chunks, *data_chunck_length);
-+        HMAC_Update(ctx, *data_chunks, *data_chunck_length);
-         data_chunks ++;
-         data_chunck_length ++;
-     }
--    HMAC_Final(&ctx, mac, reinterpret_cast<uint32_t*>(mac_length));
--    HMAC_CTX_cleanup(&ctx);
-+    HMAC_Final(ctx, mac, reinterpret_cast<uint32_t*>(mac_length));
-+    HMAC_CTX_free(ctx);
- }
- 
- void* createSha1HmacContext(uint8_t* key, int32_t key_length)
- {
--    HMAC_CTX* ctx = (HMAC_CTX*)malloc(sizeof(HMAC_CTX));
-+    HMAC_CTX* ctx = HMAC_CTX_new();
- 
--    HMAC_CTX_init(ctx);
-     HMAC_Init_ex(ctx, key, key_length, EVP_sha1(), NULL);
-     return ctx;
- }
-@@ -80,7 +80,11 @@ void* initializeSha1HmacContext(void* ctx, uint8_t* key, int32_t keyLength)
- {
-     HMAC_CTX *pctx = (HMAC_CTX*)ctx;
- 
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
-     HMAC_CTX_init(pctx);
-+#else
-+    HMAC_CTX_reset(pctx);
-+#endif
-     HMAC_Init_ex(pctx, key, keyLength, EVP_sha1(), NULL);
-     return pctx;
- }
-@@ -112,8 +116,7 @@ void hmacSha1Ctx(void* ctx, const uint8_t* data[], uint32_t data_length[],
- void freeSha1HmacContext(void* ctx)
- {
-     if (ctx) {
--        HMAC_CTX_cleanup((HMAC_CTX*)ctx);
--        free(ctx);
-+        HMAC_CTX_free((HMAC_CTX*)ctx);
-     }
- }
- 
-diff --git a/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/hmac256.cpp b/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/hmac256.cpp
-index 0953ad5c..2dd6f807 100644
---- a/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/hmac256.cpp
-+++ b/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/hmac256.cpp
-@@ -38,6 +38,8 @@
- #include <openssl/hmac.h>
- #include <crypto/hmac256.h>
- 
-+#include "openssl_compat.h"
-+
- #if defined(__APPLE__)
- #  pragma GCC diagnostic push
- #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-@@ -58,17 +60,16 @@ void hmac_sha256(uint8_t* key, uint32_t key_length,
-                  uint8_t* mac, uint32_t* mac_length )
- {
-     unsigned int tmp;
--    HMAC_CTX ctx;
--    HMAC_CTX_init( &ctx );
--    HMAC_Init_ex( &ctx, key, key_length, EVP_sha256(), NULL );
-+    HMAC_CTX* ctx = HMAC_CTX_new();
-+    HMAC_Init_ex( ctx, key, key_length, EVP_sha256(), NULL );
-     while( *data_chunks ){
--      HMAC_Update( &ctx, *data_chunks, *data_chunck_length );
-+      HMAC_Update( ctx, *data_chunks, *data_chunck_length );
-       data_chunks ++;
-       data_chunck_length ++;
-     }
--    HMAC_Final( &ctx, mac, &tmp);
-+    HMAC_Final( ctx, mac, &tmp);
-     *mac_length = tmp;
--    HMAC_CTX_cleanup( &ctx );
-+    HMAC_CTX_free( ctx );
- }
- 
- #if defined(__APPLE__)
-diff --git a/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/hmac384.cpp b/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/hmac384.cpp
-index f1dd5abc..28191f4c 100644
---- a/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/hmac384.cpp
-+++ b/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/hmac384.cpp
-@@ -38,6 +38,8 @@
- #include <openssl/hmac.h>
- #include <zrtp/crypto/hmac256.h>
- 
-+#include "openssl_compat.h"
-+
- #if defined(__APPLE__)
- #  pragma GCC diagnostic push
- #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-@@ -56,17 +58,16 @@ void hmac_sha384(uint8_t* key, uint32_t key_length,
-                  uint8_t* mac, uint32_t* mac_length )
- {
-     unsigned int tmp;
--    HMAC_CTX ctx;
--    HMAC_CTX_init( &ctx );
--    HMAC_Init_ex( &ctx, key, key_length, EVP_sha384(), NULL );
-+    HMAC_CTX* ctx = HMAC_CTX_new();
-+    HMAC_Init_ex( ctx, key, key_length, EVP_sha384(), NULL );
-     while( *data_chunks ){
--      HMAC_Update( &ctx, *data_chunks, *data_chunck_length );
-+      HMAC_Update( ctx, *data_chunks, *data_chunck_length );
-       data_chunks ++;
-       data_chunck_length ++;
-     }
--    HMAC_Final( &ctx, mac, &tmp);
-+    HMAC_Final( ctx, mac, &tmp);
-     *mac_length = tmp;
--    HMAC_CTX_cleanup( &ctx );
-+    HMAC_CTX_free( ctx );
- }
- 
- #if defined(__APPLE__)
-diff --git a/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/zrtpDH.cpp b/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/zrtpDH.cpp
-index 2623d2a3..76089951 100644
---- a/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/zrtpDH.cpp
-+++ b/deps/pjsip/third_party/zsrtp/zrtp/zrtp/crypto/openssl/zrtpDH.cpp
-@@ -223,24 +223,35 @@ ZrtpDH::ZrtpDH(const char* type) {
-     }
- 
-     DH* tmpCtx = NULL;
-+    BIGNUM *p = NULL;
-+    BIGNUM* priv_key = NULL;
-+    BIGNUM *g = BN_new();
-     switch (pkType) {
-     case DH2K:
-     case DH3K:
-         ctx = static_cast<void*>(DH_new());
-         tmpCtx = static_cast<DH*>(ctx);
--        tmpCtx->g = BN_new();
--        BN_set_word(tmpCtx->g, DH_GENERATOR_2);
-+        BN_set_word(g, DH_GENERATOR_2);
- 
-         if (pkType == DH2K) {
--            tmpCtx->p = BN_dup(bnP2048);
-+            p = BN_dup(bnP2048);
-             RAND_bytes(random, 32);
--            tmpCtx->priv_key = BN_bin2bn(random, 32, NULL);
-+            priv_key = BN_bin2bn(random, 32, NULL);
-         }
-         else if (pkType == DH3K) {
--            tmpCtx->p = BN_dup(bnP3072);
-+            p = BN_dup(bnP3072);
-             RAND_bytes(random, 64);
--            tmpCtx->priv_key = BN_bin2bn(random, 32, NULL);
-+            priv_key = BN_bin2bn(random, 32, NULL);
-         }
-+
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
-+        tmpCtx->g = g;
-+        tmpCtx->p = p;
-+        tmpCtx->priv_key = priv_key;
-+#else
-+        DH_set0_pqg(tmpCtx, p, NULL, g);
-+        DH_set0_key(tmpCtx, NULL, priv_key);
-+#endif
-         break;
- 
-     case EC25:
-@@ -274,11 +285,16 @@ int32_t ZrtpDH::computeSecretKey(uint8_t *pubKeyBytes, uint8_t *secret) {
-     if (pkType == DH2K || pkType == DH3K) {
-         DH* tmpCtx = static_cast<DH*>(ctx);
- 
-+        BIGNUM* pub_key = BN_bin2bn(pubKeyBytes, getDhSize(), NULL);
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
-         if (tmpCtx->pub_key != NULL) {
--            BN_free(tmpCtx->pub_key);
-+          BN_free(tmpCtx->pub_key);
-         }
--        tmpCtx->pub_key = BN_bin2bn(pubKeyBytes, getDhSize(), NULL);
--        return DH_compute_key(secret, tmpCtx->pub_key, tmpCtx);
-+        tmpCtx->pub_key = pub_key;
-+#else
-+        DH_set0_key(tmpCtx, pub_key, NULL);
-+#endif
-+        return DH_compute_key(secret, pub_key, tmpCtx);
-     }
-     if (pkType == EC25 || pkType == EC38) {
-         uint8_t buffer[100];
-@@ -323,8 +339,15 @@ int32_t ZrtpDH::getDhSize() const
- 
- int32_t ZrtpDH::getPubKeySize() const
- {
--    if (pkType == DH2K || pkType == DH3K)
--        return BN_num_bytes(static_cast<DH*>(ctx)->pub_key);
-+    if (pkType == DH2K || pkType == DH3K){
-+        const BIGNUM* pub_key;
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
-+        pub_key = static_cast<DH*>(ctx)->pub_key;
-+#else
-+        DH_get0_key(static_cast<DH*>(ctx), &pub_key, NULL);
-+#endif
-+        return BN_num_bytes(pub_key);
-+    }
- 
-     if (pkType == EC25 || pkType == EC38)
-         return EC_POINT_point2oct(EC_KEY_get0_group(static_cast<EC_KEY*>(ctx)),
-@@ -343,7 +366,13 @@ int32_t ZrtpDH::getPubKeyBytes(uint8_t *buf) const
-         if (prepend > 0) {
-             memset(buf, 0, prepend);
-         }
--        return BN_bn2bin(static_cast<DH*>(ctx)->pub_key, buf + prepend);
-+        const BIGNUM* pub_key;
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
-+        pub_key = static_cast<DH*>(ctx)->pub_key;
-+#else
-+        DH_get0_key(static_cast<DH*>(ctx), &pub_key, NULL);
-+#endif
-+        return BN_bn2bin(pub_key, buf + prepend);
-     }
-     if (pkType == EC25 || pkType == EC38) {
-         uint8_t buffer[100];

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

@@ -21,7 +21,8 @@ DEPENDENCIES="
         virtual/pkg-config
     build+run:
         dev-db/sqlite:3
-        dev-python/python-application[>=2.0.0][python_abis:*(-)?]
+        dev-libs/icu:=
+        dev-python/python-application[>=2.5.0][python_abis:*(-)?]
         media-libs/libvpx
         media-libs/v4l-utils
         sys-apps/util-linux
@@ -43,15 +44,11 @@ DEPENDENCIES="
         dev-python/python-xcaplib[python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         media-libs/x264[-10bit]
-        net-twisted/TwistedCore[python_abis:*(-)?]
+        net-twisted/Twisted[python_abis:*(-)?]
 "
 
 DEFAULT_SRC_PREPARE_PATCHES=(
     "${FILES}"/${PNV}-fix-build.patch
-    "${FILES}"/${PNV}-pjmedia-ffmpeg-fix.patch
-    "${FILES}"/${PN}-support-openssl-1.1_01.patch
-    "${FILES}"/${PN}-support-openssl-1.1_02.patch
-    -p0 "${FILES}"/${PNV}-pjmedia-openh264-1.6.patch
 )
 
 src_compile() {

packages/dev-python/rsa/rsa-3.4.2.exheres-0

@@ -7,7 +7,7 @@ SUMMARY="Pure-Python RSA implementation"
 
 LICENCES="Apache-2.0"
 SLOT="0"
-PLATFORMS="~amd64 ~armv7 ~x86"
+PLATFORMS="~amd64 ~armv7 ~armv8 ~x86"
 MYOPTIONS=""
 
 

packages/dev-python/typed-ast/typed-ast-1.0.4.exheres-0

@@ -1,19 +1,7 @@
 # Copyright 2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user="python" project="typed_ast" ]
-require pypi
-require setup-py [ import=setuptools blacklist=2 ]
+require typed-ast
 
-SUMMARY="A fork of Python 2 and 3 ast modules with type comment support"
-DESCRIPTION="
-typed_ast is a Python 3 package that provides a Python 2.7 and Python 3 parser similar to the standard ast library. Unlike ast, the parsers in typed_ast include PEP 484 type comments and are independent of the version of Python under which they are run. The typed_ast parsers produce the standard Python AST (plus type comments), and are both fast and correct, as they are based on the CPython 2.7 and 3.6 parser
-"
-
-LICENCES="Apache-2.0"
-SLOT="0"
 PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-BUGS_TO="hasufell@posteo.de"
 

packages/dev-python/typed-ast/typed-ast-1.1.0.exheres-0

@@ -1,19 +1,7 @@
 # Copyright 2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user="python" project="typed_ast" ]
-require pypi
-require setup-py [ import=setuptools blacklist=2 ]
+require typed-ast
 
-SUMMARY="A fork of Python 2 and 3 ast modules with type comment support"
-DESCRIPTION="
-typed_ast is a Python 3 package that provides a Python 2.7 and Python 3 parser similar to the standard ast library. Unlike ast, the parsers in typed_ast include PEP 484 type comments and are independent of the version of Python under which they are run. The typed_ast parsers produce the standard Python AST (plus type comments), and are both fast and correct, as they are based on the CPython 2.7 and 3.6 parser
-"
-
-LICENCES="Apache-2.0"
-SLOT="0"
 PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-BUGS_TO="hasufell@posteo.de"
 

packages/dev-python/typed-ast/typed-ast-1.3.1.exheres-0

@@ -0,0 +1,7 @@
+# Copyright 2017 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require typed-ast
+
+PLATFORMS="~amd64 ~x86"
+

packages/dev-python/typed-ast/typed-ast.exlib

@@ -0,0 +1,18 @@
+# Copyright 2017 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user="python" project="typed_ast" ]
+require pypi
+require setup-py [ import=setuptools blacklist=2 ]
+
+SUMMARY="A fork of Python 2 and 3 ast modules with type comment support"
+DESCRIPTION="
+typed_ast is a Python 3 package that provides a Python 2.7 and Python 3 parser similar to the standard ast library. Unlike ast, the parsers in typed_ast include PEP 484 type comments and are independent of the version of Python under which they are run. The typed_ast parsers produce the standard Python AST (plus type comments), and are both fast and correct, as they are based on the CPython 2.7 and 3.6 parser
+"
+
+LICENCES="Apache-2.0"
+SLOT="0"
+MYOPTIONS=""
+
+BUGS_TO="hasufell@posteo.de"
+

packages/games-rpg/flare/flare-1.0.exheres-0

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require github [ user=clintbellanger project=flare-game tag=v${PV} pn=flare-game ]
-require cmake desktop-utils gtk-icon-cache
+require cmake [ api=2 ] desktop-utils gtk-icon-cache
 
 SUMMARY="Free/Libre Action Roleplaying game"
 
@@ -15,7 +15,7 @@ DEPENDENCIES="
         games-engines/flare[~${PV}]
 "
 
-WORK=${WORKBASE}/${PN}-game-${PV}
+CMAKE_SOURCE=${WORKBASE}/${PN}-game-${PV}
 
 CMAKE_SRC_CONFIGURE_PARAMS=(
     -DBINDIR="/usr/$(exhost --target)/bin"
@@ -31,7 +31,5 @@ exec flare --game=flare-game "\$@"
 EOF
 
     install_desktop_entry "Name=Flare (game)" "Exec=flare-game"
-
-    dodoc README
 }
 

packages/games-rpg/flare/flare-scm.exheres-0

@@ -3,7 +3,7 @@
 
 SCM_CHECKOUT_TO=flare-game
 require github [ user=clintbellanger project=flare-game pn=flare-game ]
-require cmake desktop-utils gtk-icon-cache
+require cmake [ api=2 ] desktop-utils gtk-icon-cache
 
 SUMMARY="Free/Libre Action Roleplaying game"
 
@@ -30,7 +30,5 @@ exec flare --game=flare-game "\$@"
 EOF
 
     install_desktop_entry "Name=Flare (game)" "Exec=flare-game"
-
-    dodoc README
 }
 

packages/games-strategy/freeorion/files/freeorion-Remove-all-references-to-signals-library-from-CMakeL.patch

@@ -0,0 +1,66 @@
+Upstream: yes, cherrry-picked from master
+Reason: Fix build with boost[>=1.69.0] which removed the signals lib
+
+From 72a634ef6262dc1401298adb28000d1c89442482 Mon Sep 17 00:00:00 2001
+From: geoffthemedio <geoffthemedio@gmail.com>
+Date: Fri, 26 Oct 2018 09:06:46 +0200
+Subject: [PATCH] Remove all references to signals library from CMakeLists.txt
+
+---
+ CMakeLists.txt    | 5 -----
+ GG/CMakeLists.txt | 2 +-
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 927c8c165..8d3832049 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -205,7 +205,6 @@ find_package(Boost ${MINIMUM_BOOST_VERSION}
+         log_setup
+         regex
+         serialization
+-        signals
+         system
+         thread
+     REQUIRED)
+@@ -357,7 +356,6 @@ target_link_libraries(freeorioncommon
+     ${Boost_LOG_SETUP_LIBRARY}
+     ${Boost_REGEX_LIBRARY}
+     ${Boost_SERIALIZATION_LIBRARY}
+-    ${Boost_SIGNALS_LIBRARY}
+     ${Boost_SYSTEM_LIBRARY}
+     ${Boost_THREAD_LIBRARY}
+     ${ZLIB_LIBRARIES}
+@@ -668,8 +666,6 @@ if(APPLE)
+            ${CMAKE_COMMAND} -E copy_if_different "${Boost_PYTHON_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
+         COMMAND
+            ${CMAKE_COMMAND} -E copy_if_different "${Boost_SERIALIZATION_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
+-        COMMAND
+-           ${CMAKE_COMMAND} -E copy_if_different "${Boost_SIGNALS_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
+         COMMAND
+            ${CMAKE_COMMAND} -E copy_if_different "${Boost_SYSTEM_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
+         COMMAND
+@@ -769,7 +765,6 @@ if(WIN32)
+         boost_python-vc90-mt-1_44.dll
+         boost_regex-vc90-mt-1_44.dll
+         boost_serialization-vc90-mt-1_44.dll
+-        boost_signals-vc90-mt-1_44.dll
+         boost_system-vc90-mt-1_44.dll
+         boost_thread-vc90-mt-1_44.dll
+         glew32.dll
+diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt
+index 1e5f29d93..238cc44d0 100644
+--- a/GG/CMakeLists.txt
++++ b/GG/CMakeLists.txt
+@@ -91,7 +91,7 @@ if(NOT USE_STATIC_LIBS)
+ endif()
+ 
+ set(Boost_USE_STATIC_LIBS ${USE_STATIC_LIBS})
+-find_package(Boost ${MINIMUM_BOOST_VERSION} COMPONENTS date_time filesystem regex signals system thread log REQUIRED)
++find_package(Boost ${MINIMUM_BOOST_VERSION} COMPONENTS date_time filesystem regex system thread log REQUIRED)
+ 
+ find_package(OpenGL REQUIRED)
+ find_package(GLEW REQUIRED)
+-- 
+2.20.1
+

packages/games-strategy/freeorion/freeorion-0.4.8.exheres-0

@@ -46,6 +46,10 @@ DEPENDENCIES="
 
 BUGS_TO="hasufell@posteo.de"
 
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/${PN}-Remove-all-references-to-signals-library-from-CMakeL.patch
+)
+
 CMAKE_SRC_CONFIGURE_PARAMS=(
     -DRELEASE_COMPILE_FLAGS=""
     -DCMAKE_SKIP_RPATH=ON

packages/media-sound/pnmixer/pnmixer.exlib

@@ -8,7 +8,7 @@ PNMIXER_RELEASE=$(exparam release)
 PNMIXER_PV=$(exparam pv)
 
 require github [ user='nicklan' release="${PNMIXER_RELEASE}" pv="${PNMIXER_PV}" suffix="tar.gz" ]
-require cmake
+require cmake [ api=2 ]
 require gtk-icon-cache
 
 SUMMARY="Simple ALSA mixer application designed to run in system tray"

packages/net-im/dianara/dianara-1.4.1-r2.exheres-0

@@ -17,8 +17,7 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     build+run:
-        app-crypt/qca:2[qt5]
-        dev-libs/qjson
+        app-crypt/qca:2[qt5(+)]
         sys-apps/file
         sys-auth/qoauth[>=2.0.0]
         x11-libs/qtbase:5

packages/net-misc/seafile-client/seafile-client-6.2.10.exheres-0

@@ -30,6 +30,7 @@ DEPENDENCIES="
         dev-libs/libevent:=
         net-libs/libsearpc
         net-misc/seafile[~${PV}]
+        sys-libs/zlib
         x11-libs/qtbase:5
         providers:libressl? ( dev-libs/libressl:= )
         providers:openssl?  ( dev-libs/openssl )

packages/net-misc/seafile/seafile-6.2.10.exheres-0

@@ -23,7 +23,7 @@ DEPENDENCIES="
         dev-db/sqlite:3
         dev-libs/glib:2
         dev-libs/jansson
-        dev-libs/libevent
+        dev-libs/libevent:=
         net-libs/libsearpc[python_abis:*(-)?]
         net-misc/curl
         sys-libs/zlib

packages/sys-apps/lsd/lsd-0.12.0.exheres-0

@@ -0,0 +1,26 @@
+# Copyright 2019 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require cargo [ channel=stable ]
+require github [ user=Peltoche tag="${PV}" ]
+
+SUMMARY="The next gen ls command"
+HOMEPAGE="https://crates.io/crates/lsd ${HOMEPAGE}"
+
+LICENCES="Apache-2.0"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS=""
+
+DEPENDENCIES="
+"
+
+BUGS_TO="hasufell@posteo.de"
+
+src_test() {
+    local test_socket="unix:${TEMP}/test_socket_type.*/socket.tmp"
+    esandbox allow_net --bind "${test_socket}"
+    cargo_src_test
+    esandbox disallow_net "${test_socket}"
+}
+

packages/sys-apps/lsd/lsd-scm.exheres-0

@@ -0,0 +1,19 @@
+# Copyright 2019 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user=Peltoche tag="${PV}" ]
+require cargo [ channel=stable ]
+
+SUMMARY="The next gen ls command"
+HOMEPAGE="https://crates.io/crates/lsd ${HOMEPAGE}"
+
+LICENCES="Apache-2.0"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS=""
+
+DEPENDENCIES="
+"
+
+BUGS_TO="hasufell@posteo.de"
+

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

@@ -0,0 +1,127 @@
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+#
+# Based in part upon 'openrc-0.20.4.ebuild' from Gentoo, which is:
+#     Copyright 1999-2015 Gentoo Foundation
+#     Distributed under the terms of the GNU General Public License v2
+
+require bash-completion zsh-completion
+require github
+
+SUMMARY="A dependency-based init system that works with the system-provided init program"
+SLOT="0"
+LICENCES="BSD-2"
+
+MYOPTIONS="
+    ( providers:
+        runit
+        sinit
+        sysvinit
+    ) [[
+        *description = [ provider for the init daemon ]
+        number-selected = at-most-one
+    ]]
+    ncurses
+    newnet [[ description = [
+            Enable the new network stack (experimental)
+        ] ]]
+    pam
+"
+
+PLATFORMS="~amd64 ~x86"
+
+DEPENDENCIES="
+    build+run:
+        ncurses? ( sys-libs/ncurses )
+        pam? ( sys-libs/pam )
+    run:
+        app-shells/bash
+        providers:runit? ( sys-apps/runit )
+        providers:sinit? ( sys-apps/sinit )
+        providers:sysvinit? ( sys-apps/sysvinit )
+    recommendation:
+        net-misc/netifrc [[ description = [
+            Network Interface Management Scripts
+        ] ]]
+"
+
+REMOTE_IDS="github:OpenRC/${PN}"
+
+DEFAULT_SRC_COMPILE_PARAMS=(
+    LIBNAME=lib
+    LIBEXECDIR=/usr/$(exhost --target)/libexec/rc
+    OS=Linux
+)
+
+DEFAULT_SRC_INSTALL_PARAMS=(
+    PREFIX=/usr/$(exhost --target)
+    SBINDIR=/usr/$(exhost --target)/bin
+    SYSCONFDIR=/etc
+    UPREFIX=/usr
+    INCDIR=/usr/$(exhost --target)/include
+    INCMODE=0755
+    LIBDIR=/usr/$(exhost --target)/lib
+    SHLIBDIR=/usr/$(exhost --target)/lib
+    LIBMODE=0755
+    BASHCOMPDIR=${BASHCOMPLETIONDIR}
+    ZSHCOMPDIR=${ZSHCOMPLETIONDIR}
+)
+
+pkg_setup() {
+    exdirectory --allow /etc/sysctl.d
+}
+
+src_compile() {
+    export BRANDING="Exherbo Linux"
+
+    export DEBUG=
+    export MKTERMCAP=$(optionv ncurses)
+
+    export AR=$(exhost --tool-prefix)ar
+    export RANLIB=$(exhost --tool-prefix)ranlib
+    export CC=$(exhost --tool-prefix)cc
+
+    MAKE_ARGS="
+        ${DEFAULT_SRC_COMPILE_PARAMS[@]}
+        MKAUDIT=no
+        MKBASHCOMP=$(option bash-completion yes no)
+        MKNET=$(option newnet yes no)
+        MKPAM=$(optionv pam)
+        MKSELINUX=no
+        MKSTATICLIBS=no
+        MKSYSVINIT=no
+        MKZSHCOMP=$(option zsh-completion yes no)
+        SH=/bin/bash
+    "
+
+    emake ${MAKE_ARGS}
+}
+
+src_test() {
+    export READELF=$(exhost --tool-prefix)readelf
+    default
+}
+
+src_install() {
+    emake \
+        ${DEFAULT_SRC_INSTALL_PARAMS[@]} \
+        ${MAKE_ARGS} \
+        DESTDIR="${IMAGE}" install
+
+    keepdir /usr/$(exhost --target)/libexec/rc/init.d
+    keepdir /usr/$(exhost --target)/libexec/rc/tmp
+
+    insinto /etc/logrotate.d
+    newins "${FILES}"/openrc.logrotate openrc
+
+    dodoc ChangeLog *.md
+    if option newnet; then
+        dodoc README.newnet
+    fi
+}
+
+pkg_postinst() {
+    elog "Since openrc 0.35 openrc has a cgroup init.d script which"
+    elog "you'll have to add to your startup if you need cgroups."
+}
+

packages/voip/blink/blink-3.2.0-r1.exheres-0

@@ -22,13 +22,13 @@ 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[>=2.0.0][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[python_abis:*(-)?]
         dev-python/python-sipsimple[>=3.0.0][python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
-        net-twisted/TwistedCore[python_abis:*(-)?]
+        net-twisted/Twisted[python_abis:*(-)?]
 "
 
 DEFAULT_SRC_PREPARE_PATCHES=(

packages/x11-misc/fsearch/fsearch-scm.exheres-0

@@ -0,0 +1,32 @@
+# Copyright 2019 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user="cboxdoerfer" ] autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
+
+SUMMARY="A fast file search utility for Unix-like systems based on GTK+3"
+HOMEPAGE="http://www.fsearch.org/ ${HOMEPAGE}"
+
+LICENCES="GPL-2"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    build:
+        dev-util/intltool
+        sys-devel/libtool
+        virtual/pkg-config
+    build+run:
+        dev-libs/glib:2
+        dev-libs/pcre
+        x11-libs/gdk-pixbuf:2.0
+        x11-libs/gtk+:3
+"
+
+BUGS_TO="hasufell@posteo.de"
+
+src_prepare() {
+    edo glib-gettextize --copy --force
+    edo intltoolize --force --copy --automake
+    eautoreconf
+}

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

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require gtk-icon-cache freedesktop-desktop
-require setup-py [ import=distutils blacklist="3" multibuild=false python_opts='[sqlite]' ]
+require setup-py [ import=distutils blacklist="2" multibuild=false python_opts="[sqlite]" ]
 
 SUMMARY="A desktop wiki"
 HOMEPAGE="http://zim-wiki.org/"
@@ -20,8 +20,10 @@ DEPENDENCIES="
     build:
         x11-apps/xdg-utils
     build+run:
-        gnome-bindings/pygtk:2[python_abis:*(-)?]
-        gnome-bindings/pygobject:2[python_abis:*(-)?]
+        gnome-bindings/pygobject:3[python_abis:*(-)?]
+        x11-libs/gtk+:3[>=3.18]
+    recommendation:
+        dev-python/pyxdg[python_abis:*(-)?]
     suggestion:
         app-text/dvipng
         app-text/texlive-core
@@ -36,9 +38,9 @@ DEPENDENCIES="
 
 WORK=${WORKBASE}/${PNV/_rc/-rc}
 
-SETUP_PY_SRC_INSTALL_PARAMS=(
-    --skip-xdg-cmd
-)
+pkg_setup() {
+    unset DISPLAY  # tries to access X socket
+}
 
 pkg_postinst() {
     freedesktop-desktop_pkg_postinst