From ca16f8d0bd0c839267e7716bb46ef4be86349877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Wed, 9 Sep 2020 01:42:12 +0200 Subject: [PATCH] dev-libs/sdl-kitchensink: migrate from cmake-utils to cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.5, Repoman-2.3.23 Signed-off-by: Maciej Barć --- .../sdl-kitchensink-1.0.8-r1.ebuild | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-libs/sdl-kitchensink/sdl-kitchensink-1.0.8-r1.ebuild b/dev-libs/sdl-kitchensink/sdl-kitchensink-1.0.8-r1.ebuild index cf0f5a2..38bfa14 100644 --- a/dev-libs/sdl-kitchensink/sdl-kitchensink-1.0.8-r1.ebuild +++ b/dev-libs/sdl-kitchensink/sdl-kitchensink-1.0.8-r1.ebuild @@ -3,22 +3,21 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="A Simple SDL2 / FFmpeg library for audio/video playback written in C99" HOMEPAGE="https://github.com/katajakasa/SDL_kitchensink" SRC_URI="https://github.com/katajakasa/SDL_kitchensink/archive/${PV}.tar.gz -> ${P}.tar.gz" +RESTRICT="mirror" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc64 ~x86" - IUSE="static sanitize examples" BDEPEND+=" examples? ( sys-apps/coreutils ) " - RDEPEND+=" sanitize? ( >=sys-devel/gcc-5.0.0[sanitize] ) media-libs/libsdl2 @@ -29,26 +28,29 @@ RDEPEND+=" S="${WORKDIR}/SDL_kitchensink-${PV}" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { SANITIZE="OFF" EXAMPLES="OFF" STATIC="OFF" + if use sanitize; then SANITIZE="ON"; fi if use examples; then EXAMPLES="ON"; fi if use static; then STATIC="ON"; fi + local mycmakeargs=( -DUSE_ASAN="${SANITIZE}" -DBUILD_EXAMPLES="${EXAMPLES}" -DBUILD_STATIC="${STATIC}" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install + if use examples; then for i in audio complex custom rwops simple; do mv "${BUILD_DIR}"/${i} "${BUILD_DIR}"/SDL_kitchensink-${i}