Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/
Date: Sat, 25 Jan 2020 12:04:14
Message-Id: 1579953839.fbfab64bbbb23d9cf67ecd2f4094015e9b56a5aa.ulm@gentoo
1 commit: fbfab64bbbb23d9cf67ecd2f4094015e9b56a5aa
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 25 12:03:02 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 25 12:03:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbfab64b
7
8 games-fps/prboom-plus: Rename "nonfree" flag to "non-free".
9
10 Bug: https://bugs.gentoo.org/676158
11 Package-Manager: Portage-2.3.85, Repoman-2.3.20
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 games-fps/prboom-plus/metadata.xml | 2 +-
15 games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild | 10 +++++-----
16 2 files changed, 6 insertions(+), 6 deletions(-)
17
18 diff --git a/games-fps/prboom-plus/metadata.xml b/games-fps/prboom-plus/metadata.xml
19 index c05b6d7832b..9ea5253b83d 100644
20 --- a/games-fps/prboom-plus/metadata.xml
21 +++ b/games-fps/prboom-plus/metadata.xml
22 @@ -20,7 +20,7 @@
23 <flag name="dumb">Enable support for various tracker-style music formats via <pkg>media-libs/dumb</pkg></flag>
24 <flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag>
25 <flag name="net">Enable support for network play</flag>
26 - <flag name="nonfree">Enable non-free components</flag>
27 + <flag name="non-free">Enable non-free components</flag>
28 <flag name="portmidi">Enable support for MIDI via <pkg>media-libs/portmidi</pkg></flag>
29 <flag name="sdl-image">Enable support for high-resolution texture support via <pkg>media-libs/sdl-image</pkg></flag>
30 <flag name="sdl-mixer">Enable support for MIDI via <pkg>media-libs/sdl-mixer</pkg></flag>
31
32 diff --git a/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild b/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
33 index 29196ddfd2e..aab17006b4b 100644
34 --- a/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
35 +++ b/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
36 @@ -1,4 +1,4 @@
37 -# Copyright 2019 Gentoo Authors
38 +# Copyright 2019-2020 Gentoo Authors
39 # Distributed under the terms of the GNU General Public License v2
40
41 EAPI=7
42 @@ -14,11 +14,11 @@ HOMEPAGE="https://prboom-plus.sourceforge.net"
43 SRC_URI="https://github.com/coelckers/prboom-plus/archive/f96f891d068dcc5ec52ed91056b46d27e9a8462d.tar.gz -> ${P}.tar.gz"
44
45 LICENSE="GPL-2+
46 - nonfree? ( freedist )
47 - !nonfree? ( BSD )"
48 + non-free? ( freedist )
49 + !non-free? ( BSD )"
50 SLOT="0"
51 KEYWORDS="~amd64 ~x86"
52 -IUSE="dumb fluidsynth mad net nonfree +opengl pcre +png portmidi sdl-image +sdl-mixer vorbis"
53 +IUSE="dumb fluidsynth mad net non-free +opengl pcre +png portmidi sdl-image +sdl-mixer vorbis"
54 REQUIRED_USE="sdl-image? ( opengl )"
55
56 DEPEND="
57 @@ -46,7 +46,7 @@ src_prepare() {
58 src_configure() {
59 econf \
60 --disable-cpu-opt \
61 - $(use_enable nonfree nonfree-graphics) \
62 + $(use_enable non-free nonfree-graphics) \
63 $(use_enable opengl gl) \
64 $(use_with dumb) \
65 $(use_with fluidsynth) \