From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9A121382C5 for ; Mon, 8 Jun 2020 08:56:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C95FE0894; Mon, 8 Jun 2020 08:56:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52632E0894 for ; Mon, 8 Jun 2020 08:56:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C986B34F3DB for ; Mon, 8 Jun 2020 08:56:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5FA52A0 for ; Mon, 8 Jun 2020 08:56:21 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1591606572.308958fbc03af9f15dbd9bd5ae80726fc17f733d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot-data/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/colobot-data/colobot-data-0.1.12.ebuild X-VCS-Directories: games-strategy/colobot-data/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 308958fbc03af9f15dbd9bd5ae80726fc17f733d X-VCS-Branch: master Date: Mon, 8 Jun 2020 08:56:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b9bea06a-b43b-44a1-8fc6-3bcf6592d8d4 X-Archives-Hash: 2fabf5b3eb5a3f96456631c567359938 commit: 308958fbc03af9f15dbd9bd5ae80726fc17f733d Author: Michał Górny gentoo org> AuthorDate: Mon Jun 8 08:39:24 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jun 8 08:56:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308958fb games-strategy/colobot-data: Port to cmake.eclass Signed-off-by: Michał Górny gentoo.org> games-strategy/colobot-data/colobot-data-0.1.12.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games-strategy/colobot-data/colobot-data-0.1.12.ebuild b/games-strategy/colobot-data/colobot-data-0.1.12.ebuild index 1a76b184e5b..79e1a2927dc 100644 --- a/games-strategy/colobot-data/colobot-data-0.1.12.ebuild +++ b/games-strategy/colobot-data/colobot-data-0.1.12.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils +inherit cmake MY_P=colobot-gold-${PV}-alpha MUSIC_P=colobot-music_ogg_${PV}-alpha @@ -30,7 +30,7 @@ src_unpack() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare if use music; then sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die @@ -42,5 +42,5 @@ src_configure() { -DMUSIC=$(usex music) -DMUSIC_FLAC=OFF ) - cmake-utils_src_configure + cmake_src_configure }