diff --git a/packages/games-strategy/openra/openra-20171014.exheres-0 b/packages/games-strategy/openra/openra-20180307.exheres-0 similarity index 95% rename from packages/games-strategy/openra/openra-20171014.exheres-0 rename to packages/games-strategy/openra/openra-20180307.exheres-0 index 7962eb07..abb151d4 100644 --- a/packages/games-strategy/openra/openra-20171014.exheres-0 +++ b/packages/games-strategy/openra/openra-20180307.exheres-0 @@ -21,7 +21,6 @@ Open_Nat="${NG_SRC}/Open.NAT/2.1.0 -> Open_Nat-2.1.0.zip" FuzzyLogicLibrary="${NG_SRC}/FuzzyLogicLibrary/1.2.0 -> FuzzyLogicLibrary-1.2.0.zip" SDL2CS="https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll -> SDL2-CS.dll.20161223" Eluant="https://github.com/OpenRA/Eluant/releases/download/20140425/Eluant.dll -> Eluant.dll.20140425" -SmartIrc4net="${NG_SRC}/SmartIrc4net/0.4.5.1 -> SmartIrc4net-0.4.5.1.zip" # unfortunately, this may randomly change GEO_IP_DB="http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz -> GeoLite2-Country-2015-10-18.mmdb.gz" OpenAL_CS="https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll -> OpenAL-CS-20151227.dll" @@ -42,7 +41,6 @@ ${Open_Nat} ${FuzzyLogicLibrary} ${SDL2CS} ${Eluant} -${SmartIrc4net} ${GEO_IP_DB} ${OpenAL_CS} ${OpenAL_CS_config} diff --git a/packages/games-strategy/openra/openra-build.exlib b/packages/games-strategy/openra/openra-build.exlib index caf1253a..c0e6c6aa 100644 --- a/packages/games-strategy/openra/openra-build.exlib +++ b/packages/games-strategy/openra/openra-build.exlib @@ -69,26 +69,27 @@ MV_FILES=( openra-build_src_unpack() { unpack openra-${SLOT}-${PV}.tar.gz - # this is pure crapshit, but it will successfully die - # if upstream has added/changed files + edo mkdir "${WORK}"/thirdparty/download + edo cd "${WORK}"/thirdparty edo sed -i \ - -e 's/get()/furz()/' \ - -e 's|curl |: |' \ + -e 's|curl .*$|: |' \ fetch-thirdparty-deps.sh - edo mkdir "${WORK}"/thirdparty/download - get() { - # don't add dies here - local archive="${1/./_}" - local version="${2}" - mkdir -p "${WORK}"/thirdparty/download/${1} - unzip -o -qq "${FETCHEDDIR}"/${archive}-${version}.zip \ - -d "${WORK}"/thirdparty/download/${1} - } - export -f get + cat < noget.sh +#!/bin/sh + +set -e + +archive="\${1/./_}" +version="\${2}" +mkdir -p "${WORK}"/thirdparty/download/\${1} +unzip -o -qq "${FETCHEDDIR}"/\${archive}-\${version}.zip \ + -d "${WORK}"/thirdparty/download/\${1} +EOF + edo ./fetch-thirdparty-deps.sh - unset get + edo cd "${WORK}"/thirdparty/download edo cp "${FETCHEDDIR}"/${SDL2CS##* } ./SDL2-CS.dll edo cp "${FETCHEDDIR}"/${Eluant##* } ./Eluant.dll