Various minor improvements

2016-02-29 00:05:15 +01:00
parent 3fa0f3d96a
commit 1300f8bdd1
71 changed files with 291 additions and 280 deletions
--- a/packages/games-strategy/0ad/0ad-0.0.19-alpha.exheres-0
+++ b/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=(
--- a/packages/games-strategy/0ad/files/0ad-0.0.19-alpha-flags.patch
+++ b/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

--- a/packages/games-strategy/dunelegacy/dunelegacy-0.96.3.exheres-0
+++ b/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=(
--- a/packages/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
+++ b/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
--- a/packages/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.14.01-makefile.patch
+++ b/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
--- a/packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0
+++ b/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() {
--- a/packages/games-strategy/openra/openra-20150919.exheres-0
+++ b/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
 }
+
--- a/packages/games-strategy/zod-engine/files/zod-engine-20110906-build.patch
+++ b/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

--- a/packages/games-strategy/zod-engine/files/zod-engine-20110906-proper-linux-support.patch
+++ b/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
--- a/packages/games-strategy/zod-engine/zod-engine-20110906.exheres-0
+++ b/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}
-DESCRIPTION="Zod engine is a remake of the 1996 classic game by Bitmap Brothers called Z"
+MY_PNV=zod_linux-${PV:0:4}-${PV:4:2}-${PV:6:2}
+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"