Use api=2 for cmake.exlib

packages/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.exheres-0

@@ -1,7 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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
+        "${CMAKE_SOURCE}"/config.h.cmake
-    default
+    cmake_src_prepare
 }
 

packages/app-arch/innoextract/innoextract-1.5.exheres-0

@@ -1,7 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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/"

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

@@ -1,8 +1,10 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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() {

packages/games-arcade/Commander-Genius/Commander-Genius-1.8.3.exheres-0

@@ -1,7 +1,9 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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() {

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
 )

packages/games-engines/flare/flare-0.19.exheres-0

@@ -1,8 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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"
 

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
 }
 

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

@@ -1,8 +1,10 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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}"

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

@@ -1,7 +1,9 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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

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

@@ -1,7 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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"

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

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

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

@@ -7,11 +7,11 @@ SCM_SECONDARY_REPOSITORIES="luabind"
 SCM_EXTERNAL_REFS="src/luabind:luabind"
 SCM_CHECKOUT_TO=${PN}
 
+MY_PNV=ValyriaTear-${PV}
+
 require gtk-icon-cache freedesktop-desktop
 require scm-git
-require cmake
+require cmake [ api=2 ]
-
-MY_PNV=ValyriaTear-${PV}
 
 SUMMARY="A free 2D J-RPG based on the Hero of Allacrost engine"
 HOMEPAGE="http://valyriatear.blogspot.de/
@@ -43,8 +43,6 @@ DEPENDENCIES="
         editor? ( x11-libs/qt:4[opengl] )
 "
 
-CMAKE_SOURCE=${WORKBASE}/${MY_PNV}
-
 CMAKE_SRC_CONFIGURE_PARAMS=(
     -DPKG_BINDIR=/usr/$(exhost --target)/bin
     -DPKG_DATADIR=/usr/share/${PN}

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

@@ -1,7 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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}

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

@@ -1,7 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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}

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/"

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
 

packages/games-strategy/wargus/wargus-2.3.0.exheres-0

@@ -1,7 +1,9 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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"

packages/media-libs/allegro/allegro-4.4.2.exheres-0

@@ -2,7 +2,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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"

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

packages/www-servers/hiawatha/hiawatha-10.1.exheres-0

@@ -1,7 +1,7 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # 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|" \