[gentoo-commits] repo/gentoo:master commit in: games-roguelike/dwarf-fortress/files/, games-roguelike/dwarf-fortress/
commit: 1f452038d6b0f5b676e3d933d40f2fd5a797c576
Author: Finn Rayment rayment fr>
AuthorDate: Wed Aug 24 04:22:13 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Oct 9 12:08:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f452038
games-roguelike/dwarf-fortress: Added gui? USE flag and removed hard dep.
GTK was required for runtime but was only used for a single fullscreen
dialog prompt when the config [WINDOWED:PROMPT].
Now, if libgraphics is compiled without using GTK, the game will not ask
at all if run from a window manager, but instead open in windowed mode.
However, if the game is run from a terminal, a simple scanf procedure
will ask the user for yes/no before deciding.
Signed-off-by: Finn Rayment rayment.fr>
Bug: https://bugs.gentoo.org/856685
Signed-off-by: James Le Cuirot gentoo.org>
05.ebuild => dwarf-fortress-0.47.05-r1.ebuild} | 7 +-
.../dwarf-fortress/files/Makefile.native | 9 +-
.../files/dwarf-fortress-0.47.05-nogtk.patch | 119 +
.../dwarf-fortress-0.47.05-segfault-fixes.patch| 16 ++-
4 files changed, 143 insertions(+), 8 deletions(-)
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05-r1.ebuild
similarity index 94%
rename from games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
rename to games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05-r1.ebuild
index dac5c1c75c94..09f1a0c25b24 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/df_linux"
LICENSE="free-noncomm BSD BitstreamVera"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
-IUSE="debug"
+IUSE="debug gui"
RDEPEND="
dev-libs/glib:2
@@ -29,7 +29,7 @@ RDEPEND="
media-libs/sdl-ttf
sys-libs/zlib:=
virtual/glu
- x11-libs/gtk+:2"
+ gui? ( x11-libs/gtk+:2 )"
# libsndfile, openal and ncurses are only needed at compile-time,
# optfeature through dlopen() at runtime if requested
DEPEND="
@@ -44,6 +44,7 @@ QA_PREBUILT="opt/${PN}/libs/Dwarf_Fortress"
PATCHES=(
"${FILESDIR}"/${P}-missing-cmath.patch
"${FILESDIR}"/${P}-ncurses6.patch
+ "${FILESDIR}"/${P}-nogtk.patch
"${FILESDIR}"/${P}-segfault-fixes.patch
)
@@ -60,7 +61,7 @@ src_compile() {
# -DDEBUG is recognized to give additional debug output
append-cppflags -D$(usev !debug N)DEBUG
- emake -f "${FILESDIR}"/Makefile.native
+ emake -f "${FILESDIR}"/Makefile.native HAVE_GTK=$(usex gui 1 0)
}
src_install() {
diff --git a/games-roguelike/dwarf-fortress/files/Makefile.native
b/games-roguelike/dwarf-fortress/files/Makefile.native
index 85383e5e2f1d..d22fb03f4694 100644
--- a/games-roguelike/dwarf-fortress/files/Makefile.native
+++ b/games-roguelike/dwarf-fortress/files/Makefile.native
@@ -1,6 +1,8 @@
# Copyright 2014-2016 Alex Xu (Hello71)
# Distributed under the terms of the GNU General Public License v2
+HAVE_GTK ?= 1
+
SRCS := g_src/basics.cpp g_src/command_line.cpp g_src/enabler.cpp \
g_src/files.cpp g_src/find_files_posix.cpp g_src/graphics.cpp \
g_src/init.cpp g_src/interface.cpp g_src/keybindings.cpp \
@@ -11,7 +13,12 @@ SRCS := g_src/basics.cpp g_src/command_line.cpp
g_src/enabler.cpp \
OBJS := $(SRCS:.cpp=.o)
BLIBS := ncursesw openal sndfile
-LIBS := glew glu gtk+-2.0 sdl SDL_image SDL_ttf zlib
+
+LIBS := glew glu sdl SDL_image SDL_ttf zlib
+ifeq ($(HAVE_GTK),1)
+LIBS += gtk+-2.0
+endif
+
CXXFLAGS ?= -O2 -pipe -Wall -Wextra
CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(BLIBS) $(LIBS)) -Dunix -Dlinux
-fPIC -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
LDLIBS := $(shell $(PKG_CONFIG) --libs $(LIBS))
diff --git
a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-nogtk.patch
b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-nogtk.patch
new file mode 100644
index ..7702362b4a69
--- /dev/null
+++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-nogtk.patch
@@ -0,0 +1,119 @@
+Removes hard dependency on GTK in favour of stdin calls.
+
+--- a/g_src/KeybindingScreen.cpp
b/g_src/KeybindingScreen.cpp
+@@ -1,7 +1,9 @@
+ #ifdef __APPLE__
+ # include "osx_messagebox.h"
+ #elif defined(unix)
+-# include
++# ifdef HAVE_GTK
++# include
++# endif
+ #endif
+
+ #include "GL/glew.h"
+--- a/g_src/enabler.cpp
b/g_src/enabler.cpp
+@@ -1,7 +1,9 @@
+ #ifdef __APPLE__
+ # include "osx_messagebox.h"
+ #elif defined(unix)
+-# include
++# ifdef HAVE_GTK
++# include
++# endif
+ #endif
+
+ #include
+@@ -713,7 +715,7 @@ int main (int argc, char* argv[]) {
+ #ifdef unix
+ setlocale(LC_ALL, "");
+ #endif
+-#if !defined(__APPLE__) && defined(unix)
++#if !defined(__APPLE__) && defined(unix) && defined(HAVE_GTK)
+ bool gtk_ok = false;
+ if (getenv("DISPLAY"))
+ gtk_ok = gtk_init_check(, );
+@@
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/dwarf-fortress/files/, games-roguelike/dwarf-fortress/
commit: 97a24df3591ca7bebd0fcd189e1da5f16240715c
Author: Joshua Goins redstrate com>
AuthorDate: Tue Jun 28 23:57:28 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jul 6 08:37:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a24df3
games-roguelike/dwarf-fortress: add 0.47.05
Signed-off-by: Joshua Goins redstrate.com>
Co-authored-by: Sven Eusewig yahoo.de>
Co-authored-by: Wolfgang E. Sanyer gmail.com>
Closes: https://bugs.gentoo.org/703384
Closes: https://bugs.gentoo.org/703386
Closes: https://bugs.gentoo.org/717752
Closes: https://bugs.gentoo.org/729002
Signed-off-by: Ionen Wolkens gentoo.org>
games-roguelike/dwarf-fortress/Manifest| 2 +
.../dwarf-fortress/dwarf-fortress-0.47.05.ebuild | 97 ++
.../files/dwarf-fortress-0.47.05-fix-cmath.patch | 11 +++
...warf-fortress-0.47.05-segfault-fix-729002.patch | 49 +++
4 files changed, 159 insertions(+)
diff --git a/games-roguelike/dwarf-fortress/Manifest
b/games-roguelike/dwarf-fortress/Manifest
index c42a144cfc72..f7f5a8d0f1fa 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,2 +1,4 @@
DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B
2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b
SHA512
03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B
bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842
SHA512
5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
+DIST df_47_05_linux.tar.bz2 12725420 BLAKE2B
80987f05de2db2796a53cc8767ee7aa5c78674dff725efc0dafe07dc4118e56c7814cbf92507fe9b76a385e182405c7d6759cb6bcc942385110df1dc1a3b3af4
SHA512
9ea46fa12a80266cd09363f1aea8cdd059a5ebeefb453c4a46ffbb1115486409003c3caca95a1b6010da4040d04b781182c59e57a6cc033cd7de4507299f7534
+DIST df_47_05_linux32.tar.bz2 13487455 BLAKE2B
be604dd2fd480c5609da801013dfdae26964760c0a92c4b3d2d8369800eee7ca9c1b1c2313cc67357feee3c6d425bf7f9f67cab53d2e771ab59055bc4c3329d0
SHA512
e9b9cf6995c24b403347159a35cfe4b57603bdb777c78639beb2799d9bf31317edec54fb92b17dbb90df6001b905d43285a35e9446768d12a746492b2fd34fe7
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
new file mode 100644
index ..8df73a95939f
--- /dev/null
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit prefix optfeature toolchain-funcs desktop readme.gentoo-r1
+
+MY_PV=$(ver_rs 1- _ "$(ver_cut 2-)")
+MY_P=df_${MY_PV}
+
+DESCRIPTION="A single-player fantasy game"
+HOMEPAGE="https://www.bay12games.com/dwarves;
+SRC_URI="amd64? ( https://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
+ x86? ( https://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
+S="${WORKDIR}"/df_linux
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-cmath.patch"
+ "${FILESDIR}/${P}-segfault-fix-729002.patch"
+)
+
+LICENSE="free-noncomm BSD BitstreamVera"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="media-libs/glew:0=
+ media-libs/libsdl[joystick,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-ttf
+ sys-libs/zlib:=
+ virtual/glu
+ x11-libs/gtk+:2"
+# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
+# dlopens them at runtime if requested.
+DEPEND="${RDEPEND}
+ media-libs/libsndfile
+ media-libs/openal
+ sys-libs/ncurses-compat:5[unicode]
+ virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
+
+QA_PREBUILT="/opt/${PN}/libs/Dwarf_Fortress"
+
+DOC_CONTENTS="Dwarf Fortress has been installed to /opt/${PN}. This is
+ symlinked to ~/.dwarf-fortress when dwarf-fortress is run.
+ For more information on what exactly is replaced, see
${EROOT}/usr/bin/dwarf-fortress.
+ Note: This means that the primary entry point is
${EROOT}/usr/bin/dwarf-fortress.
+ Do not run /opt/${PN}/libs/Dwarf_Fortress."
+
+src_prepare() {
+ # fix line endings so the patches can apply properly
+ sed -i \
+ -e 's/\r$//' \
+ g_src/ttf_manager.cpp \
+ g_src/music_and_sound_openal.cpp \
+ || die
+
+ default
+
+ # dwarf fortress includes prebuilt libraries such as libstdc++ we won't
use
+ rm -f libs/*.so* || die
+}
+
+src_configure() {
+ hprefixify "${WORKDIR}/dwarf-fortress"
+
+ CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
+}
+
+src_compile() {
+ tc-export CXX PKG_CONFIG
+
+ emake
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/dwarf-fortress/files/, games-roguelike/dwarf-fortress/
commit: 076b3ec1fa47159e7addff734dd752f536f654e2
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jul 6 07:19:08 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jul 6 08:37:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076b3ec1
games-roguelike/dwarf-fortress: fix text mode, use ncurses-6
ncurses-compat doesn't work in DEPEND given it installs no headers,
and then it went and built against ncurses-6 then tried to load
ncurses-5 which unsurprisingly fails.
Seems to work with 6, but haven't tested much (better than entirely
broken either way).
Signed-off-by: Ionen Wolkens gentoo.org>
.../dwarf-fortress/dwarf-fortress-0.47.05.ebuild | 5 +++--
.../files/dwarf-fortress-0.47.05-ncurses6.patch| 22 ++
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
index e94ca7db6dd6..dac5c1c75c94 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
@@ -36,13 +36,14 @@ DEPEND="
${RDEPEND}
media-libs/libsndfile
media-libs/openal
- sys-libs/ncurses-compat:5[unicode]"
+ sys-libs/ncurses"
BDEPEND="virtual/pkgconfig"
QA_PREBUILT="opt/${PN}/libs/Dwarf_Fortress"
PATCHES=(
"${FILESDIR}"/${P}-missing-cmath.patch
+ "${FILESDIR}"/${P}-ncurses6.patch
"${FILESDIR}"/${P}-segfault-fixes.patch
)
@@ -87,6 +88,6 @@ src_install() {
pkg_postinst() {
readme.gentoo_print_elog
- optfeature "text PRINT_MODE" sys-libs/ncurses-compat:5[unicode]
+ optfeature "text PRINT_MODE" sys-libs/ncurses
optfeature "audio output" "media-libs/openal
media-libs/libsndfile[-minimal]"
}
diff --git
a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-ncurses6.patch
b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-ncurses6.patch
new file mode 100644
index ..dda54296d06f
--- /dev/null
+++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-ncurses6.patch
@@ -0,0 +1,22 @@
+Gentoo does not have ncurses5 headers anymore, and this fails with 6
+when using wattrset that it currently expects to be a macro.
+--- a/g_src/curses.h
b/g_src/curses.h
+@@ -9,2 +9,5 @@
+ #else
++# ifndef NCURSES_WATTR_MACROS
++# define NCURSES_WATTR_MACROS 1
++# endif
+ # include
+--- a/g_src/renderer_curses.cpp
b/g_src/renderer_curses.cpp
+@@ -296,3 +296,3 @@
+ // We prefer libncursesw, but we'll accept libncurses if we have to
+- handle = dlopen("libncursesw.so.5", RTLD_LAZY);
++ handle = dlopen("libncursesw.so.6", RTLD_LAZY);
+ if (handle) goto opened;
+@@ -304,3 +304,3 @@
+ if (handle) goto opened;
+- handle = dlopen("libncurses.so.5", RTLD_LAZY);
++ handle = dlopen("libncurses.so.6", RTLD_LAZY);
+ if (handle) goto opened;
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/dwarf-fortress/files/, games-roguelike/dwarf-fortress/
commit: 3144840d8387b9c7f8b60c6381ad9c0060878296
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jul 6 06:27:56 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jul 6 08:37:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3144840d
games-roguelike/dwarf-fortress: misc ebuild adjustments
No fundamental changes, but some extras for the accumulated PR:
- adjust patches (scrubbed, fixed some malformation wrt missing files
headers and a blank line, and included right line terminators so
sed/dos2unix isn't needed)
- added basic icon for .desktop
- remove duplicate pkgconfig DEPEND (only needed in BDEPEND)
- add missing quotes for dobin's FILESDIR
- use prefixify_ro, failed to hprefixify as it did not exist in WORKDIR
- move DOC_CONTENTS to src_install and respect variable scope
- add libglvnd[X] and glib:2 to RDEPEND (injected by pkg-config)
- make libsdl[opengl] unconditional, don't see much worth as optfeature
given currently need GL libraries either way
(could argue audio may well be unconditional too, but left alone)
- add [-minimal] to libsndfile optfeature or it gives confusing
"not found" errors
- further misc style adjustments
Thanks to everyone that worked on this.
Signed-off-by: Ionen Wolkens gentoo.org>
games-roguelike/dwarf-fortress/Manifest| 1 +
.../dwarf-fortress/dwarf-fortress-0.47.05.ebuild | 95 ++
... => dwarf-fortress-0.47.05-missing-cmath.patch} | 11 +--
...=> dwarf-fortress-0.47.05-segfault-fixes.patch} | 65 ++-
4 files changed, 77 insertions(+), 95 deletions(-)
diff --git a/games-roguelike/dwarf-fortress/Manifest
b/games-roguelike/dwarf-fortress/Manifest
index 8b96ead81a7a..84e82c2074f3 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,2 +1,3 @@
DIST df_47_05_linux.tar.bz2 12725420 BLAKE2B
80987f05de2db2796a53cc8767ee7aa5c78674dff725efc0dafe07dc4118e56c7814cbf92507fe9b76a385e182405c7d6759cb6bcc942385110df1dc1a3b3af4
SHA512
9ea46fa12a80266cd09363f1aea8cdd059a5ebeefb453c4a46ffbb1115486409003c3caca95a1b6010da4040d04b781182c59e57a6cc033cd7de4507299f7534
DIST df_47_05_linux32.tar.bz2 13487455 BLAKE2B
be604dd2fd480c5609da801013dfdae26964760c0a92c4b3d2d8369800eee7ca9c1b1c2313cc67357feee3c6d425bf7f9f67cab53d2e771ab59055bc4c3329d0
SHA512
e9b9cf6995c24b403347159a35cfe4b57603bdb777c78639beb2799d9bf31317edec54fb92b17dbb90df6001b905d43285a35e9446768d12a746492b2fd34fe7
+DIST dwarf-fortress.png 271 BLAKE2B
cbc14917de1556b25d3817298215beedc4cb01075b8454e38b2d314bdf22f8c20c4bf2332f0d731c7e4c6d6a60056361565221ce3db2c7a15fdf934bff01df54
SHA512
08bdc0e084f861b6e6a8b12e3bc93b9703f2a4cbc133d62d1c2931daf81ccd70b728853d5c05bed19a1ef477cf4ad10fce263bbab7d9cad3b60658f17063acf6
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
index 8df73a95939f..e94ca7db6dd6 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.47.05.ebuild
@@ -3,95 +3,90 @@
EAPI=8
-inherit prefix optfeature toolchain-funcs desktop readme.gentoo-r1
+inherit desktop flag-o-matic optfeature prefix readme.gentoo-r1 toolchain-funcs
-MY_PV=$(ver_rs 1- _ "$(ver_cut 2-)")
-MY_P=df_${MY_PV}
+MY_P="df_$(ver_rs 1- _ $(ver_cut 2-))"
-DESCRIPTION="A single-player fantasy game"
-HOMEPAGE="https://www.bay12games.com/dwarves;
-SRC_URI="amd64? ( https://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
- x86? ( https://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
-S="${WORKDIR}"/df_linux
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-cmath.patch"
- "${FILESDIR}/${P}-segfault-fix-729002.patch"
-)
+DESCRIPTION="Single-player fantasy game"
+HOMEPAGE="https://www.bay12games.com/dwarves/;
+SRC_URI="
+ amd64? ( https://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
+ x86? ( https://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )
+ https://dev.gentoo.org/~ionen/distfiles/${PN}.png;
+S="${WORKDIR}/df_linux"
LICENSE="free-noncomm BSD BitstreamVera"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
IUSE="debug"
-RDEPEND="media-libs/glew:0=
- media-libs/libsdl[joystick,video]
+RDEPEND="
+ dev-libs/glib:2
+ media-libs/glew:0=
+ media-libs/libglvnd[X]
+ media-libs/libsdl[joystick,opengl,video]
media-libs/sdl-image[png]
media-libs/sdl-ttf
sys-libs/zlib:=
virtual/glu
x11-libs/gtk+:2"
-# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
-# dlopens them at runtime if requested.
-DEPEND="${RDEPEND}
+# libsndfile, openal and ncurses are only needed at compile-time,
+# optfeature through dlopen() at runtime if requested
+DEPEND="
+ ${RDEPEND}
media-libs/libsndfile
media-libs/openal
- sys-libs/ncurses-compat:5[unicode]
- virtual/pkgconfig"
+
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/dwarf-fortress/files/, games-roguelike/dwarf-fortress/
commit: 5ad447d42315fbe68d6bea0cd4b798b2a482b073
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Nov 30 09:57:53 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Nov 30 09:57:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad447d4
games-roguelike/dwarf-fortress: Drop old 0.43.05
Package-Manager: Portage-2.3.80, Repoman-2.3.17
Signed-off-by: James Le Cuirot gentoo.org>
games-roguelike/dwarf-fortress/Manifest| 2 -
.../dwarf-fortress/dwarf-fortress-0.43.05.ebuild | 84 --
games-roguelike/dwarf-fortress/files/Makefile | 32 -
3 files changed, 118 deletions(-)
diff --git a/games-roguelike/dwarf-fortress/Manifest
b/games-roguelike/dwarf-fortress/Manifest
index 00459266327..c42a144cfc7 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,4 +1,2 @@
-DIST df_43_05_linux.tar.bz2 11580594 BLAKE2B
7157f8ed5f8798a533d992811c804515acc8abb3bb84b25af6905fd6b2338e95879e318bec0dade18f1eba1421d17a781d1da8b49c719988d2cb6d7046b0c3be
SHA512
502e6bac0bdd5586fb6b4e1117caf144a0336a7eed3ed9350ec316e4a286e309a15e0738517c0dd7d32f182984c501c7a8756e942d3dde9fb87f72b153f38e7a
-DIST df_43_05_linux32.tar.bz2 12158550 BLAKE2B
4c1f5ad834aa0a2b6438b8aaf0b0ad6cfc60656f58845a274ac3d8ad7e09182d7263e3a495d1bff0b1fb5499097569216fac0bc87cff95fc6a85e3211acc297d
SHA512
d0446ddb5c37ee45ade36b18b815595e8d7bfd9749af4ecd2f25b45859d797a9da70f2344e2c58544feafc7df06882ade8a10534c37754359747c0d37f084b7c
DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B
2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b
SHA512
03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B
bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842
SHA512
5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
deleted file mode 100644
index 1407c994dea..000
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator toolchain-funcs
-
-MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
-MY_PN=df
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="A single-player fantasy game"
-HOMEPAGE="http://www.bay12games.com/dwarves;
-SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
- x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
-
-LICENSE="free-noncomm BSD BitstreamVera"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="media-libs/glew:0
- media-libs/libsdl[joystick,video]
- media-libs/sdl-image[png]
- media-libs/sdl-ttf
- sys-libs/zlib
- virtual/glu
- x11-libs/gtk+:2"
-# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
-# dlopens them at runtime if requested.
-DEPEND="${RDEPEND}
- media-libs/libsndfile
- media-libs/openal
- sys-libs/ncurses-compat:5[unicode]
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}_linux
-
-gamesdir="/opt/${PN}"
-QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress"
-RESTRICT="strip"
-
-src_prepare() {
- rm -f libs/*.so* || die
- sed -i -e '1i#include ' g_src/ttf_manager.cpp || die
- default
-}
-
-src_configure() {
- tc-export CXX PKG_CONFIG
- CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
-}
-
-src_compile() {
- emake -f "${FILESDIR}/Makefile.native"
- sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:"
"${FILESDIR}/dwarf-fortress" > dwarf-fortress || die
-}
-
-src_install() {
- # install data-files and libs
- insinto "${gamesdir}"
- doins -r raw data libs
-
- # install our wrapper
- dobin dwarf-fortress
-
- # install docs
- dodoc README.linux *.txt
-
- fperms 755 "${gamesdir}"/libs/Dwarf_Fortress
-}
-
-pkg_postinst() {
- elog "System-wide Dwarf Fortress has been installed to ${gamesdir}.
This is"
- elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
- elog "For more information on what exactly is replaced, see
/usr/bin/dwarf-fortress."
- elog "Note: This means that the primary entry point is
/usr/bin/dwarf-fortress."
- elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
- elog
- elog "Optional runtime dependencies:"
- elog "Install sys-libs/ncurses[unicode] for [PRINT_MODE:TEXT]"
- elog "Install media-libs/openal and
