summaryrefslogtreecommitdiff
path: root/games-roguelike
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-02-16 12:59:29 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-02-16 12:59:29 +0000
commit79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
treeade7cb031f363fad64c77139dea7aa3d81908537 /games-roguelike
parent6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)
gentoo resync : 16.02.1018
Diffstat (limited to 'games-roguelike')
-rw-r--r--games-roguelike/Manifest.gzbin3222 -> 3222 bytes
-rw-r--r--games-roguelike/moria/Manifest3
-rw-r--r--games-roguelike/moria/files/moria-5.7.10-tinfo.patch24
-rw-r--r--games-roguelike/moria/moria-5.7.10.ebuild5
-rw-r--r--games-roguelike/stone-soup/Manifest7
-rw-r--r--games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch45
-rw-r--r--games-roguelike/stone-soup/metadata.xml4
-rw-r--r--games-roguelike/stone-soup/stone-soup-0.22.0.ebuild4
-rw-r--r--games-roguelike/stone-soup/stone-soup-0.23.0.ebuild2
9 files changed, 82 insertions, 12 deletions
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index b931b9892040..97df5b4f6609 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
Binary files differ
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index d7d997b0dd72..d799b8ad9c32 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -1,5 +1,6 @@
AUX moria-5.7.10-gentoo-paths.patch 1823 BLAKE2B 74ae8ba961a1dbd0ee42426d0cbae960a35175e5dea792ac5930524e78b6382f9e52c629bb30c02c64e31a42374b7c0c20f7ab6fb5cea9045eb0bf9f04c384d8 SHA512 8c03251777e230fe60751a107864da5c06aea6a4aa4fe8daf4373bc18dce672d1e798163837587992ef85107dd3e838d38e2d033bb7eec85be8a928cd74beed0
+AUX moria-5.7.10-tinfo.patch 700 BLAKE2B da5668f85f1e83af86332ced8d6f76d2cc16ea20fc8b2c4713fc375222c13a3d1d44ef1aaa88a7206ad831813b257a2ef8b780d8803375ad34a08327a1eea5eb SHA512 89003bf4c7a6a416817a017ca332c7e0a9dea6d4abc849fb61381e5382975c37aa0025cb9301e2a1e2ed4a9c4463bcf64e49c1d48fddf37f4bd71988d76ba0ab
AUX moria.6 2996 BLAKE2B ee20dc08b849eccf3860736b401a500f50598c340c0098d6cd820eb65ecbe13467b09ef23ab4982204b394ca8e0ef644bfbff4c8dd9df07ff15cb2b635d6af5e SHA512 54d4914f4c9bf364ef8539079d0a3cf91257309a479818e106c5ee41bbf2dab608074988d12529fd726e4cafd5c48baed4793f32a2a254593a928c5b6d1b9bd5
DIST moria-5.7.10.tar.gz 392842 BLAKE2B 6b1f372d2c5503c708428b119e2c0333d3134eab3bd76ad8453ee062764b41d9dccca31c1512bd9561b5ba48b59dac32a447bb058c26c1cd9595cdc2e06cb9fc SHA512 f81754f03ae36ab5a8737fb0ae18da422b87da8684d00c88c934afa2c0b42e429c23a475751c506b499f809a421d1d3dfcc729e0d64d901b2e6c74e444d0f06f
-EBUILD moria-5.7.10.ebuild 1355 BLAKE2B b4907bc61114ce79205100f46669969349bef1e5becd8309ceb6eac04d33b4c06f4490da09415d0bee01abbaea957f664c36a4b166808472735ca5945cae00f8 SHA512 c6cca8b8ff08e96fa33257740cd79898f9b52f40a32ed8f39e219752a836303bbfb7bac3946a4d5d6a4d882c59dba790d509528a0a5b66e60b183f4bb2e4a61e
+EBUILD moria-5.7.10.ebuild 1388 BLAKE2B 6c89193ab51fc3bca7408be652e154be07f65cbf03f076df84f8b05c54dea667bb206e9f54d6dfe83bf44a23c6ac36deda50169efb606f21c18ea184d72290b6 SHA512 d80dce33225454af1a2470b25deabf432f4a35681ac2b7bdb00deb5c571733de9da626f77b240ad529d67106b683c97df10716ce0a0164758ec7bc0073692003
MISC metadata.xml 342 BLAKE2B f53651879ccf3a26ac770d9746a76f5d59eb4403db9bdd4ae5f222f1a8e26c8a0c1ff86c47f087381d49229c1bc9473c7415072fd716ba0ba57f88c21198e5f2 SHA512 f6c4db0374588d0ba1070fdba2e38d647de66378fccc6a59e96c27cd50b4e2f9071259202cb1b33fe99d57332230dc68d450df2017ee1124f6b505d40f9f9843
diff --git a/games-roguelike/moria/files/moria-5.7.10-tinfo.patch b/games-roguelike/moria/files/moria-5.7.10-tinfo.patch
new file mode 100644
index 000000000000..5173a7d00f4e
--- /dev/null
+++ b/games-roguelike/moria/files/moria-5.7.10-tinfo.patch
@@ -0,0 +1,24 @@
+From aa3ebbd2eb4b4a6ab92833060c212255d90c68b4 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan.strogin@gmail.com>
+Date: Mon, 11 Feb 2019 01:53:10 +0200
+Subject: [PATCH] Find NCurses library on Linux/Mac
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 372d838..f39ebcd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,6 +261,7 @@ elseif ((MSYS OR MINGW) AND NOT "$ENV{MINGW}" STREQUAL "")
+ set(CURSES_LIBRARIES "/$ENV{MINGW}/lib/libncurses.a")
+ else ()
+ message(STATUS "NOTE: Configuring build for macOS/Linux release...")
++ set(CURSES_NEED_NCURSES TRUE)
+ find_package(Curses REQUIRED)
+ endif ()
+
+--
+2.20.1
+
diff --git a/games-roguelike/moria/moria-5.7.10.ebuild b/games-roguelike/moria/moria-5.7.10.ebuild
index 77fadf27a040..999c073daa4f 100644
--- a/games-roguelike/moria/moria-5.7.10.ebuild
+++ b/games-roguelike/moria/moria-5.7.10.ebuild
@@ -21,7 +21,10 @@ BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/umoria-${PV}"
-PATCHES=( "${FILESDIR}/${P}-gentoo-paths.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-gentoo-paths.patch"
+ "${FILESDIR}/${P}-tinfo.patch"
+)
pkg_setup(){
enewgroup gamestat 36
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 0fa48acff66f..47f305ba6e84 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,7 +1,8 @@
+AUX rltiles-ldflags-libs.patch 1373 BLAKE2B 5a5a48bdb6081bb81bd66993bed3a6cfed4951ca059b2bf7069ab512e30c855eb65abc9d552da4e3c15c5156924bf14adc852dbb46248aa9840b8f63d1d33652 SHA512 955b6784f7a2ffbccefff6648de2072391d535f998516f52a7b5681e41aeedb34c47ac6cb6d649519448c23ce7007f08f0b0c36ced976dac0f111f2dae204287
DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
DIST stone_soup-0.22.0.tar.xz 29263688 BLAKE2B e0a4d6953677583fafe1fce037d4d484c821b4d8782c63fa90b6b4f5db3df7b8fd4c5e843740517a7c2321f864df2a346fcd9bc69a1446c74685afc239d1fc55 SHA512 e8daa0f66a5212b116ce997b30b8f0f9ef01cef7e1213a1b6fe17c800d44fa7e318624902ce638dee79027ffaa3a4af8a10f6552de756a2045b5919d817498bd
DIST stone_soup-0.23.0.tar.xz 29899848 BLAKE2B 138f3c9fe1ad395d05d0654ea42788c6312e92839c6b92edfa538123b8b566f62d263862b05c6da64d589938c820b876e12475b0eeb16af7dd2e3f62c441eecb SHA512 6b53b5d670130aac451d09fe842e7654f61c131d126b34ed729d4542e9d2cbe2beaa6cd5f0b2bb78744ae6c643040996e39db8b0b3840c8946e442aaff54ff58
-EBUILD stone-soup-0.22.0.ebuild 3540 BLAKE2B 1b814527316af1be0ae6883be67155d2b8e85af626a2207da4ddda73d837d394f945bccb9da12b0bf810412b4320dae313cb506b1123caaa63747b3bf0249ebf SHA512 16d3e98a2534542b1e9f09055cfecba854546ba80fbb083abc46cc785f3df6bd0970fcfcb1451b556bc43e0bca50e94b28467286d679491ec54383bf941dd80a
-EBUILD stone-soup-0.23.0.ebuild 3542 BLAKE2B c309df2f75de5a418fe171d86c71ca9d252b348ba9dba7277c1a700cda3afa9055602740cc27263b64caf1403c9e396b5cc0a891c512ee73874f7c414c68ff97 SHA512 c721f780c2cbba456e99d06d3e3825f522cbaa4bd9f759276e20f1782456e3035383b815cf16091d790584426dd99cb6b4109d64936b5bc521bd10b15e8edf49
-MISC metadata.xml 1656 BLAKE2B 0d1a508b4e227d63f226e3c6a356274be71f4107d690bb268960a992b69e07541f519dad89ea466bb98dfd6d86837d233d4e1cd66bac059e5122d54e1ed9bc9d SHA512 c482e96fe8d414a29ff9085c71c6c87782e9521bdfeb7118d546ff053ae551966b7cbbe50bc987276c7dfa3337f534b47228f39b83800d307592e780f44ce662
+EBUILD stone-soup-0.22.0.ebuild 3529 BLAKE2B 61d6110b871d0ac57bf1215368fbe6874b4ca8623d709311ef20f526f0ce148211c1f73a1a0a9c2ebbbc9dd2b3651d9324d3217b524bf083fd485343ee75163f SHA512 41e34f3b5857afd720ddd527b05e24e3a3a48427624a8f9b8604bb6bed44d2dbfbad7e7edd16b62a147f7969a3cda1b1cf2e797dceacbf867c1b4919388c89dc
+EBUILD stone-soup-0.23.0.ebuild 3529 BLAKE2B 61d6110b871d0ac57bf1215368fbe6874b4ca8623d709311ef20f526f0ce148211c1f73a1a0a9c2ebbbc9dd2b3651d9324d3217b524bf083fd485343ee75163f SHA512 41e34f3b5857afd720ddd527b05e24e3a3a48427624a8f9b8604bb6bed44d2dbfbad7e7edd16b62a147f7969a3cda1b1cf2e797dceacbf867c1b4919388c89dc
+MISC metadata.xml 1546 BLAKE2B f7af831bd9db76d5d95e88db7651c81fc2838f010daa6ff473ea55f82797fb989f2a99e640fea915da87be7255e112f9e4f5766195ad74ec807118908840690e SHA512 7531275c7d11591b8eb8ba4b490a5357bb65d12369b504639b54d3681c364ead0bce2356549028d3a02d06934a3c04ccc57204ee17702b1e7a8866e7960c768b
diff --git a/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
new file mode 100644
index 000000000000..a2948b23619c
--- /dev/null
+++ b/games-roguelike/stone-soup/files/rltiles-ldflags-libs.patch
@@ -0,0 +1,45 @@
+--- a/rltiles/Makefile
++++ b/rltiles/Makefile
+@@ -1,7 +1,7 @@
+ uname_S := $(shell uname -s)
+
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lmingw32
++LIBS += -lmingw32
+ endif
+
+ # Note: since generation of tiles is done on the host, we don't care about
+@@ -29,7 +29,7 @@
+ endif
+
+ CFLAGS += $(PNG_INCLUDE)
+- LDFLAGS += $(PNG_LIB)
++ LIBS += $(PNG_LIB)
+
+ CFLAGS += -DUSE_TILE
+ endif
+@@ -39,13 +39,13 @@
+ endif
+
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
++LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
+ endif
+ ifeq ($(uname_S),Darwin)
+-LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
++LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
+ endif
+ ifeq ($(uname_S),Linux)
+-LDFLAGS += -ldl -lpthread
++LIBS += -ldl -lpthread
+ endif
+
+ # Attempt to use a full compiler name, to make
+@@ -134,6 +134,6 @@
+ $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
+
+ $(TILEGEN): $(OBJECTS)
+- $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
++ $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
+
+ .PHONY: all clean distclean
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index ec38a399560c..68e84b34cc48 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>stasibear@gentoo.org</email>
- <name>Erik Mackdanz</name>
- </maintainer>
<maintainer type="project">
<email>games@gentoo.org</email>
<name>Gentoo Games Project</name>
diff --git a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
index 742c2c56bd9e..92ce93f41ce3 100644
--- a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="debug luajit ncurses test +tiles"
# test is broken
# see https://crawl.develz.org/mantis/view.php?id=6121
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}/source
S_TEST=${WORKDIR}/${MY_P}_test/source
PATCHES=(
- "${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch
+ "${FILESDIR}"/rltiles-ldflags-libs.patch
)
pkg_setup() {
diff --git a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
index 876c7001d735..92ce93f41ce3 100644
--- a/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}/source
S_TEST=${WORKDIR}/${MY_P}_test/source
PATCHES=(
- "${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch
+ "${FILESDIR}"/rltiles-ldflags-libs.patch
)
pkg_setup() {