From d6439f076592c9f482c3b88b53d13ff29d6adfa9 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 23 Apr 2016 04:22:08 +0200 Subject: [PATCH] Use api=2 for cmake.exlib --- .../hardinfo/hardinfo-0.5.2_pre20130823.exheres-0 | 6 +++--- .../app-arch/innoextract/innoextract-1.5.exheres-0 | 2 +- packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0 | 9 +++++---- .../Commander-Genius-1.8.3.exheres-0 | 14 +++++++------- .../opensonic/opensonic-0.1.4.exheres-0 | 6 +++--- packages/games-engines/flare/flare-0.19.exheres-0 | 2 +- .../games-engines/solarus/solarus-1.4.5.exheres-0 | 4 ++-- .../stratagus/stratagus-2.3.0.exheres-0 | 6 +++--- packages/games-fps/warsow/warsow-2.0.1.exheres-0 | 7 ++++--- .../arx-libertatis/arx-libertatis-1.1.2.exheres-0 | 2 +- packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0 | 8 ++++---- .../valyriatear/valyriatear-scm.exheres-0 | 8 +++----- packages/games-rpg/zsdx/zsdx-1.10.3.exheres-0 | 6 +++--- packages/games-rpg/zsxd/zsxd-1.10.3.exheres-0 | 6 +++--- .../minetest/minetest-0.4.13.exheres-0 | 2 +- .../games-strategy/freesynd/freesynd-scm.exheres-0 | 2 +- .../games-strategy/wargus/wargus-2.3.0.exheres-0 | 6 +++--- .../media-libs/allegro/allegro-4.4.2.exheres-0 | 2 +- .../net-misc/badvpn/badvpn-1.999.130.exheres-0 | 10 ++++------ .../www-servers/hiawatha/hiawatha-10.1.exheres-0 | 4 ++-- 20 files changed, 55 insertions(+), 57 deletions(-) diff --git a/packages/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.exheres-0 b/packages/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.exheres-0 index 4c69d04..ed069b7 100644 --- a/packages/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.exheres-0 +++ b/packages/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.exheres-0 @@ -1,7 +1,7 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake +require cmake [ api=2 ] SUMMARY="A system information and benchmark tool for Linux systems" HOMEPAGE="http://hardinfo.org/" @@ -26,7 +26,7 @@ DEPENDENCIES=" src_prepare() { edo sed -i \ -e '/PREFIX/s:@CMAKE_INSTALL_PREFIX@/share:@CMAKE_INSTALL_DATAROOTDIR@:' \ - config.h.cmake - default + "${CMAKE_SOURCE}"/config.h.cmake + cmake_src_prepare } diff --git a/packages/app-arch/innoextract/innoextract-1.5.exheres-0 b/packages/app-arch/innoextract/innoextract-1.5.exheres-0 index 75c1e9b..b3d7bc7 100644 --- a/packages/app-arch/innoextract/innoextract-1.5.exheres-0 +++ b/packages/app-arch/innoextract/innoextract-1.5.exheres-0 @@ -1,7 +1,7 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake +require cmake [ api=2 ] SUMMARY="A tool to unpack installers created by Inno Setup" HOMEPAGE="http://constexpr.org/innoextract/" diff --git a/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0 b/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0 index bbed6f7..3b2f4b0 100644 --- a/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0 +++ b/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0 @@ -1,8 +1,10 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake +WORK=${WORKBASE}/${PN}-${PNV} + require github [ user=ARMmbed tag=mbedtls-${PV} ] +require cmake [ api=2 ] SUMMARY="Cryptographic library for embedded systems" HOMEPAGE="https://tls.mbed.org/" @@ -26,8 +28,6 @@ DEPENDENCIES=" dev-lang/perl " -WORK=${WORKBASE}/${PN}-${PNV} - CMAKE_SRC_CONFIGURE_PARAMS=( -DENABLE_PROGRAMS=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=ON @@ -46,7 +46,7 @@ enable_mbedtls_option() { # check that config.h syntax is the same at version bump edo sed -i \ -e "s://#define ${myopt}:#define ${myopt}:" \ - include/mbedtls/config.h + "${CMAKE_SOURCE}"/include/mbedtls/config.h } src_prepare() { @@ -55,6 +55,7 @@ src_prepare() { option havege && enable_mbedtls_option MBEDTLS_HAVEGE_C option threads && enable_mbedtls_option MBEDTLS_THREADING_C option threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD + cmake_src_prepare } src_test() { diff --git a/packages/games-arcade/Commander-Genius/Commander-Genius-1.8.3.exheres-0 b/packages/games-arcade/Commander-Genius/Commander-Genius-1.8.3.exheres-0 index 0e6b1e4..a06f3ce 100644 --- a/packages/games-arcade/Commander-Genius/Commander-Genius-1.8.3.exheres-0 +++ b/packages/games-arcade/Commander-Genius/Commander-Genius-1.8.3.exheres-0 @@ -1,7 +1,9 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake gtk-icon-cache +WORK=${WORKBASE}/${PN}-${PV//./}release + +require cmake [ api=2 ] gtk-icon-cache require github [ user=gerstrong tag=v${PV//./}release ] SUMMARY="Open Source Commander Keen clone (needs original game files)" @@ -22,8 +24,6 @@ DEPENDENCIES=" x11-dri/mesa " -WORK=${WORKBASE}/${PN}-${PV//./}release - CMAKE_SRC_CONFIGURE_PARAMS=( -DAPPDIR="/usr/$(exhost --target)/bin" -DBUILD_TARGET="LINUX" @@ -37,15 +37,15 @@ CMAKE_SRC_CONFIGURE_PARAMS=( ) src_prepare() { - default - # don't install questionable bundled keen data edo rm -r vfsroot # fixes build skew - sed -i \ + edo sed -i \ -e '/INCLUDE(package.cmake)/d' \ - CMakeLists.txt || die + CMakeLists.txt + + cmake_src_prepare } src_install() { diff --git a/packages/games-arcade/opensonic/opensonic-0.1.4.exheres-0 b/packages/games-arcade/opensonic/opensonic-0.1.4.exheres-0 index 47be68b..ad67728 100644 --- a/packages/games-arcade/opensonic/opensonic-0.1.4.exheres-0 +++ b/packages/games-arcade/opensonic/opensonic-0.1.4.exheres-0 @@ -4,7 +4,9 @@ MY_PN=opensnc MY_PNV=${MY_PN}-src-${PV} -require cmake +WORK=${WORKBASE}/${MY_PNV} + +require cmake [ api=2 ] require sourceforge [ project=opensnc pnv=${MY_PNV} suffix=tar.gz ] SUMMARY="A free open-source game based on the Sonic the Hedgehog universe" @@ -27,8 +29,6 @@ DEPENDENCIES=" providers:jpeg-turbo? ( media-libs/libjpeg-turbo ) " -WORK=${WORKBASE}/${MY_PNV} - DEFAULT_SRC_PREPARE_PATCHES=( -p0 "${FILES}"/${PNV}-cmake.patch ) diff --git a/packages/games-engines/flare/flare-0.19.exheres-0 b/packages/games-engines/flare/flare-0.19.exheres-0 index 4126ee5..07db1a5 100644 --- a/packages/games-engines/flare/flare-0.19.exheres-0 +++ b/packages/games-engines/flare/flare-0.19.exheres-0 @@ -1,8 +1,8 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake require github [ user=clintbellanger project=flare-engine tag=v${PV} pn=flare-engine ] +require cmake [ api=2 ] SUMMARY="Free/Libre Action Roleplaying game engine" diff --git a/packages/games-engines/solarus/solarus-1.4.5.exheres-0 b/packages/games-engines/solarus/solarus-1.4.5.exheres-0 index 006b7d9..c380b85 100644 --- a/packages/games-engines/solarus/solarus-1.4.5.exheres-0 +++ b/packages/games-engines/solarus/solarus-1.4.5.exheres-0 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 require lua [ whitelist="5.1" multibuild=false ] -require cmake +require cmake [ api=2 ] SUMMARY="An open-source Zelda-like 2D game engine" HOMEPAGE="http://www.solarus-games.org/" @@ -30,6 +30,6 @@ CMAKE_SRC_CONFIGURE_PARAMS=( src_install() { cmake_src_install - doman solarus.6 + doman "${CMAKE_SOURCE}"/solarus.6 } diff --git a/packages/games-engines/stratagus/stratagus-2.3.0.exheres-0 b/packages/games-engines/stratagus/stratagus-2.3.0.exheres-0 index dde7093..4bf60b1 100644 --- a/packages/games-engines/stratagus/stratagus-2.3.0.exheres-0 +++ b/packages/games-engines/stratagus/stratagus-2.3.0.exheres-0 @@ -1,8 +1,10 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 +WORK=${WORKBASE}/${PN}_${PV}.orig + require lua [ whitelist="5.1" multibuild=false ] -require cmake +require cmake [ api=2 ] require launchpad [ branch=trunk pv=${PV%.*} pnv=stratagus_${PV} suffix=orig.tar.gz ] SUMMARY="A realtime strategy game engine" @@ -31,8 +33,6 @@ DEPENDENCIES=" x11-libs/libX11 " -WORK=${WORKBASE}/${PN}_${PV}.orig - CMAKE_SRC_CONFIGURE_PARAMS=( -DBINDIR="/usr/$(exhost --target)/bin" -DDOCDIR="/usr/share/doc/${PNVR}" diff --git a/packages/games-fps/warsow/warsow-2.0.1.exheres-0 b/packages/games-fps/warsow/warsow-2.0.1.exheres-0 index 298bd4a..4613b2b 100644 --- a/packages/games-fps/warsow/warsow-2.0.1.exheres-0 +++ b/packages/games-fps/warsow/warsow-2.0.1.exheres-0 @@ -1,7 +1,9 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake gtk-icon-cache +WORK=${WORKBASE}/source/source + +require cmake [ api=2 ] gtk-icon-cache DATA_PV=${PV//./} ENGINE_PV=${PV//./} @@ -41,7 +43,6 @@ DEPENDENCIES=" providers:jpeg-turbo? ( media-libs/libjpeg-turbo ) " -WORK=${WORKBASE}/source/source DATA_S=${WORKBASE}/${PN}_${DATA_PV:0:2} src_install() { @@ -65,7 +66,7 @@ EOF insinto /usr/share/${PN} doins -r "${DATA_S}"/basewsw - edo cd build + edo cd "${CMAKE_SOURCE}"/build exeinto /usr/$(exhost --target)/libexec/${PN}/ doexe */*.so diff --git a/packages/games-rpg/arx-libertatis/arx-libertatis-1.1.2.exheres-0 b/packages/games-rpg/arx-libertatis/arx-libertatis-1.1.2.exheres-0 index a5a183d..dd2c3d5 100644 --- a/packages/games-rpg/arx-libertatis/arx-libertatis-1.1.2.exheres-0 +++ b/packages/games-rpg/arx-libertatis/arx-libertatis-1.1.2.exheres-0 @@ -1,7 +1,7 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake gtk-icon-cache +require cmake [ api=2 ] gtk-icon-cache require sourceforge [ project=arx suffix=tar.xz ] SUMMARY="Cross-platform port of Arx Fatalis, a first-person role-playing game" diff --git a/packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0 b/packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0 index 3ff6600..93b8486 100644 --- a/packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0 +++ b/packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0 @@ -1,7 +1,9 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake gtk-icon-cache flag-o-matic +WORK=${WORKBASE}/${PN}-${PV%_*} + +require cmake [ api=2 ] gtk-icon-cache flag-o-matic require sourceforge [ pnv=${PNV//_/-}-src ] SUMMARY="A multi-player, 3D action role-playing game" @@ -29,8 +31,6 @@ DEPENDENCIES=" x11-libs/libXrandr " -WORK=${WORKBASE}/${PN}-${PV%_*} - CMAKE_SRC_CONFIGURE_PARAMS=( -DCMAKE_INSTALL_PREFIX="" -DSUMWARS_NO_TINYXML=ON @@ -59,7 +59,7 @@ src_install() { edo rm -r "${IMAGE}"/usr/share/sumwars/translation/{potfiles,extract} insinto /usr/share/icons/hicolor/128x128/apps - newins share/icon/SumWarsIcon_128x128.png ${PN}.png + newins "${CMAKE_SOURCE}"/share/icon/SumWarsIcon_128x128.png ${PN}.png insinto /usr/share/applications hereins ${PN}.desktop < # Distributed under the terms of the GNU General Public License v2 -require cmake +require cmake [ api=2 ] SUMMARY="A free 2D Zelda fangame" HOMEPAGE="http://www.solarus-games.org/" @@ -27,9 +27,9 @@ src_install() { cmake_src_install insinto /usr/share/icons/hicolor/256x256/apps - newins build/icons/${PN}_icon_256.png ${PN}.png + newins "${CMAKE_SOURCE}"/build/icons/${PN}_icon_256.png ${PN}.png insinto /usr/share/icons/hicolor/48x48/apps - newins build/icons/${PN}_icon_48.png ${PN}.png + newins "${CMAKE_SOURCE}"/build/icons/${PN}_icon_48.png ${PN}.png # install proper wrapper script edo rm -f "${IMAGE%/}"/usr/share/${PN} diff --git a/packages/games-rpg/zsxd/zsxd-1.10.3.exheres-0 b/packages/games-rpg/zsxd/zsxd-1.10.3.exheres-0 index 9e01691..ae218f6 100644 --- a/packages/games-rpg/zsxd/zsxd-1.10.3.exheres-0 +++ b/packages/games-rpg/zsxd/zsxd-1.10.3.exheres-0 @@ -1,7 +1,7 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake +require cmake [ api=2 ] SUMMARY="A free 2D Zelda fangame parody" HOMEPAGE="http://www.solarus-games.org/" @@ -27,9 +27,9 @@ src_install() { cmake_src_install insinto /usr/share/icons/hicolor/256x256/apps - newins build/icons/${PN}_icon_256.png ${PN}.png + newins "${CMAKE_SOURCE}"/build/icons/${PN}_icon_256.png ${PN}.png insinto /usr/share/icons/hicolor/48x48/apps - newins build/icons/${PN}_icon_48.png ${PN}.png + newins "${CMAKE_SOURCE}"/build/icons/${PN}_icon_48.png ${PN}.png # install proper wrapper script edo rm -f "${IMAGE%/}"/usr/share/${PN} diff --git a/packages/games-simulation/minetest/minetest-0.4.13.exheres-0 b/packages/games-simulation/minetest/minetest-0.4.13.exheres-0 index b37babd..96204e0 100644 --- a/packages/games-simulation/minetest/minetest-0.4.13.exheres-0 +++ b/packages/games-simulation/minetest/minetest-0.4.13.exheres-0 @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +require cmake [ api=2 ] gtk-icon-cache require github [ user=minetest ] -require cmake gtk-icon-cache SUMMARY="An InfiniMiner/Minecraft inspired game" HOMEPAGE="http://minetest.net/" diff --git a/packages/games-strategy/freesynd/freesynd-scm.exheres-0 b/packages/games-strategy/freesynd/freesynd-scm.exheres-0 index 215f46a..97cae56 100644 --- a/packages/games-strategy/freesynd/freesynd-scm.exheres-0 +++ b/packages/games-strategy/freesynd/freesynd-scm.exheres-0 @@ -6,7 +6,7 @@ SCM_REPOSITORY="http://svn.code.sf.net/p/freesynd/code/freesynd/trunk" require desktop-utils require gtk-icon-cache -require cmake [ out_of_source=false ] +require cmake [ api=2 out_of_source=false ] require sourceforge require scm-svn diff --git a/packages/games-strategy/wargus/wargus-2.3.0.exheres-0 b/packages/games-strategy/wargus/wargus-2.3.0.exheres-0 index b57051e..d75f50b 100644 --- a/packages/games-strategy/wargus/wargus-2.3.0.exheres-0 +++ b/packages/games-strategy/wargus/wargus-2.3.0.exheres-0 @@ -1,7 +1,9 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake gtk-icon-cache +WORK=${WORKBASE}/${PN}_${PV}.orig + +require cmake [ api=2 ] gtk-icon-cache require launchpad [ branch=trunk pv=${PV%.*} pnv=${PN}_${PV} suffix=orig.tar.gz ] SUMMARY="Warcraft II for the Stratagus game engine" @@ -28,8 +30,6 @@ DEPENDENCIES=" media/cdparanoia [[ description = [ Needed for rip audio CD tracks ] ]] " -WORK=${WORKBASE}/${PN}_${PV}.orig - CMAKE_SRC_CONFIGURE_PARAMS=( -DGAMEDIR="/usr/$(exhost --target)/bin" -DBINDIR="/usr/$(exhost --target)/bin" diff --git a/packages/media-libs/allegro/allegro-4.4.2.exheres-0 b/packages/media-libs/allegro/allegro-4.4.2.exheres-0 index 04b3390..9e6ae2d 100644 --- a/packages/media-libs/allegro/allegro-4.4.2.exheres-0 +++ b/packages/media-libs/allegro/allegro-4.4.2.exheres-0 @@ -2,7 +2,7 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake [ out_of_source=false ] +require cmake [ api=2 out_of_source=false ] require sourceforge [ project=alleg suffix=tar.gz ] SUMMARY="cross-platform multimedia library" diff --git a/packages/net-misc/badvpn/badvpn-1.999.130.exheres-0 b/packages/net-misc/badvpn/badvpn-1.999.130.exheres-0 index 53b3b88..1596132 100644 --- a/packages/net-misc/badvpn/badvpn-1.999.130.exheres-0 +++ b/packages/net-misc/badvpn/badvpn-1.999.130.exheres-0 @@ -6,10 +6,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -require github [ user=ambrop72 ] -require cmake -MY_PNV=${PN}-${PV/_rc/rc} +require github [ user=ambrop72 ] +require cmake [ api=2 ] + SUMMARY="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier" DESCRIPTION=" BadVPN is an open-source peer-to-peer VPN system. It provides a @@ -58,8 +58,6 @@ DEPENDENCIES=" ) " -WORK=${WORKBASE}/${MY_PNV} - CMAKE_SRC_CONFIGURE_PARAMS=( -DBUILD_NOTHING_BY_DEFAULT=1 -DBUILD_CLIENT=ON @@ -74,7 +72,7 @@ CMAKE_SRC_CONFIGURE_OPTIONS=( src_install() { cmake_src_install - dodoc ChangeLog + dodoc "${CMAKE_SOURCE}"/ChangeLog exeinto /etc/init.d newexe "${FILES}"/${PN}-server.init ${PN}-server diff --git a/packages/www-servers/hiawatha/hiawatha-10.1.exheres-0 b/packages/www-servers/hiawatha/hiawatha-10.1.exheres-0 index aaa4c9e..7e1fda4 100644 --- a/packages/www-servers/hiawatha/hiawatha-10.1.exheres-0 +++ b/packages/www-servers/hiawatha/hiawatha-10.1.exheres-0 @@ -1,7 +1,7 @@ # Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require cmake systemd-service +require cmake [ api=2 ] systemd-service SUMMARY="Advanced and secure webserver" HOMEPAGE="http://www.hiawatha-webserver.org" @@ -69,7 +69,7 @@ CMAKE_SRC_CONFIGURE_TESTS=( ) src_prepare() { - default + cmake_src_prepare edo grep -E "^#ServerId =.*$" "config/hiawatha.conf.in" 1>/dev/null edo sed -r -i -e "s|^#ServerId =.*$|ServerId = hiawatha|" \