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-roguelike/dwarf-fortress/files/, games-roguelike/dwarf-fortress/
Date: Sat, 30 Nov 2019 09:58:28
Message-Id: 1575107873.5ad447d42315fbe68d6bea0cd4b798b2a482b073.chewi@gentoo
1 commit: 5ad447d42315fbe68d6bea0cd4b798b2a482b073
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 30 09:57:53 2019 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 30 09:57:53 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad447d4
7
8 games-roguelike/dwarf-fortress: Drop old 0.43.05
9
10 Package-Manager: Portage-2.3.80, Repoman-2.3.17
11 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
12
13 games-roguelike/dwarf-fortress/Manifest | 2 -
14 .../dwarf-fortress/dwarf-fortress-0.43.05.ebuild | 84 ----------------------
15 games-roguelike/dwarf-fortress/files/Makefile | 32 ---------
16 3 files changed, 118 deletions(-)
17
18 diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
19 index 00459266327..c42a144cfc7 100644
20 --- a/games-roguelike/dwarf-fortress/Manifest
21 +++ b/games-roguelike/dwarf-fortress/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST df_43_05_linux.tar.bz2 11580594 BLAKE2B 7157f8ed5f8798a533d992811c804515acc8abb3bb84b25af6905fd6b2338e95879e318bec0dade18f1eba1421d17a781d1da8b49c719988d2cb6d7046b0c3be SHA512 502e6bac0bdd5586fb6b4e1117caf144a0336a7eed3ed9350ec316e4a286e309a15e0738517c0dd7d32f182984c501c7a8756e942d3dde9fb87f72b153f38e7a
24 -DIST df_43_05_linux32.tar.bz2 12158550 BLAKE2B 4c1f5ad834aa0a2b6438b8aaf0b0ad6cfc60656f58845a274ac3d8ad7e09182d7263e3a495d1bff0b1fb5499097569216fac0bc87cff95fc6a85e3211acc297d SHA512 d0446ddb5c37ee45ade36b18b815595e8d7bfd9749af4ecd2f25b45859d797a9da70f2344e2c58544feafc7df06882ade8a10534c37754359747c0d37f084b7c
25 DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B 2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b SHA512 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
26 DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842 SHA512 5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
27
28 diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
29 deleted file mode 100644
30 index 1407c994dea..00000000000
31 --- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
32 +++ /dev/null
33 @@ -1,84 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit versionator toolchain-funcs
40 -
41 -MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
42 -MY_PN=df
43 -MY_P=${MY_PN}_${MY_PV}
44 -
45 -DESCRIPTION="A single-player fantasy game"
46 -HOMEPAGE="http://www.bay12games.com/dwarves"
47 -SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
48 - x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
49 -
50 -LICENSE="free-noncomm BSD BitstreamVera"
51 -SLOT="0"
52 -KEYWORDS="-* ~amd64 ~x86"
53 -IUSE="debug"
54 -
55 -RDEPEND="media-libs/glew:0
56 - media-libs/libsdl[joystick,video]
57 - media-libs/sdl-image[png]
58 - media-libs/sdl-ttf
59 - sys-libs/zlib
60 - virtual/glu
61 - x11-libs/gtk+:2"
62 -# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
63 -# dlopens them at runtime if requested.
64 -DEPEND="${RDEPEND}
65 - media-libs/libsndfile
66 - media-libs/openal
67 - sys-libs/ncurses-compat:5[unicode]
68 - virtual/pkgconfig"
69 -
70 -S=${WORKDIR}/${MY_PN}_linux
71 -
72 -gamesdir="/opt/${PN}"
73 -QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress"
74 -RESTRICT="strip"
75 -
76 -src_prepare() {
77 - rm -f libs/*.so* || die
78 - sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die
79 - default
80 -}
81 -
82 -src_configure() {
83 - tc-export CXX PKG_CONFIG
84 - CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
85 -}
86 -
87 -src_compile() {
88 - emake -f "${FILESDIR}/Makefile.native"
89 - sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die
90 -}
91 -
92 -src_install() {
93 - # install data-files and libs
94 - insinto "${gamesdir}"
95 - doins -r raw data libs
96 -
97 - # install our wrapper
98 - dobin dwarf-fortress
99 -
100 - # install docs
101 - dodoc README.linux *.txt
102 -
103 - fperms 755 "${gamesdir}"/libs/Dwarf_Fortress
104 -}
105 -
106 -pkg_postinst() {
107 - elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
108 - elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
109 - elog "For more information on what exactly is replaced, see /usr/bin/dwarf-fortress."
110 - elog "Note: This means that the primary entry point is /usr/bin/dwarf-fortress."
111 - elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
112 - elog
113 - elog "Optional runtime dependencies:"
114 - elog "Install sys-libs/ncurses[unicode] for [PRINT_MODE:TEXT]"
115 - elog "Install media-libs/openal and media-libs/libsndfile for audio output"
116 - elog "Install media-libs/libsdl[opengl] for the OpenGL PRINT_MODE settings"
117 -}
118
119 diff --git a/games-roguelike/dwarf-fortress/files/Makefile b/games-roguelike/dwarf-fortress/files/Makefile
120 deleted file mode 100644
121 index 856670b6a67..00000000000
122 --- a/games-roguelike/dwarf-fortress/files/Makefile
123 +++ /dev/null
124 @@ -1,32 +0,0 @@
125 -# Copyright 2014-2016 Alex Xu (Hello71)
126 -# Distributed under the terms of the GNU General Public License v2
127 -
128 -PKG_CONFIG ?= pkg-config
129 -PKG_CONFIG_PATH ?= /usr/lib32/pkgconfig:/usr/lib/pkgconfig
130 -PKG_CONFIG := PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG)
131 -
132 -SRCS := g_src/basics.cpp g_src/command_line.cpp g_src/enabler.cpp \
133 - g_src/files.cpp g_src/find_files_posix.cpp g_src/graphics.cpp \
134 - g_src/init.cpp g_src/interface.cpp g_src/keybindings.cpp \
135 - g_src/music_and_sound_openal.cpp g_src/random.cpp g_src/textlines.cpp \
136 - g_src/enabler_input.cpp g_src/KeybindingScreen.cpp \
137 - g_src/win32_compat.cpp g_src/textures.cpp g_src/resize++.cpp \
138 - g_src/renderer_offscreen.cpp g_src/ttf_manager.cpp g_src/ViewBase.cpp
139 -OBJS := $(SRCS:.cpp=.o)
140 -
141 -BLIBS := ncursesw openal sndfile
142 -LIBS := glew glu gtk+-2.0 sdl SDL_image SDL_ttf zlib
143 -CXXFLAGS ?= -O2 -pipe -Wall -Wextra
144 -CXXFLAGS += -m32 $(shell $(PKG_CONFIG) --cflags $(BLIBS) $(LIBS)) -Dunix -Dlinux -fPIC -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
145 -LDLIBS := $(shell $(PKG_CONFIG) --libs $(LIBS))
146 -
147 -LG := libs/libgraphics.so
148 -
149 -all: $(LG)
150 -$(LG): $(OBJS)
151 - $(LINK.cpp) -shared $^ $(LDLIBS) -o $@
152 -
153 -clean:
154 - $(RM) $(LG) $(OBJS)
155 -
156 -.PHONY: clean