Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

games-fps/prboom-plus: Bump to version 2.5.1.5.4540.1 #14612

Closed
wants to merge 2 commits into from

Conversation

vilhelmgray
Copy link
Contributor

The non-free USE flag is removed because non-free assets are no longer
provided in the source tarball. The png USE flag is removed since
sdl2-image provides that functionality now. The sdl-image and sdl-mixer
USE flags are renamed to sdl2-image and sdl2-mixer respectively to match
the use of the matching SDL2 libraries now.

Closes: https://bugs.gentoo.org/703610
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: William Breathitt Gray vilhelm.gray@gmail.com

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @vilhelmgray
Areas affected: ebuilds, other files
Packages affected: games-fps/prboom-plus

games-fps/prboom-plus: @vilhelmgray, @gentoo/proxy-maint, @gentoo/games

Linked bugs

Bugs linked: 703610


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Feb 10, 2020
Comment on lines 5 to 7
PrBoom+ is an enhanced source port of the classic 3D first-person shooter game Doom, first released by id Software in 1993. It uses the Simple Direct Media layer (SDL) library and features an optional OpenGL renderer. It is based on PrBoom, MBF and LxDoom, which in turn are based on TeamTNT's Boom, a freely available port of Doom for DOS.

In addition to PrBoom's features, PrBoom+ offers uncapped framerate, variable gamespeed, re-record, walkcam, chasecam, full mouselook, FOV, and other features without loss of compatibility with the original Doom.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please wrap these long lines to less than 80 characters length?

Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
The non-free USE flag is removed because non-free assets are no longer
provided in the source tarball. The png USE flag is removed since
sdl2-image provides that functionality now. The sdl-image and sdl-mixer
USE flags are renamed to sdl2-image and sdl2-mixer respectively to match
the use of the matching SDL2 libraries now.

Closes: https://bugs.gentoo.org/703610
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Copy link
Member

@ulm ulm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please confirm that GPL-2+ is the main license, and I can fix the other small issues when committing.
(Alternatively, feel free to push an update.)

HOMEPAGE="https://prboom-plus.sourceforge.net"
SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${MY_PV}.orig.tar.xz -> ${P}.tar.xz"

LICENSE="BSD BSD-with-disclosure GPL-2+ LGPL-2.1+ MIT public-domain"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GPL-2+ would still be the main license, right? So it should be listed first.

RDEPEND="${DEPEND}"

S=${WORKDIR}/${MY_P}
PATCHES="${FILESDIR}/${PN}-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PATCHES should be an array, even if it has only one element.

Suggested change
PATCHES="${FILESDIR}/${PN}-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch"
PATCHES=( "${FILESDIR}/${PN}-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch" )

S=${WORKDIR}/${MY_P}
PATCHES="${FILESDIR}/${PN}-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch"

src_prepare(){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks strange without a space before the {.

--with-waddir="${EPREFIX}/usr/share/doom"
}

src_install(){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
# Licenses in this list should NOT appear directly or indirectly in
# @FSF-APPROVED or @OSI-APPROVED.
# Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic ipx-utils Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs xvt ZSH
MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic ipx-utils Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs xvt ZSH
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I agree that this qualifies as a free software license.

@ulm ulm self-assigned this Feb 10, 2020
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2020-02-10 21:07 UTC
Newest commit scanned: 22a7bff
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-admin/abrt
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-admin/consul
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-admin/consul-template
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-admin/fluentd
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-admin/puppet
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-admin/puppet-agent
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-admin/puppetdb
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-admin/puppetserver
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-emulation/ganeti
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-emulation/virtualbox-additions
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-emulation/virtualbox-guest-additions
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-emulation/virtualbox-modules
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-forensics/sleuthkit
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-i18n/tomoe-gtk
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-office/libreoffice-bin-debug
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-shells/bash
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-text/jabref-bin
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-text/jo
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#app-text/vilistextum
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-db/mariadb
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-db/mysql
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-java/gin
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-java/gwt
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-java/icedtea-bin
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-java/netbeans-platform
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-lang/rust
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-libs/gjs
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-python/empy
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-python/pygame
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-ros/roslaunch
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-util/cookiecutter
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-util/diffuse
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-util/jenkins-bin
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#dev-vcs/gitsh
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#games-kids/childsplay
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#games-simulation/flightgear
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#games-strategy/freeciv
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#games-util/pogo-manager-bin
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#gnome-extra/cjs
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#gnustep-apps/sogo
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#mail-filter/spamassassin
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#mate-extra/caja-dropbox
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#media-gfx/gimp
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#media-libs/clutter-gst
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#media-sound/podcatcher
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#media-sound/tunapie
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#media-tv/gentoo-vdr-scripts
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#media-tv/kodi
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#media-tv/plex-media-server
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#media-video/ushare
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/argus
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/fail2ban
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/metasploit
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/nagios-core
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/nmap
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/ntopng
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/snort
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/tcpdump
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/vnstat
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/wireshark
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-analyzer/zabbix
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-dns/bind
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-dns/dnsdist
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-dns/unbound
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-libs/nodejs
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-mail/mailman
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-misc/apt-cacher-ng
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-misc/dhcp
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-misc/kea
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-misc/pulseaudio-dlna
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-misc/youtube-dl
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-nntp/sabnzbd
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-p2p/bisq
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-p2p/deluge
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-p2p/fms
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-print/cups
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-proxy/haproxy
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-proxy/redsocks
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-proxy/squidguard
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-vpn/strongswan
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#net-wireless/kismet
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-chemistry/nmrdepaker
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-electronics/geda-xgsch2pcb
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-electronics/kicad
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-libs/nlopt
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-libs/parmetis
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-libs/tensorflow
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-libs/tensorflow-estimator
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-mathematics/geogebra
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-mathematics/normaliz
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sci-visualization/pythonprop
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-apps/entropy
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-auth/nss-pam-ldapd
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-cluster/cinder
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-cluster/crmsh
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-cluster/glusterfs
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-cluster/kube-apiserver
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-cluster/kube-controller-manager
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-cluster/kube-scheduler
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-fs/tmsu
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#sys-power/nut
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#virtual/jdk
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#virtual/jre
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#www-apps/cgit
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#www-apps/grafana-bin
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#www-apps/netbox
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#www-apps/postfixadmin
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#www-apps/trac
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#www-misc/shellinabox
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#www-misc/xxv
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#www-servers/nginx
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#x11-misc/dzen
https://qa-reports.gentoo.org/output/gentoo-ci/a25e5f9/output.html#x11-wm/xpra

@vilhelmgray
Copy link
Contributor Author

vilhelmgray commented Feb 11, 2020

Please confirm that GPL-2+ is the main license, and I can fix the other small issues when committing.
(Alternatively, feel free to push an update.)

Yes the main license is GPL-2+, with the other licenses being from code pulled in from other projects I believe. The respective prboom-plus Debian package conveniently provides an encompassing list of the copyrights found in the source tarball: https://metadata.ftp-master.debian.org/changelogs//main/p/prboom-plus/prboom-plus_2.5.1.5+svn4540+dfsg1-1_copyright

Since these are minor issues, please go ahead and fix them when you commit. Thank you. :-)

@ulm
Copy link
Member

ulm commented Feb 11, 2020

Merged, with the discussed updates applied.

@ulm ulm closed this Feb 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
4 participants