trickle: add snapshot version

metadata/categories.conf

@@ -5,6 +5,7 @@ app-crypt
 app-diagram
 app-editors
 app-ergonomics
+app-misc
 app-office
 dev-cpp
 dev-db

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-python/mypy/mypy-0.720.exheres-0

@@ -23,35 +23,29 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     build+run:
-        dev-python/typed-ast[>=1.3.1&<1.4.0][python_abis:*(-)?]
+        dev-python/typed-ast[>=1.4.0&<1.5.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]
-        )
+        dev-python/typing_extensions[>=3.7.4][python_abis:*(-)?]
     test:
+        dev-python/attrs[>=18.0][python_abis:*(-)?]
+        dev-python/flake8[>=3.7][python_abis:*(-)?]
+        dev-python/lxml[>=4.2.4][python_abis:*(-)?]
+        dev-python/psutil[>=4.0][python_abis:*(-)?]
         dev-python/py[>=1.5.2][python_abis:*(-)?]
-        dev-python/pytest[>=3.0][python_abis:*(-)?]
+        dev-python/pytest[>=4.4][python_abis:*(-)?]
         dev-python/pytest-cov[>=2.4.0][python_abis:*(-)?]
-        dev-python/pytest-xdist[>=1.18][python_abis:*(-)?]
+        dev-python/pytest-xdist[>=1.22][python_abis:*(-)?]
         dev-python/virtualenv[python_abis:*(-)?]
     suggestion:
-        dev-python/psutil[>=5.4.0&<5.5.0][python_abis:*(-)?] [[
+        dev-python/psutil[>=4.0][python_abis:*(-)?] [[
             description = [ Show memory stats in 'dmypy status -v' ] ]]
 "
 
 BUGS_TO="hasufell@posteo.de"
 
-# Require unpackaged: flake8-bugbear, flake8-pyi
+# Require unpackaged: flake8-bugbear, flake8-pyi, pytest 4.4+
 RESTRICT="test"
 
-prepare_one_multibuild() {
-    edo sed -i \
-            -e "/target = /s|lib|$(exhost --target)/lib|" \
-            setup.py
-
-    setup-py_prepare_one_multibuild
-}
-
 test_one_multibuild() {
     PYTHONPATH="${PWD}" edo ${PYTHON} -B runtests.py -x lint
 }

packages/dev-python/mypy_extensions/mypy_extensions-0.4.1.exheres-0

@@ -7,11 +7,9 @@ SUMMARY="Experimental type system extensions for programs checked with the mypy
 
 LICENCES="MIT"
 SLOT="0"
-PLATFORMS="~amd64"
+PLATFORMS="~amd64 ~x86"
 MYOPTIONS=""
 
 DEPENDENCIES="
-    build+run:
-        python_abis:3.4? ( dev-python/typing[>=3.5.3][python_abis:3.4] )
 "
 

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

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

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

@@ -1,9 +1,12 @@
 # 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 ]
+MY_PN="typed_ast"
+MY_PNV="${MY_PN}-${PV}"
+
+require github [ user="python" project="${MY_PN}" ]
+require pypi [ pnv="${MY_PNV}" ]
+require setup-py [ import=setuptools blacklist=2 work="${MY_PNV}" ]
 
 SUMMARY="A fork of Python 2 and 3 ast modules with type comment support"
 DESCRIPTION="

packages/dev-python/typing_extensions/typing_extensions-3.7.4.exheres-0

@@ -0,0 +1,20 @@
+# Copyright 2019 Alexander Kapshuna <kapsh@kap.sh>
+# Distributed under the terms of the GNU General Public License v2
+
+require pypi setup-py [ import=setuptools ]
+
+SUMMARY="Backported and Experimental Type Hints for Python 3.5+"
+
+LICENCES="PSF"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS=""
+
+DEPENDENCIES="
+"
+
+test_one_multibuild() {
+    local major=$(ever major $(python_get_abi))
+    edo ${PYTHON} -B src_py${major}/test_typing_extensions.py
+}
+

packages/games-strategy/openra/openra-build.exlib

@@ -43,9 +43,6 @@ MV_FILES=(
     /usr/share/applications/openra-cnc.desktop
     /usr/share/applications/openra-ra.desktop
     /usr/share/applications/openra-d2k.desktop
-    /usr/share/applications/openra-cnc-join-servers.desktop
-    /usr/share/applications/openra-ra-join-servers.desktop
-    /usr/share/applications/openra-d2k-join-servers.desktop
 
     /usr/share/icons/hicolor/128x128/apps/openra-cnc.png
     /usr/share/icons/hicolor/16x16/apps/openra-cnc.png
@@ -73,7 +70,7 @@ openra-build_src_unpack() {
 
     edo cd "${WORK}"/thirdparty
     edo sed -i \
-        -e 's|curl .*$|: |' \
+        -e 's|^[[:space:]]+curl .*$|: |' \
         fetch-thirdparty-deps.sh
 
     cat <<EOF > noget.sh
@@ -141,7 +138,7 @@ openra-build_src_install() {
     local i
     for i in /usr/$(exhost --target)/bin/openra-{ra,cnc,d2k} \
              /usr/$(exhost --target)/bin/openra-{ra,cnc,d2k}-server \
-             /usr/share/mime/packages/openra.xml \
+             /usr/share/mime/packages/openra-{ra,cnc,d2k}.xml \
              /usr/share/appdata/openra-{ra,cnc,d2k}.appdata.xml
     do
         edo mv "${IMAGE%/}"${i} "${IMAGE%/}"${i}-${SLOT}
@@ -163,7 +160,9 @@ openra-build_src_install() {
         /usr/share/appdata/openra-cnc.appdata.xml{,-${SLOT}} \
         /usr/share/appdata/openra-ra.appdata.xml{,-${SLOT}} \
         /usr/share/appdata/openra-d2k.appdata.xml{,-${SLOT}} \
-        /usr/share/mime/packages/openra.xml{,-${SLOT}}
+        /usr/share/mime/packages/openra-cnc.xml{,-${SLOT}} \
+        /usr/share/mime/packages/openra-ra.xml{,-${SLOT}} \
+        /usr/share/mime/packages/openra-d2k.xml{,-${SLOT}}
 }
 
 openra-build_pkg_postinst() {

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

@@ -0,0 +1,8 @@
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+GITHUB_REVISION=596bb13f2bc323fc8e7783b8dcba627de4969e07
+require trickle
+
+PLATFORMS="~amd64 ~x86"
+

packages/net-misc/trickle/trickle-scm.exheres-0

@@ -1,30 +1,7 @@
 # Copyright 2018 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user=mariusae ]
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require trickle
 
-SUMMARY="Trickle is a userland bandwidth shaper for Unix-like systems"
-DESCRIPTION="
-Trickle is a voluntary, cooperative bandwidth shaper. trickle works entirely in userland and is cross platform compatible.
-https://www.usenix.org/legacy/event/usenix05/tech/freenix/full_papers/eriksen/eriksen.pdf
-"
-
-LICENCES="BSD-3"
-SLOT="0"
 PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-libs/libevent
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-DEFAULT_SRC_COMPILE_PARAMS=( -j1 )
-
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/fix-install.patch
-)
 

packages/net-misc/trickle/trickle.exlib

@@ -0,0 +1,29 @@
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user=mariusae ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 1.15 ] ]
+
+SUMMARY="Trickle is a userland bandwidth shaper for Unix-like systems"
+DESCRIPTION="
+Trickle is a voluntary, cooperative bandwidth shaper. trickle works entirely in userland and is cross platform compatible.
+https://www.usenix.org/legacy/event/usenix05/tech/freenix/full_papers/eriksen/eriksen.pdf
+"
+
+LICENCES="BSD-3"
+SLOT="0"
+MYOPTIONS=""
+
+DEPENDENCIES="
+    build+run:
+        dev-libs/libevent:=
+"
+
+BUGS_TO="hasufell@posteo.de"
+
+DEFAULT_SRC_COMPILE_PARAMS=( -j1 )
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/fix-install.patch
+)
+

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

@@ -0,0 +1,9 @@
+# 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}" ]
+require lsd
+
+PLATFORMS="~amd64 ~x86"
+

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

@@ -3,17 +3,7 @@
 
 require github [ user=Peltoche tag="${PV}" ]
 require cargo [ channel=stable ]
+require lsd
 
-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/lsd/lsd.exlib

@@ -1,15 +1,13 @@
 # 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}" ]
+require bash-completion zsh-completion
 
 SUMMARY="The next gen ls command"
 HOMEPAGE="https://crates.io/crates/lsd ${HOMEPAGE}"
 
 LICENCES="Apache-2.0"
 SLOT="0"
-PLATFORMS="~amd64 ~x86"
 MYOPTIONS=""
 
 DEPENDENCIES="
@@ -17,6 +15,20 @@ DEPENDENCIES="
 
 BUGS_TO="hasufell@posteo.de"
 
+BASH_COMPLETIONS=( "${WORK}/completions/${PN}.bash" )
+ZSH_COMPLETIONS=( "${WORK}/completions/_${PN}" )
+
+src_compile() {
+    SHELL_COMPLETIONS_DIR="${WORK}/completions" \
+        cargo_src_compile
+}
+
+src_install() {
+    cargo_src_install
+    bash-completion_src_install
+    zsh-completion_src_install
+}
+
 src_test() {
     local test_socket="unix:${TEMP}/test_socket_type.*/socket.tmp"
     esandbox allow_net --bind "${test_socket}"