Various minor improvements

packages/app-admin/verynice/files/verynice-1.1-build.patch

@@ -1,6 +1,7 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Wed Dec 26 19:46:44 UTC 2012
 Subject: build system
+Upstream: no, dead
 
 respect flags, add LDFLAGS to linker line
 fix install rules

packages/app-crypt/zuluCrypt/zuluCrypt-4.8.0.exheres-0

@@ -22,6 +22,8 @@ MYOPTIONS="
 "
 
 DEPENDENCIES="
+    build:
+        virtual/pkg-config
     build+run:
         dev-libs/libgcrypt
         sys-apps/util-linux
@@ -40,8 +42,6 @@ DEPENDENCIES="
             providers:eudev? ( sys-apps/eudev )
             providers:systemd? ( sys-apps/systemd )
         )
-    build:
-        virtual/pkg-config
 "
 
 CMAKE_SRC_CONFIGURE_PARAMS=(

packages/dev-db/wxsqlite3/wxsqlite3-3.3.0.exheres-0

@@ -25,7 +25,6 @@ src_configure() {
         --with-wx-config="/usr/$(exhost --target)/lib/wx/config/$(option providers:gtk3 'gtk3' 'gtk2')-unicode-3.0" \
         --with-wxshared \
         --with-sqlite3-prefix="/usr/$(exhost --target)"
-
 }
 
 src_install() {
@@ -38,6 +37,7 @@ src_install() {
         gtkver=2
     fi
 
+    # this is the upstream .pc file
     edo sed \
         -e "s:prefix=/usr:prefix=/usr/$(exhost --target):" \
         -e "s:wxcode_gtk2_wxsqlite3:wxcode_gtk${gtkver}u_wxsqlite3:" \

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

@@ -17,9 +17,9 @@ DESCRIPTION="
 "
 
 MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
+MY_PNV=${MY_PN}-${PV}
 HOMEPAGE="http://${PN}.org"
-DOWNLOADS="http://trac.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
+DOWNLOADS="http://trac.openscenegraph.org/downloads/developer_releases/${MY_PNV}.zip"
 
 LICENCES="wxWinLL-3 LGPL-2.1"
 SLOT="0"
@@ -87,3 +87,4 @@ src_prepare() {
 
     cmake_src_prepare
 }
+

packages/dev-games/cegui/cegui-0.8.4.exheres-0

@@ -29,6 +29,9 @@ MYOPTIONS="
 "
 
 DEPENDENCIES="
+    build:
+        dev-libs/glm
+        virtual/pkg-config
     build+run:
         dev-libs/pcre[>=5.0]
         media-libs/freetype:2[>=0.15.0]
@@ -48,9 +51,6 @@ DEPENDENCIES="
         )
         tinyxml? ( dev-libs/tinyxml )
         xerces? ( dev-libs/xerces-c )
-    build:
-        dev-libs/glm
-        virtual/pkg-config
 "
 
 # TODO: python
@@ -94,3 +94,4 @@ CMAKE_SRC_CONFIGURE_OPTIONS=(
 src_prepare() {
     edo sed -i -e '/CEGUI_LIB_INSTALL_DIR/s#lib64#lib#' CMakeLists.txt
 }
+

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

@@ -1,6 +1,7 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Sat Oct 27 22:39:31 UTC 2012
 Subject: FHS
+Upstream: no
 
 paths hardcoded until upstream fixed the logic
 

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

@@ -1,4 +1,6 @@
-Fix installation destination
+Source: Julian Ospald <hasufell@posteo.de>
+Upstream: no
+Reason: Fix installation destination
 
 diff -ru mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake mygui-MyGUI3.2.2/CMake/ConfigureBuild.cmake
 --- mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake	2015-01-26 10:32:35.000000000 -0500

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

@@ -1,6 +1,7 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Fri Jun 15 10:42:42 UTC 2012
 Subject: build system
+Upstream: no
 
 fix underlinking
 

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

@@ -1,24 +1,20 @@
-# Copyright 2014 Julian Ospald <hasufell@posteo.de>
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-
 MY_PN=MyGUI
-MY_P=${MY_PN}${PV}
+MY_PNV=${MY_PN}${PV}
-WORK="${WORKBASE}/${PN}-${MY_P}"
+WORK="${WORKBASE}/${PN}-${MY_PNV}"
-
 
 require cmake [ api=2 ]
 
-
 SUMMARY="A library for creating GUIs for games"
 HOMEPAGE="http://mygui.info/"
-DOWNLOADS="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz"
+DOWNLOADS="https://github.com/MyGUI/mygui/archive/${MY_PNV}.tar.gz"
 
 LICENCES="MIT"
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
-
 DEPENDENCIES="
     build+run:
         media-libs/freetype:2
@@ -62,3 +58,4 @@ src_install() {
     # wrapper not available for linux, remove related media
     edo rm -rf "${IMAGE}"/usr/share/MYGUI/Media/Wrapper
 }
+

packages/dev-libs/angelscript/angelscript-2.30.2.exheres-0

@@ -1,4 +1,4 @@
-# Copyright Julian Ospald <hasufell@posteo.de>
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
 SUMMARY="A flexible, cross-platform scripting library"
@@ -11,7 +11,8 @@ PLATFORMS="~amd64 ~x86"
 MYOPTIONS=""
 
 DEPENDENCIES="
-    build: virtual/unzip
+    build:
+        virtual/unzip
 "
 
 WORK=${WORKBASE}/sdk

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

@@ -44,9 +44,9 @@ CMAKE_SRC_CONFIGURE_TESTS=(
 enable_mbedtls_option() {
     local myopt="$@"
     # check that config.h syntax is the same at version bump
-    sed -i \
+    edo sed -i \
         -e "s://#define ${myopt}:#define ${myopt}:" \
-        include/mbedtls/config.h || die
+        include/mbedtls/config.h
 }
 
 src_prepare() {

packages/dev-libs/protobuf-c/protobuf-c-1.1.1.exheres-0

@@ -14,10 +14,10 @@ PLATFORMS="~amd64"
 MYOPTIONS=""
 
 DEPENDENCIES="
-    build+run:
-        dev-libs/protobuf[>=2.6.0]
     build:
         virtual/pkg-config
+    build+run:
+        dev-libs/protobuf[>=2.6.0]
 "
 
 BUGS_TO="will@worrbase.com"

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

@@ -3,7 +3,6 @@
 
 require pypi setup-py [ import=distutils ]
 
-
 SUMMARY="Basic building blocks for python applications"
 HOMEPAGE="http://ag-projects.com/"
 
@@ -12,4 +11,3 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 MYOPTIONS=""
 
-

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

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

packages/games-action/openclonk/openclonk-7.0.exheres-0

@@ -29,8 +29,6 @@ DEPENDENCIES="
         media-libs/freealut[>=1.1.0]
         media-libs/freetype:2
         media-libs/glew
-        providers:ijg-jpeg? ( media-libs/jpeg )
-        providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
         media-libs/libogg[>=1.2.2]
         media-libs/libpng:=
         media-libs/libvorbis[>=1.3.2]
@@ -44,6 +42,8 @@ DEPENDENCIES="
         x11-libs/gtk+:3
         x11-libs/libX11
         x11-libs/libXrandr
+        providers:ijg-jpeg? ( media-libs/jpeg:= )
+        providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
     test:
         dev-cpp/gtest
 "

packages/games-board/awale/files/awale-1.6-build.patch

@@ -1,6 +1,7 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Sat Jan 26 20:04:17 UTC 2013
 Subject: build system
+Upstream: not yet
 
 	fix FHS compliance
 	add several switches for icon, desktopdir and tk

packages/games-board/netmaumau/netmaumau-0.23.exheres-0

@@ -1,4 +1,5 @@
-# Copyright 2015-2016 Julian Ospald <hasufell@posteo.de>, Heiko Schaefer <heiko@rangun.de>
+# Copyright 2015-2016 Julian Ospald <hasufell@posteo.de>,
+#                     Heiko Schaefer <heiko@rangun.de>
 # Distributed under the terms of the GNU General Public License v2
 
 require qmake [ slot=4 ]
@@ -30,7 +31,7 @@ WORK=${WORKBASE}/NetMauMau-Qt-Client-${PV}
 src_configure() {
     if option espeak; then USE_ESPEAK='CONFIG+=espeak'; fi
     EQMAKE_SOURCES="nmm-qt-client.pro" eqmake $USE_ESPEAK
-    lrelease -compress -nounfinished -removeidentical -silent src/src.pro
+    edo lrelease -compress -nounfinished -removeidentical -silent src/src.pro
 }
 
 src_install() {

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

@@ -1,4 +1,4 @@
-# Copyright 2014 Julian Ospald <hasufell@posteo.de>
+# Copyright 2014-2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
 
@@ -14,10 +14,7 @@ DOWNLOADS="https://github.com/OpenMW/openmw/archive/${PNV}.tar.gz"
 LICENCES="GPL-3 MIT bitstream-font OFL-1.1"
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
-
+MYOPTIONS=""
-MYOPTIONS="
-    ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
-"
 
 DEPENDENCIES="
     build:

packages/games-engines/solarus/solarus-1.4.5.exheres-0

@@ -1,6 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require lua [ whitelist="5.1" multibuild=false ]
 require cmake
 
 SUMMARY="An open-source Zelda-like 2D game engine"
@@ -14,7 +15,6 @@ PLATFORMS="~amd64 ~x86"
 DEPENDENCIES="
     build+run:
         dev-games/physfs
-        dev-lang/lua:5.1
         media-libs/libmodplug
         media-libs/libvorbis
         media-libs/openal

packages/games-engines/stratagus/stratagus-2.2.7.exheres-0

@@ -1,6 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require lua [ whitelist="all" multibuild=false ]
 require cmake
 
 SUMMARY="A realtime strategy game engine"
@@ -18,7 +19,6 @@ DEPENDENCIES="
     build+run:
         app-arch/bzip2
         dev-db/sqlite:3
-        dev-lang/lua:=
         dev-lang/toluapp
         media-libs/SDL:0[X]
         media-libs/libmikmod

packages/games-fps/alienarena/files/alienarena-20130827-format.patch

@@ -1,3 +1,7 @@
+Author: unknown
+Upstream: no
+Reason: fix compiler warnings
+
 --- source/game/p_client.c.old	2016-01-18 20:13:25.147714704 +0100
 +++ source/game/p_client.c	2016-01-18 20:13:38.776476727 +0100
 @@ -2123,7 +2123,7 @@

packages/games-fps/eduke32/eduke32-scm.exheres-0

@@ -24,7 +24,7 @@ MY_SC55=3.0
 MY_OPL=2.0
 MY_XXX=1.33
 
-DESCRIPTION="Port of Duke Nukem 3D for SDL"
+SUMMARY="Port of Duke Nukem 3D for SDL"
 HOMEPAGE="http://www.eduke32.com/ http://hrp.duke4.net/"
 DOWNLOADS="http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar
     hires-textures? ( mirror://gentoo/duke3d_hrp_${MY_HRP}.zip )

packages/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch

@@ -1,5 +1,6 @@
 Author: hasufell <hasufell@gentoo.org>
 Date:   Wed Jul 10 01:25:27 2013 +0200
+Upstream: no, they don't care
 
     respect CFLAGS/LDFLAGS
 

packages/games-fps/warsow/warsow-2.0.1.exheres-0

@@ -7,7 +7,7 @@ DATA_PV=${PV//./}
 ENGINE_PV=${PV//./}
 ENGINE_P=${PN}_${ENGINE_PV}_sdk
 
-DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
+SUMMARY="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
 HOMEPAGE="http://www.warsow.net/"
 DOWNLOADS="http://mirror.null.one/${ENGINE_P}.tar.gz
     http://mirror.null.one/warsow_${DATA_PV}_unified.tar.gz
@@ -27,17 +27,17 @@ MYOPTIONS="
 
 DEPENDENCIES="
     build+run:
+        media-libs/SDL:2[X]
         media-libs/freetype
         media-libs/libogg
         media-libs/libpng:=
         media-libs/libtheora
         media-libs/libvorbis
         media-libs/openal
-        media-libs/SDL:2[X]
         net-misc/curl
         sys-libs/zlib
         x11-dri/mesa
-        providers:ijg-jpeg? ( media-libs/jpeg )
+        providers:ijg-jpeg? ( media-libs/jpeg:= )
         providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
 "
 

packages/games-rpg/arx-libertatis/arx-libertatis-1.1.2.exheres-0

@@ -12,15 +12,15 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
 DEPENDENCIES="
+    build:
+        dev-libs/boost
+        virtual/pkg-config
     build+run:
         media-libs/freetype:2
         media-libs/glew
         media-libs/openal
         media-libs/SDL:0[X]
         sys-libs/zlib
-    build:
-        dev-libs/boost
-        virtual/pkg-config
     suggestion:
         app-arch/innoextract [[ description = [ For extracting game files
                                                 from CD, used by the

packages/games-rpg/pillars-of-eternity/pillars-of-eternity-2.03.0788.exheres-0

@@ -29,6 +29,8 @@ MYOPTIONS="
 RESTRICT="fetch bindist"
 
 DEPENDENCIES="
+    build:
+        virtual/unzip
     run:
         dev-libs/atk
         media-libs/fontconfig
@@ -38,8 +40,6 @@ DEPENDENCIES="
         x11-libs/gdk-pixbuf:2.0
         x11-libs/gtk+:2
         x11-libs/pango
-    build:
-        virtual/unzip
 "
 
 WORK="${WORKBASE}/data/noarch"

packages/games-rpg/punch-club/punch-club-1.06.exheres-0

@@ -17,6 +17,8 @@ MYOPTIONS="
 "
 
 DEPENDENCIES="
+    build:
+        virtual/unzip
     run:
         dev-libs/glib:2
         x11-dri/glu
@@ -25,8 +27,6 @@ DEPENDENCIES="
         x11-libs/gtk+:2
         x11-libs/libX11
         x11-libs/libXcursor
-    build:
-        virtual/unzip
 "
 
 WORK="${WORKBASE}/data/noarch"

packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0

@@ -1,7 +1,6 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-
 require cmake gtk-icon-cache flag-o-matic
 
 SUMMARY="A multi-player, 3D action role-playing game"
@@ -22,9 +21,9 @@ DEPENDENCIES="
         dev-libs/ogre[freeimage][opengl]
         dev-libs/tinyxml
         media-libs/freealut
-        media-libs/openal
         media-libs/libogg
         media-libs/libvorbis
+        media-libs/openal
         net-libs/enet
         x11-libs/libX11
         x11-libs/libXrandr

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

@@ -27,10 +27,6 @@ MYOPTIONS="
 "
 
 DEPENDENCIES="
-    editor? (
-        build+run:
-            x11-libs/qt:4[opengl]
-    )
     build:
         dev-libs/boost
         sys-devel/gettext
@@ -45,6 +41,7 @@ DEPENDENCIES="
         x11-dri/glu
         x11-dri/mesa
         x11-libs/libX11
+        editor? ( x11-libs/qt:4[opengl] )
 "
 
 CMAKE_SOURCE=${WORKBASE}/${MY_PNV}

packages/games-rpg/wasteland2/wasteland2-2.9.0.14.exheres-0

@@ -14,6 +14,8 @@ MYOPTIONS=""
 RESTRICT="bindist fetch mirror"
 
 DEPENDENCIES="
+    build:
+        virtual/unzip
     run:
         dev-libs/atk
         dev-libs/glib:2
@@ -29,8 +31,6 @@ DEPENDENCIES="
         x11-libs/libXcursor
         x11-libs/libXext
         x11-libs/libXrandr
-    build:
-        virtual/unzip
 "
 
 WORK="${WORKBASE}/data/noarch"

packages/games-rpg/zsdx/zsdx-1.10.3.exheres-0

@@ -12,10 +12,10 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
 DEPENDENCIES="
-    run:
-        games-engines/solarus[~>1.4.0]
     build:
         app-arch/zip
+    run:
+        games-engines/solarus[~>1.4.0]
 "
 
 CMAKE_SRC_CONFIGURE_PARAMS=(

packages/games-rpg/zsxd/zsxd-1.10.3.exheres-0

@@ -12,10 +12,10 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
 DEPENDENCIES="
-    run:
-        games-engines/solarus[~>1.4.0]
     build:
         app-arch/zip
+    run:
+        games-engines/solarus[~>1.4.0]
 "
 
 CMAKE_SRC_CONFIGURE_PARAMS=(

packages/games-server/netmaumau/netmaumau-0.24.0.exheres-0

@@ -1,4 +1,5 @@
-# Copyright 2015 Julian Ospald <hasufell@posteo.de>, Heiko Schaefer <heiko@rangun.de>
+# Copyright 2015 Julian Ospald <hasufell@posteo.de>,
+#                Heiko Schaefer <heiko@rangun.de>
 # Distributed under the terms of the GNU General Public License v2
 
 require flag-o-matic

packages/games-simulation/minetest/minetest-0.4.13.exheres-0

@@ -17,9 +17,8 @@ MYOPTIONS="
 "
 
 DEPENDENCIES="
-    run:
+    build:
-        user/minetest
+        sys-devel/gettext
-        group/minetest
     build+run:
         app-arch/bzip2
         dev-db/leveldb
@@ -28,8 +27,6 @@ DEPENDENCIES="
         dev-libs/gmp:0
         dev-libs/hiredis
         media-libs/freetype:2
-        providers:ijg-jpeg? ( media-libs/jpeg )
-        providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
         media-libs/libogg
         media-libs/libpng:=
         media-libs/libvorbis
@@ -39,8 +36,11 @@ DEPENDENCIES="
         x11-dri/mesa
         x11-libs/libX11
         x11-libs/libXxf86vm
-    build:
+        providers:ijg-jpeg? ( media-libs/jpeg:= )
-        sys-devel/gettext
+        providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
+    run:
+        user/minetest
+        group/minetest
 "
 
 CMAKE_SRC_CONFIGURE_PARAMS=(
@@ -78,3 +78,4 @@ src_install() {
     doins -r mods menu
     doins game.conf minetest.conf
 }
+

packages/games-strategy/0ad/0ad-0.0.19-alpha.exheres-0

@@ -41,19 +41,6 @@ MYOPTIONS="
 "
 
 DEPENDENCIES="
-    editor? (
-        build+run:
-            x11-libs/wxGTK:3.0
-    )
-    lobby? (
-        build+run:
-            net-libs/gloox
-    )
-    sound? (
-        build+run:
-            media-libs/libvorbis
-            media-libs/openal
-    )
     build:
         dev-lang/python:*[>=2.7]
         virtual/pkg-config
@@ -62,8 +49,6 @@ DEPENDENCIES="
         dev-libs/icu:=
         dev-libs/libxml2:2.0
         dev-libs/nspr
-        providers:ijg-jpeg? ( media-libs/jpeg )
-        providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
         media-libs/libpng:=
         media-libs/SDL:2[X]
         net-libs/enet
@@ -72,6 +57,14 @@ DEPENDENCIES="
         x11-dri/mesa
         x11-libs/libX11
         x11-libs/libXcursor
+        editor? ( x11-libs/wxGTK:3.0 )
+        lobby? ( net-libs/gloox )
+        providers:ijg-jpeg? ( media-libs/jpeg:= )
+        providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
+        sound? (
+            media-libs/libvorbis
+            media-libs/openal
+        )
 "
 
 DEFAULT_SRC_PREPARE_PATCHES=(

packages/games-strategy/0ad/files/0ad-0.0.19-alpha-flags.patch

@@ -1,6 +1,7 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Sun Jun 24 18:32:38 UTC 2012
 Subject: build system
+Upstream: no
 
 * respect flags
 

packages/games-strategy/dunelegacy/dunelegacy-0.96.3.exheres-0

@@ -1,7 +1,6 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-
 require gtk-icon-cache
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 
@@ -14,11 +13,11 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
 DEPENDENCIES="
+    build:
+        virtual/pkg-config
     build+run:
         media-libs/SDL:0[X]
         media-libs/SDL_mixer:0[midi]
-    build:
-        virtual/pkg-config
 "
 
 DEFAULT_SRC_PREPARE_PATCHES=(

packages/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch

@@ -1,5 +1,6 @@
 Author: Julian Ospald <hasufell@gentoo.org>
 Date:   Thu Aug 9 18:57:40 2012 +0200
+Upstream: no
 
     respect flags
     use pkg-config

packages/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.14.01-makefile.patch

@@ -1,4 +1,6 @@
-Fix install permissions
+Author: Julian Ospald <hasufell@posteo.de>
+Upstream: not yet
+Reason: Fix install permissions
 
 diff --git a/Makefile b/Makefile
 index 27ef953..cc1e2cd 100644

packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0

@@ -24,7 +24,7 @@ src_unpack() {
 
 src_configure() {
     # not an autoconf script
-    ./configure --prefix=/usr
+    edo ./configure --prefix=/usr
 }
 
 src_compile() {

packages/games-strategy/openra/openra-20150919.exheres-0

@@ -54,6 +54,8 @@ MYOPTIONS="
 
 LUA_SLOT="5.1"
 DEPENDENCIES="
+    build:
+        virtual/unzip
     build+run:
         dev-dotnet/libgdiplus
         dev-lang/lua:${LUA_SLOT}
@@ -64,8 +66,6 @@ DEPENDENCIES="
         x11-dri/mesa
         providers:ijg-jpeg? ( media-libs/jpeg )
         providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
-    build:
-        virtual/unzip
 "
 
 WORK=${WORKBASE}/OpenRA-release-${PV}
@@ -163,3 +163,4 @@ pkg_postrm() {
     freedesktop-desktop_pkg_postrm
     freedesktop-mime_pkg_postrm
 }
+

packages/games-strategy/zod-engine/files/zod-engine-20110906-build.patch

@@ -1,6 +1,7 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Sun Aug 12 09:26:49 UTC 2012
 Subject: build system
+Upstream: yes
 
 respect CXX and CXXFLAGS
 

packages/games-strategy/zod-engine/files/zod-engine-20110906-proper-linux-support.patch

@@ -1,4 +1,6 @@
-Fixes linux support
+Author: unknown
+Upstream: yes
+Reason Fixes linux support
 
 diff -burN zod_engine/zod_launcher_src/common.cpp zod_engine.new/zod_launcher_src/common.cpp
 --- zod_engine/zod_launcher_src/common.cpp	2011-03-22 12:05:11.000000000 +0100

packages/games-strategy/zod-engine/zod-engine-20110906.exheres-0

@@ -3,10 +3,10 @@
 
 require gtk-icon-cache
 
-MY_P=zod_linux-${PV:0:4}-${PV:4:2}-${PV:6:2}
+MY_PNV=zod_linux-${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="Zod engine is a remake of the 1996 classic game by Bitmap Brothers called Z"
+SUMMARY="Zod engine is a remake of the 1996 classic game by Bitmap Brothers called Z"
 HOMEPAGE="http://zod.sourceforge.net/"
-DOWNLOADS="mirror://sourceforge/zod/linux_releases/${MY_P}.tar.gz"
+DOWNLOADS="mirror://sourceforge/zod/linux_releases/${MY_PNV}.tar.gz"
 
 LICENCES="all-rights-reserved GPL-3 LGPL-2.1"
 SLOT="0"

packages/media-sound/pnmixer/pnmixer-scm.exheres-0

@@ -30,7 +30,7 @@ DEPENDENCIES="
 "
 
 DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
-    libnotify
+    'libnotify'
     'providers:gtk3 gtk3'
 )
 
@@ -38,3 +38,4 @@ src_prepare() {
     edo intltoolize --force --copy
     autotools_src_prepare
 }
+

packages/net-im/pidgin-opensteamworks/files/pidgin-opensteamworks-1.3-Makefile

@@ -1,3 +1,8 @@
+# Source: Gentoo
+# Upstream: no, but we tried, see https://code.google.com/p/pidgin-opensteamworks/issues/detail?id=31
+# Reason: provide an actual working Makefile
+
+
 CC ?= gcc
 PKG_CONFIG ?= pkg-config
 INSTALL = install

packages/net-im/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.exheres-0

@@ -24,7 +24,6 @@ DEPENDENCIES="
 WORK=${WORKBASE}
 
 src_prepare() {
-    # see https://code.google.com/p/pidgin-opensteamworks/issues/detail?id=31
     edo cp "${FILES}"/${PN}-1.3-Makefile "${WORK}"/${PNV}/steam-mobile/Makefile
     edo unzip "${WORK}"/${PNV}/steam-mobile/releases/icons.zip
 }

packages/net-misc/badvpn/badvpn-1.999.130.exheres-0

@@ -8,7 +8,7 @@
 
 require cmake
 
-MY_P=${PN}-${PV/_rc/rc}
+MY_PNV=${PN}-${PV/_rc/rc}
 SUMMARY="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier"
 DESCRIPTION="
     BadVPN is an open-source peer-to-peer VPN system. It provides a
@@ -41,6 +41,8 @@ MYOPTIONS="
 "
 
 DEPENDENCIES="
+    build:
+        virtual/pkg-config
     build+run:
         dev-libs/nspr
         dev-libs/nss
@@ -54,11 +56,9 @@ DEPENDENCIES="
             providers:eudev? ( sys-apps/eudev )
             providers:systemd? ( sys-apps/systemd )
         )
-    build:
-        virtual/pkg-config
 "
 
-WORK=${WORKBASE}/${MY_P}
+WORK=${WORKBASE}/${MY_PNV}
 
 CMAKE_SRC_CONFIGURE_PARAMS=(
     -DBUILD_NOTHING_BY_DEFAULT=1

packages/net-misc/htpdate/htpdate-1.1.3.exheres-0

@@ -1,7 +1,6 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-
 SUMMARY="Synchronize local workstation with time offered by remote webservers"
 HOMEPAGE="http://www.vervest.org/fiki/bin/view/HTP/DownloadC"
 DOWNLOADS="http://www.vervest.org/htp/archive/c/${PNV}.tar.gz"

packages/net-misc/netifrc/netifrc-0.3.1.exheres-0

@@ -17,10 +17,10 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
 DEPENDENCIES="
-    run:
-        sys-apps/gentoo-functions
     build:
         virtual/pkg-config
+    run:
+        sys-apps/gentoo-functions
 "
 
 src_compile() {
@@ -45,3 +45,4 @@ pkg_postinst() {
         elog "${ROOT}/usr/share/doc/${PNVR}/README"
     fi
 }
+

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

@@ -1,7 +1,6 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-
 require gtk-icon-cache
 require perl-module
 

packages/sci-mathematics/flint/files/flint-2.4.4-cflags-ldflags.patch

@@ -1,6 +1,7 @@
 commit afadc8d05674a0e3e2fcf6dfbcf5f3c8f9133119
 Author: Julian Ospald <hasufell@hasufell.de>
 Date:   Sun May 18 19:32:59 2014 +0200
+Upstream: yes, https://github.com/wbhart/flint2/commit/afadc8d05674a0e3e2fcf6dfbcf5f3c8f9133119
 
     Respect CFLAGS/CXXFLAGS/LDFLAGS, fixes #66
     

packages/sci-mathematics/flint/files/flint-2.4.4-libdir.patch

@@ -2,6 +2,7 @@ From 27eb23c1844029ee64907500bd8aa87097ffcd32 Mon Sep 17 00:00:00 2001
 From: Julian Ospald <hasufell@hasufell.de>
 Date: Sun, 18 May 2014 18:46:24 +0200
 Subject: [PATCH] Allow to control LIBDIR
+Upstream: yes, https://github.com/wbhart/flint2/commit/27eb23c1844029ee64907500bd8aa87097ffcd32
 
 Some distributions have lib32/lib64 and need to control
 the destination properly.

packages/sci-mathematics/flint/files/flint-2.4.4-test.patch

@@ -1,6 +1,7 @@
 commit 5e3d4a0504158f70d227e7cfc03985fe9a646797
 Author: Julian Ospald <hasufell@hasufell.de>
 Date:   Wed Jul 2 12:58:50 2014 +0200
+Upstream: yes, https://github.com/wbhart/flint2/commit/5e3d4a0504158f70d227e7cfc03985fe9a646797
 
     Fix NTL test build
 

packages/sci-mathematics/flint/files/flint-2.4.4-whitespaces.patch

@@ -2,6 +2,7 @@ From 3506d617ef9dfc5184aa99be05a25e4f73d6c3f6 Mon Sep 17 00:00:00 2001
 From: Julian Ospald <hasufell@hasufell.de>
 Date: Sun, 18 May 2014 18:47:27 +0200
 Subject: [PATCH] Quote variables that could contain whitespaces
+Upstream: yes, https://github.com/wbhart/flint2/commit/3506d617ef9dfc5184aa99be05a25e4f73d6c3f6
 
 Make does NOT take care of this in this context. It's
 not a variable assignment and installation would fail

packages/sci-physics/bullet/bullet-2.83.5.exheres-0

@@ -30,3 +30,4 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
     -DBUILD_BULLET2_DEMOS=OFF
     -DUSE_GRAPHICAL_BENCHMARK=OFF
 )
+

packages/sys-apps/gentoo-functions/gentoo-functions-0.10.exheres-0

@@ -7,7 +7,6 @@
 
 require flag-o-matic
 
-
 HOMEPAGE="https://www.gentoo.org"
 DOWNLOADS="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${PNV}.tar.gz"
 
@@ -26,3 +25,4 @@ src_prepare() {
     export CC=$(exhost --tool-prefix)cc
     append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 }
+

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

@@ -36,13 +36,14 @@ DEPENDENCIES="
     build+run:
         ncurses? ( sys-libs/ncurses )
         pam? ( sys-libs/pam )
+    run:
+        providers:runit? ( sys-apps/runit )
+        providers:sinit? ( sys-apps/sinit )
+        providers:sysvinit? ( sys-apps/sysvinit )
     suggestion:
         net-misc/netifrc [[ description = [
             Network Interface Management Scripts
         ] ]]
-    providers:runit? ( sys-apps/runit )
-    providers:sinit? ( sys-apps/sinit )
-    providers:sysvinit? ( sys-apps/sysvinit )
 "
 
 DEFAULT_SRC_COMPILE_PARAMS=(

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

@@ -1,10 +1,7 @@
-From: Julian Ospald <hasufell@gentoo.org>
+From: Julian Ospald <hasufell@posteo.de>
 Date: Tue Sep  8 10:10:18 UTC 2015
 Subject: Fix data path fallback
-
+Upstream: no, correct fix pending since 'sys.prefix' is broken in exherbo
-Distutils installs into "/usr/share/blink", but
-blink was unable to find it on gentoo, probably due
-to python-exec magic.
 
 --- blink-1.4.1/blink/resources.py
 +++ blink-1.4.1/blink/resources.py

packages/voip/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.exheres-0

@@ -18,7 +18,6 @@ MYOPTIONS="
 "
 RESTRICT="mirror strip"
 
-
 DEPENDENCIES="
     run:
         app-arch/quazip[qt5]
@@ -28,7 +27,6 @@ DEPENDENCIES="
         pulseaudio? ( media-sound/pulseaudio )
 "
 
-
 WORK="${WORKBASE}"
 
 pkg_nofetch() {

packages/voip/umurmur/umurmur-0.2.16.exheres-0

@@ -1,11 +1,10 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-
 require systemd-service
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
+SUMMARY="Minimalistic Murmur (Mumble server)"
 HOMEPAGE="https://github.com/fatbob313/umurmur"
 DOWNLOADS="https://github.com/fatbob313/${PN}/archive/${PV}.tar.gz -> ${PNV}.tar.gz"
 

packages/www-apps/hiawatha-monitor/hiawatha-monitor-1.4.exheres-0

@@ -1,17 +1,17 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-MY_P="monitor"
+MY_PN="monitor"
 
 SUMMARY="Monitoring application for www-servers/hiawatha"
 HOMEPAGE="http://www.hiawatha-webserver.org/howto/monitor"
-DOWNLOADS="http://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz "
+DOWNLOADS="http://www.hiawatha-webserver.org/files/${MY_PN}-${PV}.tar.gz "
 
 LICENCES="GPL-2"
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
-WORK=${WORKBASE}/${MY_P}
+WORK=${WORKBASE}/${MY_PN}
 
 src_install () {
     default

packages/www-servers/hiawatha/files/hiawatha-10.1-cflags.patch

@@ -1,6 +1,7 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Fri May 23 16:59:33 UTC 2014
 Subject: make optimization level build-type dependant
+Upstream: no, doesn't care
 
 --- hiawatha-9.5/CMakeLists.txt
 +++ hiawatha-9.5/CMakeLists.txt