Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/files/, games-fps/prboom-plus/
Date: Mon, 24 Jun 2019 20:07:06
Message-Id: 1561406261.54d69b5150e342464abbf45d4699877b32a2efc2.chewi@gentoo
1 commit: 54d69b5150e342464abbf45d4699877b32a2efc2
2 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
3 AuthorDate: Thu Jun 20 07:30:38 2019 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 24 19:57:41 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d69b51
7
8 games-fps/prboom-plus: Introduce version 2.5.1.4
9
10 Closes: https://bugs.gentoo.org/338027
11 Package-Manager: Portage-2.3.67, Repoman-2.3.15
12 Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
13 Closes: https://github.com/gentoo/gentoo/pull/12297
14 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
15
16 games-fps/prboom-plus/Manifest | 1 +
17 ....1.4-Remove-nonstandard-gamesdir-variable.patch | 33 +++++++++++
18 games-fps/prboom-plus/metadata.xml | 33 +++++++++++
19 games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild | 68 ++++++++++++++++++++++
20 4 files changed, 135 insertions(+)
21
22 diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
23 new file mode 100644
24 index 00000000000..74314aab3b5
25 --- /dev/null
26 +++ b/games-fps/prboom-plus/Manifest
27 @@ -0,0 +1 @@
28 +DIST prboom-plus-2.5.1.4.tar.gz 3007237 BLAKE2B 3dce8aad6fb521d13cf3e6b48a261f010b545bafa853860b284be0d0772f65b4fa0bfa965f7cb1869cc0d0eb21a4237e1873d08ff56d439cb3eed00f82bf12fb SHA512 625b75c5fe663bb3ba54bcd90f914ad7461c0860448f6f179180de26bea0a4d766739c50f96a8245687bc213742ec53bf6ffa26cde09772b3ae0bba91662213e
29
30 diff --git a/games-fps/prboom-plus/files/prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch b/games-fps/prboom-plus/files/prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch
31 new file mode 100644
32 index 00000000000..c64bd135937
33 --- /dev/null
34 +++ b/games-fps/prboom-plus/files/prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch
35 @@ -0,0 +1,33 @@
36 +From d0aaa51e05da23c2b0ad46901c2f4b3cd0500681 Mon Sep 17 00:00:00 2001
37 +From: William Breathitt Gray <vilhelm.gray@×××××.com>
38 +Date: Fri, 21 Jun 2019 17:31:01 +0900
39 +Subject: [PATCH] Remove nonstandard gamesdir variable
40 +
41 +The Autotools canonical method of configuring the program installation
42 +directory is via the bindir variable (e.g. "--bindir=/usr/games/doom").
43 +---
44 + src/Makefile.am | 6 ++----
45 + 1 file changed, 2 insertions(+), 4 deletions(-)
46 +
47 +diff --git a/src/Makefile.am b/src/Makefile.am
48 +index c20da98..9b3ab13 100644
49 +--- a/src/Makefile.am
50 ++++ b/src/Makefile.am
51 +@@ -8,12 +8,10 @@
52 +
53 + SUBDIRS = SDL POSIX MAC PCSOUND TEXTSCREEN MUSIC
54 +
55 +-gamesdir=$(prefix)/games
56 +-
57 + if BUILD_SERVER
58 +-games_PROGRAMS = prboom-plus prboom-plus-game-server
59 ++bin_PROGRAMS = prboom-plus prboom-plus-game-server
60 + else
61 +-games_PROGRAMS = prboom-plus
62 ++bin_PROGRAMS = prboom-plus
63 + endif
64 +
65 + CFLAGS = @CFLAGS@ @SDL_CFLAGS@
66 +--
67 +2.22.0
68 +
69
70 diff --git a/games-fps/prboom-plus/metadata.xml b/games-fps/prboom-plus/metadata.xml
71 new file mode 100644
72 index 00000000000..c05b6d7832b
73 --- /dev/null
74 +++ b/games-fps/prboom-plus/metadata.xml
75 @@ -0,0 +1,33 @@
76 +<?xml version="1.0" encoding="UTF-8"?>
77 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
78 +<pkgmetadata>
79 + <longdescription lang="en">
80 + PrBoom+ is a Doom source port developed from the original PrBoom project.
81 + </longdescription>
82 + <maintainer type="person">
83 + <email>vilhelm.gray@×××××.com</email>
84 + <name>William Breathitt Gray</name>
85 + </maintainer>
86 + <maintainer type="project">
87 + <email>proxy-maint@g.o</email>
88 + <name>Proxy Maintainers</name>
89 + </maintainer>
90 + <maintainer type="project">
91 + <email>games@g.o</email>
92 + <name>Gentoo Games Project</name>
93 + </maintainer>
94 + <use>
95 + <flag name="dumb">Enable support for various tracker-style music formats via <pkg>media-libs/dumb</pkg></flag>
96 + <flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag>
97 + <flag name="net">Enable support for network play</flag>
98 + <flag name="nonfree">Enable non-free components</flag>
99 + <flag name="portmidi">Enable support for MIDI via <pkg>media-libs/portmidi</pkg></flag>
100 + <flag name="sdl-image">Enable support for high-resolution texture support via <pkg>media-libs/sdl-image</pkg></flag>
101 + <flag name="sdl-mixer">Enable support for MIDI via <pkg>media-libs/sdl-mixer</pkg></flag>
102 + </use>
103 + <upstream>
104 + <bugs-to>https://sourceforge.net/p/prboom-plus/bugs</bugs-to>
105 + <doc lang="en">https://prboom-plus.sourceforge.net</doc>
106 + <remote-id type="sourceforge">prboom-plus</remote-id>
107 + </upstream>
108 +</pkgmetadata>
109
110 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
111 new file mode 100644
112 index 00000000000..29196ddfd2e
113 --- /dev/null
114 +++ b/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild
115 @@ -0,0 +1,68 @@
116 +# Copyright 2019 Gentoo Authors
117 +# Distributed under the terms of the GNU General Public License v2
118 +
119 +EAPI=7
120 +
121 +inherit autotools desktop xdg
122 +
123 +DESCRIPTION="A Doom source port developed from the original PrBoom project"
124 +HOMEPAGE="https://prboom-plus.sourceforge.net"
125 +# We are using a github mirror here because the upstream tarball is missing the
126 +# free dog assets; we should update SRC_URI to point to the upstream tarball
127 +# once the free assets are present as expected
128 +#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
129 +SRC_URI="https://github.com/coelckers/prboom-plus/archive/f96f891d068dcc5ec52ed91056b46d27e9a8462d.tar.gz -> ${P}.tar.gz"
130 +
131 +LICENSE="GPL-2+
132 + nonfree? ( freedist )
133 + !nonfree? ( BSD )"
134 +SLOT="0"
135 +KEYWORDS="~amd64 ~x86"
136 +IUSE="dumb fluidsynth mad net nonfree +opengl pcre +png portmidi sdl-image +sdl-mixer vorbis"
137 +REQUIRED_USE="sdl-image? ( opengl )"
138 +
139 +DEPEND="
140 + media-libs/libsdl[opengl?,joystick,sound,video]
141 + dumb? ( media-libs/dumb )
142 + fluidsynth? ( media-sound/fluidsynth:= )
143 + mad? ( media-libs/libmad )
144 + net? ( media-libs/sdl-net )
145 + sdl-image? ( media-libs/sdl-image )
146 + pcre? ( dev-libs/libpcre:3 )
147 + png? ( media-libs/libpng:0= )
148 + portmidi? ( media-libs/portmidi )
149 + sdl-mixer? ( media-libs/sdl-mixer[midi] )
150 + vorbis? ( media-libs/libvorbis )"
151 +RDEPEND="${DEPEND}"
152 +
153 +S="${WORKDIR}/prboom-plus-f96f891d068dcc5ec52ed91056b46d27e9a8462d/prboom2"
154 +PATCHES="${FILESDIR}/${P}-Remove-nonstandard-gamesdir-variable.patch"
155 +
156 +src_prepare() {
157 + xdg_src_prepare
158 + eautoreconf
159 +}
160 +
161 +src_configure() {
162 + econf \
163 + --disable-cpu-opt \
164 + $(use_enable nonfree nonfree-graphics) \
165 + $(use_enable opengl gl) \
166 + $(use_with dumb) \
167 + $(use_with fluidsynth) \
168 + $(use_with mad) \
169 + $(use_with net) \
170 + $(use_with pcre) \
171 + $(use_with png) \
172 + $(use_with portmidi) \
173 + $(use_with sdl-image image) \
174 + $(use_with sdl-mixer mixer) \
175 + $(use_with vorbis vorbisfile) \
176 + --with-waddir="${EPREFIX}/usr/share/doom"
177 +}
178 +
179 +src_install() {
180 + default
181 + newicon ICONS/prboom-plus.svg ${PN}.svg
182 + make_desktop_entry "${PN}" "PrBoom+"
183 +}