Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
Date: Mon, 08 Feb 2021 06:49:43
Message-Id: 1612766964.32d6ac6c3ae62c80040f7a4b69029408409b3659.asturm@gentoo
1 commit: 32d6ac6c3ae62c80040f7a4b69029408409b3659
2 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 8 06:32:33 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 8 06:49:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d6ac6c
7
8 games-fps/gzdoom: Drop optional gtk2 support
9
10 Closes: https://bugs.gentoo.org/769071
11 Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/19373
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 games-fps/gzdoom/gzdoom-4.5.0.ebuild | 7 ++-----
16 games-fps/gzdoom/metadata.xml | 1 -
17 2 files changed, 2 insertions(+), 6 deletions(-)
18
19 diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
20 index 60680a131e1..a07fb6ae4bc 100644
21 --- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
22 +++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
23 @@ -14,7 +14,7 @@ LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
24 non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
25 SLOT="0"
26 KEYWORDS="~amd64 ~arm ~x86"
27 -IUSE="debug gtk gtk2 +non-free openmp"
28 +IUSE="debug gtk +non-free openmp"
29
30 DEPEND="
31 app-arch/bzip2
32 @@ -23,10 +23,7 @@ DEPEND="
33 media-libs/zmusic
34 sys-libs/zlib
35 virtual/jpeg:0
36 - gtk? (
37 - gtk2? ( x11-libs/gtk+:2 )
38 - !gtk2? ( x11-libs/gtk+:3 )
39 - )"
40 + gtk? ( x11-libs/gtk+:3 )"
41 RDEPEND="${DEPEND}"
42
43 S="${WORKDIR}/${PN}-g${PV}"
44
45 diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
46 index 656eb066e47..a805c66b7d1 100644
47 --- a/games-fps/gzdoom/metadata.xml
48 +++ b/games-fps/gzdoom/metadata.xml
49 @@ -14,7 +14,6 @@
50 <name>Gentoo Games Project</name>
51 </maintainer>
52 <use>
53 - <flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
54 <flag name="non-free">Enable non-free components</flag>
55 </use>
56 <upstream>