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 15962138334 for ; Sun, 22 Sep 2019 21:00:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52456E08AC; Sun, 22 Sep 2019 21:00:32 +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 274EBE08AC for ; Sun, 22 Sep 2019 21:00:32 +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 89D3E34B492 for ; Sun, 22 Sep 2019 21:00:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B9D2744 for ; Sun, 22 Sep 2019 21:00:29 +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: <1569186022.25a9e8aed12df19a64491ca0901ba7ea8dd82545.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.11.ebuild games-strategy/colobot-data/metadata.xml X-VCS-Directories: games-strategy/colobot-data/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 25a9e8aed12df19a64491ca0901ba7ea8dd82545 X-VCS-Branch: master Date: Sun, 22 Sep 2019 21:00:29 +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: 8c5a6432-6891-4c81-aabe-cb43b45e27b6 X-Archives-Hash: 50bf82de791bd6d685ed14f91234ba91 commit: 25a9e8aed12df19a64491ca0901ba7ea8dd82545 Author: Michał Górny gentoo org> AuthorDate: Sun Sep 22 20:53:41 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Sep 22 21:00:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a9e8ae games-strategy/colobot-data: Replace underscores in flag names Closes: https://bugs.gentoo.org/695166 Signed-off-by: Michał Górny gentoo.org> games-strategy/colobot-data/colobot-data-0.1.11.ebuild | 16 ++++++++-------- games-strategy/colobot-data/metadata.xml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild index b60210f63c3..cee283a76ba 100644 --- a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild +++ b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild @@ -9,21 +9,21 @@ DESCRIPTION="Data package for colobot (Colonize with Bots)" HOMEPAGE="https://colobot.info/" SRC_URI=" https://github.com/colobot/colobot-data/archive/colobot-gold-${PV}-alpha.zip -> ${P}.zip - music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_${PV}-alpha.tar.gz -> ${P}-music-ogg.tar.gz ) - music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_${PV}-alpha.tar.gz -> ${P}-music-flac.tar.gz )" + music-ogg? ( https://colobot.info/files/music/colobot-music_ogg_${PV}-alpha.tar.gz -> ${P}-music-ogg.tar.gz ) + music-flac-convert? ( https://colobot.info/files/music/colobot-music_flac_${PV}-alpha.tar.gz -> ${P}-music-flac.tar.gz )" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="+music music_flac_convert +music_ogg" +IUSE="+music music-flac-convert +music-ogg" REQUIRED_USE=" - music? ( ^^ ( music_flac_convert music_ogg ) ) - music_flac_convert? ( music ) - music_ogg? ( music )" + music? ( ^^ ( music-flac-convert music-ogg ) ) + music-flac-convert? ( music ) + music-ogg? ( music )" DEPEND=" app-arch/unzip - music_flac_convert? ( media-sound/vorbis-tools )" + music-flac-convert? ( media-sound/vorbis-tools )" S="${WORKDIR}/${PN}-colobot-gold-${PV}-alpha" @@ -47,7 +47,7 @@ src_prepare() { src_configure() { local mycmakeargs=( -DMUSIC=$(usex music) - -DMUSIC_FLAC=$(usex music_flac_convert) + -DMUSIC_FLAC=$(usex music-flac-convert) -DMUSIC_QUALITY="${COLOBOT_DATA_MUSIC_QUALITY:-4}" ) cmake-utils_src_configure diff --git a/games-strategy/colobot-data/metadata.xml b/games-strategy/colobot-data/metadata.xml index 12f259a825d..dda17af08d2 100644 --- a/games-strategy/colobot-data/metadata.xml +++ b/games-strategy/colobot-data/metadata.xml @@ -7,7 +7,7 @@ Enable music support - Fetch flac music and convert it to ogg - Fetch ogg music + Fetch flac music and convert it to ogg + Fetch ogg music