[gentoo-commits] repo/gentoo:master commit in: games-action/wordwarvi/
commit: 4199179f0d5134613838d3f2a746721f50df20ac
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri Dec 29 21:17:46 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Dec 31 02:46:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4199179f
games-action/wordwarvi: EAPI8 bump, fix bug #910281
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://bugs.gentoo.org/910281
Closes: https://github.com/gentoo/gentoo/pull/34549
Signed-off-by: Conrad Kostecki gentoo.org>
games-action/wordwarvi/wordwarvi-1.00-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
index 44004a19afbe..675a8a0027f4 100644
--- a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
+++ b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop toolchain-funcs
-DESCRIPTION="retro side-scrolling shoot'em up based on the editor war story"
+DESCRIPTION="Retro side-scrolling shoot'em up based on the editor war story"
HOMEPAGE="https://wordwarvi.sourceforge.net;
SRC_URI="mirror://sourceforge/wordwarvi/${P}.tar.gz"
@@ -40,7 +40,7 @@ src_prepare() {
}
src_compile() {
- tc-export CC PKG_CONFIG
+ tc-export BUILD_CC CC PKG_CONFIG
emake \
PREFIX="/usr" \
[gentoo-commits] repo/gentoo:master commit in: games-action/wordwarvi/files/
commit: 1aaf63d00bfcc31812d78ab2d47747623f8d384b
Author: Sam James gentoo org>
AuthorDate: Mon Apr 19 20:50:50 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 19 20:54:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aaf63d0
games-action/wordwarvi: improve original pkg-config patch
May as well fix up the original patch while here to respect
${PKG_CONFIG} in all references.
Signed-off-by: Sam James gentoo.org>
.../wordwarvi/files/wordwarvi-1.00-sound.patch | 46 +++---
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
index a0a6db3a222..1f0fdb255d3 100644
--- a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
+++ b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
@@ -1,3 +1,5 @@
+diff --git a/Makefile b/Makefile
+index faf7e8f..2c06010 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
@@ -7,7 +9,18 @@
MANDIR?=${PREFIX}/share/man
MANPAGEDIR=${MANDIR}/man6
-@@ -24,18 +24,6 @@
+@@ -12,8 +12,8 @@ WITHAUDIO=yes
+ # WITHAUDIO=no
+
+ ifeq (${WITHAUDIO},yes)
+-SNDLIBS=`pkg-config --libs portaudio-2.0 vorbisfile`
+-SNDFLAGS=-DWITHAUDIOSUPPORT `pkg-config --cflags portaudio-2.0`
++SNDLIBS=`${PKG_CONFIG} --libs portaudio-2.0 vorbisfile`
++SNDFLAGS=-DWITHAUDIOSUPPORT `${PKG_CONFIG} --cflags portaudio-2.0`
+ OGGOBJ=ogg_to_pcm.o
+ else
+ SNDLIBS=
+@@ -24,53 +24,41 @@ endif
CC ?= gcc
BUILD_CC ?= gcc
@@ -26,7 +39,19 @@
DEFINES=${SNDFLAGS} -DDATADIR=\"${DATADIR}/\"
all: wordwarvi wordwarvi.6.gz
-@@ -53,24 +41,24 @@
+
+ HAS_PORTAUDIO_2_0:
+ ifeq (${WITHAUDIO},yes)
+- pkg-config --print-errors --exists portaudio-2.0
++ ${PKG_CONFIG} --print-errors --exists portaudio-2.0
+ else
+ endif
+
+ HAS_VORBISFILE:
+ ifeq (${WITHAUDIO},yes)
+- pkg-config --print-errors --exists vorbisfile
++ ${PKG_CONFIG} --print-errors --exists vorbisfile
+ else
endif
joystick.o: joystick.c joystick.h Makefile
@@ -42,7 +67,8 @@
- $(CC) -Wall ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} \
+ $(CC) -Wall ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} \
${DEFINES} \
- -pthread `pkg-config --cflags vorbisfile` \
+- -pthread `pkg-config --cflags vorbisfile` \
++ -pthread `${PKG_CONFIG} --cflags vorbisfile` \
-c wwviaudio.c
rumble.o: rumble.c rumble.h Makefile
@@ -56,7 +82,7 @@
stamp:stamp.c
$(BUILD_CC) -o stamp stamp.c
-@@ -78,7 +66,7 @@
+@@ -78,14 +66,14 @@ stamp: stamp.c
wordwarvi:wordwarvi.c joystick.o rumble.o ${OGGOBJ} wwviaudio.o
wwvi_font.o \
Makefile version.h stamp levels.h rumble.h
./stamp > stamp.h
@@ -65,9 +91,19 @@
joystick.o \
rumble.o \
wwvi_font.o \
+ ${OGGOBJ} \
+ wwviaudio.o \
+ wordwarvi.c -o wordwarvi -lm ${SNDLIBS} \
+- `pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0
gthread-2.0`
++ `${PKG_CONFIG} --cflags gtk+-2.0` `${PKG_CONFIG} --libs
gtk+-2.0 gthread-2.0`
+ /bin/rm stamp.h
+
+ wordwarvi.6.gz: wordwarvi.6
+diff --git a/wwviaudio.c b/wwviaudio.c
+index ad79d96..dca0cb4 100644
--- a/wwviaudio.c
+++ b/wwviaudio.c
-@@ -121,7 +121,7 @@
+@@ -121,7 +121,7 @@ int wwviaudio_read_ogg_clip(int clipnum, char *filename)
if (clipnum >= max_sound_clips || clipnum < 0)
return -1;
[gentoo-commits] repo/gentoo:master commit in: games-action/wordwarvi/
commit: 89c76b15da5d68a9b8c47dc21c73eaf0d5f06a6a
Author: Sam James gentoo org>
AuthorDate: Mon Apr 19 20:51:52 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 19 20:54:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c76b15
games-action/wordwarvi: port to EAPI 7
Signed-off-by: Sam James gentoo.org>
games-action/wordwarvi/wordwarvi-1.00-r1.ebuild | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
index 1519e3ec8cc..c1a147a7c01 100644
--- a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
+++ b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit desktop toolchain-funcs
@@ -14,11 +14,15 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="portaudio"
-RDEPEND="x11-libs/gtk+:2
- portaudio? ( media-libs/libvorbis
- >=media-libs/portaudio-19_pre1 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="
+ x11-libs/gtk+:2
+ portaudio? (
+ media-libs/libvorbis
+ >=media-libs/portaudio-19_pre1
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-sound.patch
[gentoo-commits] repo/gentoo:master commit in: games-action/wordwarvi/
commit: 9092ad1846891e8618b20bd6097c05d4a329fffe
Author: Sam James gentoo org>
AuthorDate: Mon Apr 19 20:48:25 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 19 20:54:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9092ad18
games-action/wordwarvi: respect CC
Closes: https://bugs.gentoo.org/784227
Signed-off-by: Sam James gentoo.org>
games-action/wordwarvi/wordwarvi-1.00-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
index da2395b0216..1519e3ec8cc 100644
--- a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
+++ b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
}
src_compile() {
- tc-export PKG_CONFIG
+ tc-export CC PKG_CONFIG
emake \
PREFIX="/usr" \
[gentoo-commits] repo/gentoo:master commit in: games-action/wordwarvi/
commit: 9542d023f529c45b8bfe6e30c38519afd4fff210 Author: Marty E. Plummer startmail com> AuthorDate: Thu Aug 2 23:35:17 2018 + Commit: Michał Górny gentoo org> CommitDate: Wed Aug 15 10:33:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9542d023 games-action/wordwarvi: eutils->desktop Only has eutils for the implicit desktop inheritance for make_desktop_entry and newicon. Package-Manager: Portage-2.3.44, Repoman-2.3.10 games-action/wordwarvi/wordwarvi-1.00-r1.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild index df7ee9102eb..096c489f0c6 100644 --- a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild +++ b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils + +inherit desktop DESCRIPTION="A retro side-scrolling shoot'em up based on the editor war story" HOMEPAGE="http://wordwarvi.sourceforge.net;
[gentoo-commits] repo/gentoo:master commit in: games-action/wordwarvi/
commit: c0e216403830d361b699643b6d6f0555c840d23c
Author: Austin English gentoo org>
AuthorDate: Tue Jan 31 00:22:46 2017 +
Commit: Austin English gentoo org>
CommitDate: Tue Jan 31 00:59:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e21640
games-action/wordwarvi: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: Portage-2.3.2, Repoman-2.3.1
games-action/wordwarvi/wordwarvi-1.00-r1.ebuild | 60 +
1 file changed, 60 insertions(+)
diff --git a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
new file mode 100644
index ..1d6096e
--- /dev/null
+++ b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A retro side-scrolling shoot'em up based on the editor war story"
+HOMEPAGE="http://wordwarvi.sourceforge.net;
+SRC_URI="mirror://sourceforge/wordwarvi/${P}.tar.gz"
+
+LICENSE="GPL-2 CC-BY-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portaudio"
+
+RDEPEND="x11-libs/gtk+:2
+ portaudio? ( media-libs/libvorbis
+ >=media-libs/portaudio-19_pre1 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-sound.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "/^WITHAUDIO/s/yes/$(use portaudio && echo yes || echo no)/"
\
+ Makefile || die
+ sed -i \
+ -e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
+ wwviaudio.c || die
+}
+
+src_compile() {
+ emake \
+ PREFIX="/usr" \
+ DATADIR="/usr/share/${PN}" \
+ MANDIR="/usr/share/man"
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ PREFIX="/usr" \
+ DATADIR="/usr/share/${PN}" \
+ MANDIR="/usr/share/man" \
+ install
+
+ if ! use portaudio ; then
+ rm -rf "${D}/usr/share" || die
+ fi
+
+ dodoc README AUTHORS changelog.txt AAA_HOW_TO_MAKE_NEW_LEVELS.txt
+ newicon icons/wordwarvi_icon_128x128.png ${PN}.png
+ make_desktop_entry ${PN} "Word War vi"
+}
