diff options
Diffstat (limited to 'games-roguelike')
24 files changed, 401 insertions, 1014 deletions
diff --git a/games-roguelike/FTL-gog/FTL-gog-1.6.8.24110.ebuild b/games-roguelike/FTL-gog/FTL-gog-1.6.9.25330.ebuild index a70fe76bef53..d06484d8ce7f 100644 --- a/games-roguelike/FTL-gog/FTL-gog-1.6.8.24110.ebuild +++ b/games-roguelike/FTL-gog/FTL-gog-1.6.9.25330.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit desktop unpacker @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="-* ~amd64 ~x86" IUSE="" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" RDEPEND="media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/libpng @@ -43,7 +43,7 @@ src_prepare() { rm game/data/FTL.amd64 || die fi - sed -i start.sh -e '/chmod/d' + sed -i start.sh -e '/chmod/d' || die } src_install() { diff --git a/games-roguelike/FTL-gog/Manifest b/games-roguelike/FTL-gog/Manifest index 9d8da2009b2b..2ad947cb8aa8 100644 --- a/games-roguelike/FTL-gog/Manifest +++ b/games-roguelike/FTL-gog/Manifest @@ -1,3 +1,3 @@ -DIST ftl_advanced_edition_1_6_8_24110.sh 201034290 BLAKE2B 6ed07bcbcacaf81704682be438ae8bfa4ccfe906e2845ad25550b081d33964f8c3d6f40326a56168b072e99e0c30190579bcd756f8a3c055a5b54907a0913014 SHA512 ad66211ad077738797d0a8f33bc43c01dbcd6bdff3e4d9a8316e0ebca06a94b76380911e54c4b16dfc2f836cdbb6a025383714f0de4b9f9c19376660a695c678 -EBUILD FTL-gog-1.6.8.24110.ebuild 1303 BLAKE2B acc94261e6eeb10d6c8786fdfa5ecd84c134fe4a8244647b7575764bc4c90479a9e73eb5fe0dd83e933020706b35071014b2269b95375ec5aa169d66671bd0d2 SHA512 4b1f87ea2f6f2d84b94245c8a70553be57991a0d67e7a6db1d526f44bfe0aaca1929636e67dfa9428301e0fc2188e05f5d851ac9242bdf98a472b26d4aa4dc13 +DIST ftl_advanced_edition_1_6_9_25330.sh 200833898 BLAKE2B 9eb048e302158f1cc040492a9fb5bd84038dd9202b8cfdd08ec50a3e55326da18048f4eab0c8b79ecf47229d54b59fca46cebaa107d253eadc0cc5659da4792b SHA512 7b1d87b5def455989290366ef80652361dee9d0fd2838806d2386d8a1df44e0ab125c5538aa07b20382be4aa3054b14b4a489b39b6aa252f3cc00ead8504186c +EBUILD FTL-gog-1.6.9.25330.ebuild 1311 BLAKE2B bc6548ad41549b80aba319c4689e49eaad0fee7676d91e7997af17ceca0b9f3b03b7dc5b561bda95dec6768408dcd1caa1fede7ca58953dee6ea5f7dcd54066a SHA512 d7a2c102c047f7f015ae9fc9f7ba2500967ad423de1ba365382d73e0996ebd101b9b232726e62dafcf78b2cbc2900f4feb5d5b4fffb06e04e33804ea6c3b9190 MISC metadata.xml 487 BLAKE2B d1c2761fb3083ba140d1f87b1f52d179095ea37235acc3e0f2586e9b969174cc4aab34648523c6dce9f83499d05624e8afe2782101560e6a39cf61f5a9b27bf7 SHA512 69c1e069878db826f8a7c44d8d9f6349a37a60ec7777ea29886655082b6c57b152ab5cda35bd3126beef0a127472a57b0cc50b941224694446bb2de51bb90d92 diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz Binary files differindex 2417d890168a..b931b9892040 100644 --- a/games-roguelike/Manifest.gz +++ b/games-roguelike/Manifest.gz diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest index ddb722625a7f..d7d997b0dd72 100644 --- a/games-roguelike/moria/Manifest +++ b/games-roguelike/moria/Manifest @@ -1,9 +1,5 @@ -AUX 5.5.2-fbsd.patch 6904 BLAKE2B 15e6da2c394bc57e93757fed0e4a4e908a688a6b715993162cd7c8ef09cff6dd912980a157fc65fb030d9733e6e7d490f00078b9ff60e35b4bcce6fd3353afd8 SHA512 ec1c0428bd5223ee2bd5408b482941911fab6650cde1c49ff0c93262ea4203d09502a5bb5fda1ee66588935faccc9c1f0a738c337f8af92a63467238d91f6d8d -AUX 5.5.2-gentoo-paths.patch 2363 BLAKE2B 415de0a817ed6bac0ee4a260722576b99bccb69176ea8f46d2c21d01488d8000916580b3ca435e9cd7b9be1c066111a3033ab2767578640abd01613539d14a65 SHA512 41789167d9e624e0ca2d800bb87851a5e9628b51cc80cc84ca15c974f394d99101ea9cc6bde361b1c2187a3983b5d2291ca15cdbae04499687fd9785e017c32c -AUX 5.5.2-glibc.patch 9796 BLAKE2B 73349021d2ebeff5ad946548ab320df211b73d62edefe42a3004a6d1dae103247939274ec7ae5b02ec36af24f8ac7b38ea2cb7eab1e0d4045d76f650ff46bab2 SHA512 834e3b4521ac00e8367abd3c5e5eefe7859f36f0182794911936006224c9fac94b6e4beae1da73c228e1e434d02cf870fc69f6102b981c78916c204a6eea101d -AUX 5.5.2-hours.patch 1343 BLAKE2B ca82cb17fad83c3be5cf063e0f13c3c635e63c6d8de7777ee454d4057f26ededfcec03aa7115c61a52242f01afc187fe0cfcb7f0b1de2064ea0602804011c3b3 SHA512 2b59e37741664dcfc095a5ae9ac482d6899d71f8221ca0f7d9d1caee594f05ac2ef043a6ff983e5266b904afa725876210d07b02352921066271f35e2efe7047 -AUX 5.5.2-warnings.patch 386 BLAKE2B aabef11e0c2b2869a9f45c538cdbc84389a6a3cbdceb6a6e9697ffe7a010483e740dc5c192ded489620ff7049baf4b58b6a560c75b9843bc63812e00c79c7615 SHA512 64bd3e7a0c613ca3043ea0a4aa4aab83281132af16d73e9ed70f1d5ff979b48cf1f085a030c56f0c17be01bbabb2dd4d9dcbd02d4a204993adec3fd01f03ab5c -DIST moria-extras.tar.bz2 57324 BLAKE2B 7a885e5595c8c3a3d0a29c65729e03ab1d26ad514b96a1d078a436960c1245283a51544dc54c6a5f225b77da3c3a72f8c7407efeac2b0629d51330b3abf9af49 SHA512 39d04ffdbe779fc070ee72084df5c731f8db25116e9156898d4c78c86e02288cf3560849461f2081209a06a74274789a671b104dc806b63a0d955adad17fd85f -DIST um5.5.2.tar.Z 910536 BLAKE2B d36d5cbb45992937f8e7c2f98cf2ad568e11e2d2b1af107e77ba98d8cfc23f2f4bcdb43ab9d5a9dd05e0ec45a5ecd298a1c4c7307bc0f75ca629c9c63cf9d3bb SHA512 987bbccb9cb4870ec91704cd20cf19875320d1cfe62c4c5a0063bfc3827732a0e3334a4ea3712137f3262d7418db0ea7e803d724e2dec4d5eb41ebe741f326cc -EBUILD moria-5.5.2.ebuild 1932 BLAKE2B 3fd63796fddf7bd31bb29b3357b3f30979d41bcac3cdcc561292483d831efa77f1ecacee65588e08ccd6649901b7c15b6d0aa4e8af20c989ff38b3ab16acec9d SHA512 b883196bf18634f9b576e7bb147a0fcaf0fb77823b74ee0ed04a39e7172a97e0d3ada1db9d9f3228f7a59d7b9510b3df73fc04448782834e53b005a69fd7391e -MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 +AUX moria-5.7.10-gentoo-paths.patch 1823 BLAKE2B 74ae8ba961a1dbd0ee42426d0cbae960a35175e5dea792ac5930524e78b6382f9e52c629bb30c02c64e31a42374b7c0c20f7ab6fb5cea9045eb0bf9f04c384d8 SHA512 8c03251777e230fe60751a107864da5c06aea6a4aa4fe8daf4373bc18dce672d1e798163837587992ef85107dd3e838d38e2d033bb7eec85be8a928cd74beed0 +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 +MISC metadata.xml 342 BLAKE2B f53651879ccf3a26ac770d9746a76f5d59eb4403db9bdd4ae5f222f1a8e26c8a0c1ff86c47f087381d49229c1bc9473c7415072fd716ba0ba57f88c21198e5f2 SHA512 f6c4db0374588d0ba1070fdba2e38d647de66378fccc6a59e96c27cd50b4e2f9071259202cb1b33fe99d57332230dc68d450df2017ee1124f6b505d40f9f9843 diff --git a/games-roguelike/moria/files/5.5.2-fbsd.patch b/games-roguelike/moria/files/5.5.2-fbsd.patch deleted file mode 100644 index 4f65b08f567d..000000000000 --- a/games-roguelike/moria/files/5.5.2-fbsd.patch +++ /dev/null @@ -1,268 +0,0 @@ -Index: umoria/source/main.c -=================================================================== ---- umoria.orig/source/main.c -+++ umoria/source/main.c -@@ -88,6 +88,7 @@ - #include <time.h> - #endif - -+#ifndef __FreeBSD__ - #ifndef VMS - #ifndef MAC - #ifndef GEMDOS -@@ -98,6 +99,9 @@ long time(); - char *getenv(); - #endif - #endif -+#else -+#include <stdlib.h> -+#endif - - #ifndef MAC - #ifndef AMIGA -@@ -360,7 +364,7 @@ char *argv[]; - else - { /* Create character */ - create_character(); --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - birth_date = time ((time_t *)0); - #else - birth_date = time ((long *)0); -Index: umoria/source/death.c -=================================================================== ---- umoria.orig/source/death.c -+++ umoria/source/death.c -@@ -123,6 +123,7 @@ static void kingly(void); - #include <stdlib.h> - #endif - -+#ifndef __FreeBSD__ - #ifndef VMS - #ifndef MAC - #if !defined(ATARIST_MWC) && !defined(AMIGA) -@@ -130,18 +131,19 @@ long time(); - #endif - #endif - #endif -+#endif - - static void date(day) - char *day; - { - register char *tmp; --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - time_t clockvar; - #else - long clockvar; - #endif - --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - clockvar = time((time_t *) 0); - #else - clockvar = time((long *) 0); -Index: umoria/source/io.c -=================================================================== ---- umoria.orig/source/io.c -+++ umoria/source/io.c -@@ -13,6 +13,11 @@ - - #include "config.h" - -+#ifdef __FreeBSD__ -+#include <sys/ioctl_compat.h> -+#include <time.h> -+#endif -+ - #ifdef HPUX - #include <sys/bsdtty.h> - #endif -@@ -245,7 +250,9 @@ int suspend() - struct ltchars lcbuf; - struct tchars cbuf; - int lbuf; -+#ifndef __FreeBSD__ - long time(); -+#endif - - py.misc.male |= 2; - (void) ioctl(0, TIOCGETP, (char *)&tbuf); -@@ -313,7 +320,7 @@ void init_curses() - #endif - - /* PC curses returns ERR */ --#if defined(USG) && !defined(PC_CURSES) && !defined(AMIGA) -+#if (defined(USG) && !defined(PC_CURSES) && !defined(AMIGA)) || defined(__FreeBSD__) - if (initscr() == NULL) - #else - if (initscr() == ERR) -@@ -331,7 +338,7 @@ void init_curses() - #if defined(atarist) && defined(__GNUC__) - (void) signal (SIGTSTP, (__Sigfunc)suspend); - #else --#ifdef __386BSD__ -+#if defined(__386BSD__) || defined(__FreeBSD__) - (void) signal (SIGTSTP, (sig_t)suspend); - #else - (void) signal (SIGTSTP, suspend); -@@ -757,7 +764,7 @@ void shell_out() - msg_print("Fork failed. Try again."); - return; - } --#if defined(USG) || defined(__386BSD__) -+#if defined(USG) || defined(__386BSD__) || defined(__FreeBSD__) - (void) wait((int *) 0); - #else - (void) wait((union wait *) 0); -Index: umoria/source/misc1.c -=================================================================== ---- umoria.orig/source/misc1.c -+++ umoria/source/misc1.c -@@ -28,7 +28,7 @@ - #endif - #endif - --#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) -+#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) && !defined(__FreeBSD__) - long time(); - #endif - struct tm *localtime(); -@@ -45,7 +45,7 @@ int32u seed; - register int32u clock_var; - - if (seed == 0) --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - clock_var = time((time_t *)0); - #else - clock_var = time((long *)0); -@@ -89,10 +89,14 @@ void reset_seed() - int check_time() - { - #ifdef MORIA_HOU -+#if defined(MAC) || defined(__FreeBSD__) -+ time_t clock_var; -+#else - long clock_var; -+#endif - register struct tm *tp; - --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - clock_var = time((time_t *)0); - #else - clock_var = time((long *)0); -Index: umoria/source/save.c -=================================================================== ---- umoria.orig/source/save.c -+++ umoria/source/save.c -@@ -102,7 +102,7 @@ static void rd_monster(); - #endif - - #if !defined(ATARIST_MWC) --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - #include <time.h> - #else - long time(); -@@ -331,7 +331,7 @@ static int sv_write() - } - - /* save the current time in the savefile */ --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - l = time((time_t *)0); - #else - l = time((long *)0); -@@ -1029,7 +1029,7 @@ int *generate; - || (version_min == 2 && patch_level >= 2)) - rd_long ((int32u *)&birth_date); - else --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - birth_date = time((time_t *)0); - #else - birth_date = time((long *)0); -@@ -1253,7 +1253,7 @@ scoreboard; it will not be scored again. - /* rotate store inventory, depending on how old the save file */ - /* is foreach day old (rounded up), call store_maint */ - /* calculate age in seconds */ --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - start_time = time((time_t *)0); - #else - start_time = time((long *)0); -Index: umoria/source/signals.c -=================================================================== ---- umoria.orig/source/signals.c -+++ umoria/source/signals.c -@@ -89,7 +89,7 @@ static int signal_count = 0; - - /*ARGSUSED*/ - #ifndef USG --#ifdef __386BSD__ -+#if defined(__386BSD__) || defined(__FreeBSD__) - static void signal_handler(sig, code, scp) - #else - static int signal_handler(sig, code, scp) -@@ -217,7 +217,7 @@ void signals() - #if defined(atarist) && defined(__GNUC__) - (void) signal(SIGTSTP, (__Sigfunc)suspend); - #else --#ifdef __386BSD__ -+#if defined(__386BSD__) || defined(__FreeBSD__) - (void) signal(SIGTSTP, (sig_t)suspend); - #else - (void) signal(SIGTSTP, suspend); -Index: umoria/source/types.h -=================================================================== ---- umoria.orig/source/types.h -+++ umoria/source/types.h -@@ -6,11 +6,20 @@ - not for profit purposes provided that this copyright and statement are - included in all such copies. */ - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+typedef u_int32_t int32u; -+typedef int32_t int32; -+typedef u_int16_t int16u; -+typedef int16_t int16; -+typedef u_int8_t int8u; -+#else - typedef unsigned long int32u; - typedef long int32; - typedef unsigned short int16u; - typedef short int16; - typedef unsigned char int8u; -+#endif - /* some machines will not accept 'signed char' as a type, and some accept it - but still treat it like an unsigned character, let's just avoid it, - any variable which can ever hold a negative value must be 16 or 32 bits */ -Index: umoria/unix/unix.c -=================================================================== ---- umoria.orig/unix/unix.c -+++ umoria/unix/unix.c -@@ -14,6 +14,10 @@ - /* defines TRUE and FALSE */ - #include <curses.h> - -+#ifdef __FreeBSD__ -+#include <unistd.h> -+#endif -+ - #include "config.h" - #include "constant.h" - #include "types.h" -@@ -276,7 +280,9 @@ int getuid(); - void user_name(buf) - char *buf; - { -+#ifndef __FreeBSD__ - extern char *getlogin(); -+#endif - struct passwd *pwline; - register char *p; - diff --git a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch b/games-roguelike/moria/files/5.5.2-gentoo-paths.patch deleted file mode 100644 index 5ce4ce4d2b4d..000000000000 --- a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- umoria/unix/Makefile.orig 2003-12-31 14:52:58.583335976 -0500 -+++ umoria/unix/Makefile 2003-12-31 14:51:54.621059720 -0500 -@@ -3,6 +3,7 @@ - # LIBDIR must be the same directory defined in config.h - # OWNER is who you want the game to be chown to. - # GROUP is who you wnat the game to be chgrp to. -+STATEDIR = /var/lib - BINDIR = /home/zariski/grabiner/moria - LIBDIR = /home/zariski/grabiner/moria/files - OWNER = grabiner -@@ -65,12 +66,11 @@ - chmod 4711 $(BINDIR)/moria - chmod 711 $(LIBDIR) - (cd files; cp $(LIBFILES) $(LIBDIR)) -- (cd $(LIBDIR); chmod 444 $(LIBFILES)) -- (cd $(LIBDIR); touch scores; chmod 644 scores) -+ (cd $(STATEDIR); touch moriascores; chmod 664 moriascores; chown $(OWNER) moriascores; chgrp $(GROUP) moriascores) - chown $(OWNER) $(BINDIR)/moria - chgrp $(GROUP) $(BINDIR)/moria -- (cd $(LIBDIR); chown $(OWNER) $(LIBFILES) scores) -- (cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES) scores) -+ (cd $(LIBDIR); chown $(OWNER) $(LIBFILES)) -+ (cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES)) - # If you are short on disk space, or aren't interested in debugging moria. - # strip $(BINDIR)/moria - ---- umoria/source/config.h.orig 2003-12-31 15:19:48.893531616 -0500 -+++ umoria/source/config.h 2003-12-31 15:21:09.584264760 -0500 -@@ -199,17 +199,18 @@ - #else - - /* This must be unix; change MORIA_LIB as appropriate. */ --#define MORIA_SAV "moria.save" --#define MORIA_LIB(xxx) "/home/math/grabiner/moria/files/xxx" --#define MORIA_HOU MORIA_LIB(hours) --#define MORIA_MOR MORIA_LIB(news) --#define MORIA_TOP MORIA_LIB(scores) --#define MORIA_HELP MORIA_LIB(roglcmds.hlp) --#define MORIA_ORIG_HELP MORIA_LIB(origcmds.hlp) --#define MORIA_WIZ_HELP MORIA_LIB(rwizcmds.hlp) --#define MORIA_OWIZ_HELP MORIA_LIB(owizcmds.hlp) --#define MORIA_WELCOME MORIA_LIB(welcome.hlp) --#define MORIA_VER MORIA_LIB(version.hlp) -+#define MORIA_SAV ".moria.save" -+#define MORIA_LIB(xxx) "GENTOO_DATADIR/" xxx -+#define MORIA_STATE(xxx) "GENTOO_STATEDIR/" xxx -+#define MORIA_HOU MORIA_LIB("hours") -+#define MORIA_MOR MORIA_LIB("news") -+#define MORIA_TOP MORIA_STATE("moriascores") -+#define MORIA_HELP MORIA_LIB("roglcmds.hlp") -+#define MORIA_ORIG_HELP MORIA_LIB("origcmds.hlp") -+#define MORIA_WIZ_HELP MORIA_LIB("rwizcmds.hlp") -+#define MORIA_OWIZ_HELP MORIA_LIB("owizcmds.hlp") -+#define MORIA_WELCOME MORIA_LIB("welcome.hlp") -+#define MORIA_VER MORIA_LIB("version.hlp") - - #endif - #endif diff --git a/games-roguelike/moria/files/5.5.2-glibc.patch b/games-roguelike/moria/files/5.5.2-glibc.patch deleted file mode 100644 index 55e4e5de2b14..000000000000 --- a/games-roguelike/moria/files/5.5.2-glibc.patch +++ /dev/null @@ -1,356 +0,0 @@ -diff -Naur common-orig/Makefile umoria/unix/Makefile ---- common-orig/Makefile 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/unix/Makefile 2003-12-09 10:07:12.000000000 -0500 -@@ -14,9 +14,9 @@ - CFLAGS = -O - - # For BSD Systems --CURSES = -lcurses -ltermcap -+# CURSES = -lcurses -ltermcap - # For SYS V Systems --# CURSES = -lcurses -+CURSES = `pkg-config ncurses --libs` - # For XENIX, some XENIX systems may need -ltinfo - # CURSES = -ltcap -ltermcap -lx - -diff -Naur common-orig/death.c umoria/source/death.c ---- common-orig/death.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/death.c 2003-12-09 10:06:56.000000000 -0500 -@@ -175,10 +175,12 @@ - /* The following code is provided especially for systems which -CJS- - have no flock system call. It has never been tested. */ - -+#ifndef LOCK_EX - #define LOCK_EX 1 - #define LOCK_SH 2 - #define LOCK_NB 4 - #define LOCK_UN 8 -+#endif - - /* An flock HACK. LOCK_SH and LOCK_EX are not distinguished. DO NOT release - a lock which you failed to set! ALWAYS release a lock you set! */ -diff -Naur common-orig/io.c umoria/source/io.c ---- common-orig/io.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/io.c 2003-12-09 10:06:56.000000000 -0500 -@@ -62,6 +62,7 @@ - - - #include <ctype.h> -+#include <termios.h> - - #if defined(SYS_V) && defined(lint) - /* for AIX, prevent hundreds of unnecessary lint errors, must define before -@@ -334,7 +335,9 @@ - #ifdef __386BSD__ - (void) signal (SIGTSTP, (sig_t)suspend); - #else -- (void) signal (SIGTSTP, suspend); -+ /* (void) signal (SIGTSTP, suspend); */ -+ /* libc6 defaults to BSD, this expects SYSV */ -+ (void) sysv_signal (SIGTSTP, suspend); - #endif - #endif - #endif -diff -Naur common-orig/misc3.c umoria/source/misc3.c ---- common-orig/misc3.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/misc3.c 2003-12-09 10:06:56.000000000 -0500 -@@ -1249,8 +1249,7 @@ - { - int i; - register inven_type *i_ptr; -- vtype prt2; -- bigvtype prt1; -+ bigvtype prt1, prt2; - #ifdef ATARIST_MWC - int32u holder; - #endif -diff -Naur common-orig/misc4.c umoria/source/misc4.c ---- common-orig/misc4.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/misc4.c 2003-12-09 10:06:56.000000000 -0500 -@@ -33,7 +33,7 @@ - void scribe_object() - { - int item_val, j; -- vtype out_val, tmp_str; -+ bigvtype out_val, tmp_str; - - if (inven_ctr > 0 || equip_ctr > 0) - { -diff -Naur common-orig/moria1.c umoria/source/moria1.c ---- common-orig/moria1.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/moria1.c 2003-12-09 10:06:56.000000000 -0500 -@@ -332,8 +332,8 @@ - { - objdes(tmp_val, &inventory[i], TRUE); - tmp_val[lim] = 0; /* Truncate if too long. */ -- (void) sprintf(out_val[i], " %c) %s", 'a'+i, tmp_val); -- l = strlen(out_val[i]); -+ (void) sprintf(out_val[i], "%c) %s", 'a'+i, tmp_val); -+ l = strlen(out_val[i]) + 2; - if (weight) - l += 9; - if (l > len) -@@ -352,9 +352,12 @@ - { - /* don't need first two spaces if in first column */ - if (col == 0) -- prt(&out_val[i][2], current_line, col); -- else - prt(out_val[i], current_line, col); -+ else -+ { -+ put_buffer(" ", current_line, col); -+ prt(out_val[i], current_line, col+2); -+ } - if (weight) - { - total_weight = inventory[i].weight*inventory[i].number; -@@ -466,9 +469,9 @@ - } - objdes(prt2, &inventory[i], TRUE); - prt2[lim] = 0; /* Truncate if necessary */ -- (void) sprintf(out_val[line], " %c) %-14s: %s", line+'a', -- prt1, prt2); -- l = strlen(out_val[line]); -+ (void) sprintf(out_val[line], "%c) %-14s: %s", line+'a', -+ prt1, prt2); -+ l = strlen(out_val[line]) + 2; - if (weight) - l += 9; - if (l > len) -@@ -488,9 +491,12 @@ - { - /* don't need first two spaces when using whole screen */ - if (col == 0) -- prt(&out_val[line][2], line+1, col); -- else - prt(out_val[line], line+1, col); -+ else -+ { -+ put_buffer(" ", line+1, col); -+ prt(out_val[line], line+1, col+2); -+ } - if (weight) - { - total_weight = i_ptr->weight*i_ptr->number; -diff -Naur common-orig/signals.c umoria/source/signals.c ---- common-orig/signals.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/signals.c 2003-12-09 10:06:56.000000000 -0500 -@@ -113,7 +113,11 @@ - if(error_sig >= 0) /* Ignore all second signals. */ - { - if(++signal_count > 10) /* Be safe. We will die if persistent enough. */ -+#ifdef __FreeBSD__ - (void) signal(sig, SIG_DFL); -+#else -+ (void) sysv_signal(sig, SIG_DFL); -+#endif - return; - } - error_sig = sig; -@@ -126,7 +126,11 @@ - ) - { - if (death) -+#ifdef __FreeBSD__ - (void) signal(sig, SIG_IGN); /* Can't quit after death. */ -+#else -+ (void) sysv_signal(sig, SIG_IGN); /* Can't quit after death. */ -+#endif - else if (!character_saved && character_generated) - { - if (!get_check("Really commit *Suicide*?")) -@@ -137,7 +137,11 @@ - put_qio(); - error_sig = -1; - #ifdef USG -+#ifdef __FreeBSD__ - (void) signal(sig, signal_handler);/* Have to restore handler. */ -+#else -+ (void) sysv_signal(sig, signal_handler);/* Have to restore handler. */ -+#endif - #else - (void) sigsetmask(smask); - #endif -@@ -179,7 +179,11 @@ - restore_term(); - #if !defined(MSDOS) && !defined(AMIGA) && !defined(ATARIST_TC) - /* always generate a core dump */ -+#ifdef __FreeBSD__ - (void) signal(sig, SIG_DFL); -+#else -+ (void) sysv_signal(sig, SIG_DFL); -+#endif - (void) kill(getpid(), sig); - (void) sleep(5); - #endif -@@ -199,7 +199,11 @@ - #if defined(atarist) && defined(__GNUC__) - (void) signal(SIGTSTP, (__Sigfunc)SIG_IGN); - #else -+#ifdef __FreeBSD__ - (void) signal(SIGTSTP, SIG_IGN); -+#else -+ (void) sysv_signal(SIGTSTP, SIG_IGN); -+#endif - #endif - #ifndef USG - mask = sigsetmask(0); -@@ -220,7 +220,11 @@ - #ifdef __386BSD__ - (void) signal(SIGTSTP, (sig_t)suspend); - #else -+#ifdef __FreeBSD__ - (void) signal(SIGTSTP, suspend); -+#else -+ (void) sysv_signal(SIGTSTP, suspend); -+#endif - #endif - #endif - #ifndef USG -@@ -237,7 +237,11 @@ - { - #if !defined(ATARIST_MWC) && !defined(ATARIST_TC) - /* No signals for Atari ST compiled with MWC or TC. */ -+#ifdef __FreeBSD__ - (void) signal(SIGINT, signal_handler); -+#else -+ (void) sysv_signal(SIGINT, signal_handler); -+#endif - - #if defined(atarist) && defined(__GNUC__) - /* Atari ST compiled with GNUC has most signals, but we need a cast -@@ -259,8 +259,13 @@ - - #else - /* Everybody except the atari st. */ -+#ifdef __FreeBSD__ - (void) signal(SIGINT, signal_handler); - (void) signal(SIGFPE, signal_handler); -+#else -+ (void) sysv_signal(SIGINT, signal_handler); -+ (void) sysv_signal(SIGFPE, signal_handler); -+#endif - - #if defined(MSDOS) - /* many fewer signals under MSDOS */ -@@ -278,30 +278,61 @@ - - /* Everybody except Atari, MSDOS, and Amiga. */ - /* Ignore HANGUP, and let the EOF code take care of this case. */ -+#ifdef __FreeBSD__ - (void) signal(SIGHUP, SIG_IGN); - (void) signal(SIGQUIT, signal_handler); - (void) signal(SIGILL, signal_handler); - (void) signal(SIGTRAP, signal_handler); - (void) signal(SIGIOT, signal_handler); -+#else -+ (void) sysv_signal(SIGHUP, SIG_IGN); -+ (void) sysv_signal(SIGQUIT, signal_handler); -+ (void) sysv_signal(SIGILL, signal_handler); -+ (void) sysv_signal(SIGTRAP, signal_handler); -+ (void) sysv_signal(SIGIOT, signal_handler); -+#endif - #ifdef SIGEMT /* in BSD systems */ - (void) signal(SIGEMT, signal_handler); - #endif - #ifdef SIGDANGER /* in SYSV systems */ - (void) signal(SIGDANGER, signal_handler); - #endif -+#ifdef __FreeBSD__ - (void) signal(SIGKILL, signal_handler); - (void) signal(SIGBUS, signal_handler); - (void) signal(SIGSEGV, signal_handler); -+#else -+ (void) sysv_signal(SIGKILL, signal_handler); -+ (void) sysv_signal(SIGBUS, signal_handler); -+ (void) sysv_signal(SIGSEGV, signal_handler); -+#endif - #ifdef SIGSYS -+#ifdef __FreeBSD__ - (void) signal(SIGSYS, signal_handler); -+#else -+ (void) sysv_signal(SIGSYS, signal_handler); -+#endif - #endif -+#ifdef __FreeBSD__ - (void) signal(SIGTERM, signal_handler); - (void) signal(SIGPIPE, signal_handler); -+#else -+ (void) sysv_signal(SIGTERM, signal_handler); -+ (void) sysv_signal(SIGPIPE, signal_handler); -+#endif - #ifdef SIGXCPU /* BSD */ -+#ifdef __FreeBSD__ - (void) signal(SIGXCPU, signal_handler); -+#else -+ (void) sysv_signal(SIGXCPU, signal_handler); -+#endif - #endif - #ifdef SIGPWR /* SYSV */ -+#ifdef __FreeBSD__ - (void) signal(SIGPWR, signal_handler); -+#else -+ (void) sysv_signal(SIGPWR, signal_handler); -+#endif - #endif - #endif - #endif -@@ -314,7 +314,11 @@ - #if !defined(ATARIST_MWC) - (void) signal(SIGINT, SIG_IGN); - #ifdef SIGQUIT -+#ifdef __FreeBSD__ - (void) signal(SIGQUIT, SIG_IGN); -+#else -+ (void) sysv_signal(SIGQUIT, SIG_IGN); -+#endif - #endif - #endif - } -@@ -324,7 +324,11 @@ - #if !defined(ATARIST_MWC) - (void) signal(SIGINT, SIG_DFL); - #ifdef SIGQUIT -+#ifdef __FreeBSD__ - (void) signal(SIGQUIT, SIG_DFL); -+#else -+ (void) sysv_signal(SIGQUIT, SIG_DFL); -+#endif - #endif - #endif - } -@@ -335,13 +335,21 @@ - #if defined(atarist) && defined(__GNUC__) - (void) signal(SIGINT, (__Sigfunc)signal_handler); - #else -+#ifdef __FreeBSD__ - (void) signal(SIGINT, signal_handler); -+#else -+ (void) sysv_signal(SIGINT, signal_handler); -+#endif - #endif - #ifdef SIGQUIT - #if defined(atarist) && defined(__GNUC__) - (void) signal(SIGQUIT, (__Sigfunc)signal_handler); - #else -+#ifdef __FreeBSD__ - (void) signal(SIGQUIT, signal_handler); -+#else -+ (void) sysv_signal(SIGQUIT, signal_handler); -+#endif - #endif - #endif - #endif -diff -Naur common-orig/unix.c umoria/unix/unix.c ---- common-orig/unix.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/unix/unix.c 2003-12-09 10:06:56.000000000 -0500 -@@ -261,7 +261,7 @@ - #endif - - #ifdef USG --unsigned short getuid(); -+/* unsigned short getuid(); */ - #else - #ifndef SECURE - #ifdef BSD4_3 diff --git a/games-roguelike/moria/files/5.5.2-hours.patch b/games-roguelike/moria/files/5.5.2-hours.patch deleted file mode 100644 index 3d1c329d9b9b..000000000000 --- a/games-roguelike/moria/files/5.5.2-hours.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru umoria.orig/source/files.c umoria/source/files.c ---- umoria.orig/source/files.c 1994-07-21 21:47:22.000000000 -0400 -+++ umoria/source/files.c 2010-05-05 14:51:44.334588483 -0400 -@@ -130,19 +130,19 @@ - if (strlen(in_line) > 3) - { - if (!strncmp(in_line, "SUN:", 4)) -- (void) strcpy(days[0], in_line); -+ (void) snprintf(days[0], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "MON:", 4)) -- (void) strcpy(days[1], in_line); -+ (void) snprintf(days[1], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "TUE:", 4)) -- (void) strcpy(days[2], in_line); -+ (void) snprintf(days[2], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "WED:", 4)) -- (void) strcpy(days[3], in_line); -+ (void) snprintf(days[3], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "THU:", 4)) -- (void) strcpy(days[4], in_line); -+ (void) snprintf(days[4], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "FRI:", 4)) -- (void) strcpy(days[5], in_line); -+ (void) snprintf(days[5], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "SAT:", 4)) -- (void) strcpy(days[6], in_line); -+ (void) snprintf(days[6], sizeof(days[0]), "%s", in_line); - } - (void) fclose(file1); - } diff --git a/games-roguelike/moria/files/5.5.2-warnings.patch b/games-roguelike/moria/files/5.5.2-warnings.patch deleted file mode 100644 index 33a2762b99d0..000000000000 --- a/games-roguelike/moria/files/5.5.2-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru umoria.orig/unix/unix.c umoria/unix/unix.c ---- umoria.orig/unix/unix.c 2014-11-01 02:45:07.375535783 -0400 -+++ umoria/unix/unix.c 2014-11-01 02:45:58.575820065 -0400 -@@ -315,7 +315,7 @@ - - user[0] = '\0'; - file++; -- while (*file != '/' && i < sizeof(user)) -+ while (*file != '/' && i < sizeof(user) - 1) - user[i++] = *file++; - user[i] = '\0'; - if (i == 0) diff --git a/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch b/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch new file mode 100644 index 000000000000..0d17c549e773 --- /dev/null +++ b/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch @@ -0,0 +1,33 @@ +diff --git a/src/config.cpp b/src/config.cpp +index 09528f7..1c299ed 100644 +--- a/src/config.cpp ++++ b/src/config.cpp +@@ -12,17 +12,17 @@ namespace config { + // Data files used by Umoria + // NOTE: use relative paths to the executable binary. + namespace files { +- const std::string splash_screen = "data/splash.txt"; +- const std::string welcome_screen = "data/welcome.txt"; +- const std::string license = "LICENSE"; +- const std::string versions_history = "data/versions.txt"; +- const std::string help = "data/help.txt"; +- const std::string help_wizard = "data/help_wizard.txt"; +- const std::string help_roguelike = "data/rl_help.txt"; +- const std::string help_roguelike_wizard = "data/rl_help_wizard.txt"; +- const std::string death_tomb = "data/death_tomb.txt"; +- const std::string death_royal = "data/death_royal.txt"; +- const std::string scores = "scores.dat"; ++ const std::string splash_screen = "/usr/share/moria/splash.txt"; ++ const std::string welcome_screen = "/usr/share/moria/welcome.txt"; ++ const std::string license = "/usr/share/doc/@PF@/LICENSE"; ++ const std::string versions_history = "/usr/share/moria/versions.txt"; ++ const std::string help = "/usr/share/moria/help.txt"; ++ const std::string help_wizard = "/usr/share/moria/help_wizard.txt"; ++ const std::string help_roguelike = "/usr/share/moria/rl_help.txt"; ++ const std::string help_roguelike_wizard = "/usr/share/moria/rl_help_wizard.txt"; ++ const std::string death_tomb = "/usr/share/moria/death_tomb.txt"; ++ const std::string death_royal = "/usr/share/moria/death_royal.txt"; ++ const std::string scores = "/var/lib/moria/scores.dat"; + std::string save_game = "game.sav"; + } + diff --git a/games-roguelike/moria/files/moria.6 b/games-roguelike/moria/files/moria.6 new file mode 100644 index 000000000000..be1fc7cc353b --- /dev/null +++ b/games-roguelike/moria/files/moria.6 @@ -0,0 +1,108 @@ +.TH MORIA 6 "" +.SH NAME +moria \- a dungeon game +.SH SYNOPSIS +.B +moria +[ +.B \-o +] [ +.B \-r +] [ +.B \-s +] [ +.B \-S +] [ +.B \-n +] [ +.B \-w +] [ savefile ] +.SH DESCRIPTION +.I Moria\^ +plays a dungeon game with you. +It lets you generate a character, +lets you buy equipment, +and lets you wander in a fathomless dungeon +while finding treasure and being attacked by monsters +and fellow adventurers. +Typing +.B ? +gives you a list of commands. +.PP +The ultimate object of +.I moria +is to kill the Balrog, +which dwells on the 50th level of the +dungeon, 2,500 feet underground. +Most players never even reach the Balrog, +and those that do seldom live to tell about it. +.PP +For a more complete description of the game, +read the document +.I The Dungeons of Moria. +.PP +By default, +.I moria +will save and restore games from a file +called moria.save in your home directory. If the environment +variable MORIA_SAV is defined, then +.I moria +will use that +file name instead of the default. If MORIA_SAV is not a complete +path name, then the savefile will be created or restored from the +current directory. You can also explicitly specify a savefile +on the command line. +.PP +If you use the \fB\-n\fP option, +.I moria +will create a new game, +ignoring any savefile which may already exist. +This works best when a savefile name is specified on the +command line, as this will prevent +.I moria +from trying to overwrite the default savefile +(if it exists) when you try to save your game. +.PP +You move in various directions +by pressing the numeric keypad keys, VMS-style. +If you specify +\fB\-r\fP, you move the same way you do in \fIrogue\fP(6). +You can also specify +\fB\-o\fP to force the VMS-style command set. +These options will override defaults stored in the savefile. If these +options are given multiple times, only the last one will take effect. +.PP +If you specify +.BR \-s , +.I moria +prints all of the scores in the score file and exits. +On a multiuser system, if you specify +.BR \-S , +.I moria +prints prints only those scores belonging to you and then exits. +.PP +If you specify \fB\-w\fP, +.I moria +will start up in wizard mode. +You can resurrect a dead character by using this option when starting +the game. Resurrected characters are teleported to the town level +and given zero hitpoints. +Wizard mode is intended for debugging the game, and for experimenting +with new features. Any other use is considered cheating. +Games played with wizard mode are not scored. +.SH AUTHORS +The original version of Moria was written in VMS/Pascal by Robert +Alan Koeneke, Jimmey Wayne Todd, +Gary McAdoo, and others at the University of Oklahoma. +This version was written by Jim Wilson at the University of California, +Berkeley, and released with minor revisions by David Grabiner at Harvard +University. +.SH BUGS +.PP +A suspended game that gets a hangup signal will die without creating a +save file. + +Rerolling with a % at the class prompt not implemented. + +For a more comprehensive list, see the ERRORS file in the source +distribution. diff --git a/games-roguelike/moria/metadata.xml b/games-roguelike/moria/metadata.xml index 78274e0fa550..51c540e92f83 100644 --- a/games-roguelike/moria/metadata.xml +++ b/games-roguelike/moria/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> -</maintainer> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <upstream> + <remote-id type="github">dungeons-of-moria/umoria</remote-id> + </upstream> </pkgmetadata> diff --git a/games-roguelike/moria/moria-5.5.2.ebuild b/games-roguelike/moria/moria-5.5.2.ebuild deleted file mode 100644 index e135a2f7d915..000000000000 --- a/games-roguelike/moria/moria-5.5.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs games - -DESCRIPTION="Rogue-like D&D curses game similar to nethack (BUT BETTER)" -HOMEPAGE="http://remarque.org/~grabiner/moria.html" -SRC_URI="ftp://ftp.greyhelm.com/pub/Games/Moria/source/um${PV}.tar.Z - http://www.funet.fi/pub/unix/games/moria/source/um${PV}.tar.Z - http://www.piratehaven.org/~beej/moria/mirror/Games/Moria/source/um${PV}.tar.Z - http://alge.anart.no/ftp/pub/games/RPG/moria/um${PV}.tar.Z - ftp://kane.evendata.net/pub/${PN}-extras.tar.bz2" - -LICENSE="Moria" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=sys-libs/ncurses-5:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/umoria - -src_prepare() { - local f - - epatch \ - "${FILESDIR}"/${PV}-gentoo-paths.patch \ - "${FILESDIR}"/${PV}-glibc.patch \ - "${FILESDIR}"/${PV}-fbsd.patch \ - "${FILESDIR}"/${PV}-hours.patch \ - "${FILESDIR}"/${PV}-warnings.patch - - for f in source/* unix/* ; do - ln -s ${f} $(basename ${f}) - done - - sed -i \ - -e "s:David Grabiner:root:" \ - -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \ - -e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}:" \ - config.h || die - { - echo "#include <stdlib.h>" - echo "#include <stdio.h>" - } >> config.h || die - sed -i \ - -e "/^STATEDIR =/s:=.*:=\$(DESTDIR)${GAMES_STATEDIR}:" \ - -e "/^BINDIR = /s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \ - -e "/^LIBDIR = /s:=.*:=\$(DESTDIR)${GAMES_DATADIR}/${PN}:" \ - -e "/^CFLAGS = /s:=.*:=${CFLAGS}:" \ - -e "/^OWNER = /s:=.*:=${GAMES_USER}:" \ - -e "/^GROUP = /s:=.*:=${GAMES_GROUP}:" \ - -e "/^CC = /s:=.*:=$(tc-getCC):" \ - -e '/^LFLAGS = /s:=.*:= $(LDFLAGS):' \ - Makefile || die - mv doc/moria.6 "${S}" || die -} - -src_install() { - dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}" - emake DESTDIR="${D}" install - - doman moria.6 - dodoc README doc/* "${WORKDIR}"/${PN}-extras/* - - prepgamesdirs -} diff --git a/games-roguelike/moria/moria-5.7.10.ebuild b/games-roguelike/moria/moria-5.7.10.ebuild new file mode 100644 index 000000000000..77fadf27a040 --- /dev/null +++ b/games-roguelike/moria/moria-5.7.10.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_IN_SOURCE_BUILD="yes" +inherit cmake-utils prefix user + +DESCRIPTION="The Dungeons of Moria, a single player roguelike game, also known as Umoria" +HOMEPAGE="https://umoria.org/" +SRC_URI="https://github.com/dungeons-of-moria/umoria/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~m68k ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=sys-libs/ncurses-6.0:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/umoria-${PV}" + +PATCHES=( "${FILESDIR}/${P}-gentoo-paths.patch" ) + +pkg_setup(){ + enewgroup gamestat 36 +} + +src_prepare() { + cmake-utils_src_prepare + sed -i "s/@PF@/${PF}/" src/config.cpp || die + hprefixify src/config.cpp +} + +src_install() { + newbin umoria/umoria moria + + insinto /usr/share/moria + doins data/*.txt + + insinto /var/lib/moria + doins data/scores.dat + fowners root:gamestat /var/lib/moria/scores.dat + fperms g+w /var/lib/moria/scores.dat + + doman "${FILESDIR}"/${PN}.6 + dodoc -r AUTHORS README.md docs + + # The game binary will look for plain text LICENSE + insinto /usr/share/doc/${PF} + doins LICENSE + docompress -x /usr/share/doc/${PF}/LICENSE +} + +pkg_postinst() { + elog + elog "Please add users to the 'gamestat' group, so they can run Moria:" + elog " usermod -aG gamestat <user>" + elog +} diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest index 2da5d2a776c3..0fa48acff66f 100644 --- a/games-roguelike/stone-soup/Manifest +++ b/games-roguelike/stone-soup/Manifest @@ -1,10 +1,7 @@ -AUX stone-soup-0.20.1-rltiles-ldflags-libs.patch 1376 BLAKE2B 86c9408973b1f0f8684281e60f891b3597f4cfa6521e5599243628a15acb5a264f2138712e0ccb71f2ed4ece3e2d2f22f357e866e575c7fd40387c0414f4a68c SHA512 ad139978d67df1d824a772f70d331779ed56cf2cce30c4022804740afd77b6d8b22badd9d20af47b4df0a60499a914f749a3520a5ea76ae3e14795d2bf07affa DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f -DIST stone_soup-0.20.1.tar.xz 28372712 BLAKE2B c12a76afcaf1691a74f23bc2b2927ac2573cb83c602a50aab1567b9e2077c6f12f0847c8c27f17c45941660ab0fac1c28b2531c176c1fc0d4e946b84456d4e75 SHA512 420ccc3c66977da8ae15f9c0465b01a6260ad5db450efced3041455674922e714d9aaed226e1bc32fa3c22bca1ec06bd91979a9378c6ab08fbe1d2bfc3f0da4a -DIST stone_soup-0.21.1.tar.xz 29091300 BLAKE2B 0ce29554483eb244eb74ef08c3e2a7d253037cec141e90fba0bf5f59eebb30dad0668c997eba0d6ea12a354d515fe770cc7fcf6a2afb8c968a09cb9a337bcde4 SHA512 1fa50e5b434391b6f3abad62931318f28dd2af3d3148a72c1f2ff80142f3ce9128b8fe6e5b8fbcc502a3d7e79b777bd9f345f8cca06d7e3dbe7575a42f8bd9e7 DIST stone_soup-0.22.0.tar.xz 29263688 BLAKE2B e0a4d6953677583fafe1fce037d4d484c821b4d8782c63fa90b6b4f5db3df7b8fd4c5e843740517a7c2321f864df2a346fcd9bc69a1446c74685afc239d1fc55 SHA512 e8daa0f66a5212b116ce997b30b8f0f9ef01cef7e1213a1b6fe17c800d44fa7e318624902ce638dee79027ffaa3a4af8a10f6552de756a2045b5919d817498bd -EBUILD stone-soup-0.20.1.ebuild 3565 BLAKE2B d5c043296b4f25253b86ae253ffaeb62618871109ababfccd556d0859a9be1e444e990c2a583abc1fd9cc311ee8a37742e5c55e0de15732be7ff11895e421799 SHA512 16f15a1543e8645a4ce6e1c61b5d465294dd44343f248256f946c45aacf0bcf2f97bdb4884356131aa32cfa194c09056a8d5adaf41e3be84ed444eea838e35d6 -EBUILD stone-soup-0.21.1.ebuild 3545 BLAKE2B 235c2657c91f27eb6f6e1fe40fd4c23fdaab854b074dc3b4750749f35ece35b2864d70533bcf8a9c6a240e5518bc278b3b2a192637b41b57be3041b1955f6681 SHA512 65464f308b336390f6ea21aa916124a3ba6bcabf0336db44694796c86aef7569c495259b543cbeaccf40f0e8bd7a03d3a9ca2f4692973e3c50db181acd99c9ec -EBUILD stone-soup-0.22.0.ebuild 3545 BLAKE2B 235c2657c91f27eb6f6e1fe40fd4c23fdaab854b074dc3b4750749f35ece35b2864d70533bcf8a9c6a240e5518bc278b3b2a192637b41b57be3041b1955f6681 SHA512 65464f308b336390f6ea21aa916124a3ba6bcabf0336db44694796c86aef7569c495259b543cbeaccf40f0e8bd7a03d3a9ca2f4692973e3c50db181acd99c9ec -MISC metadata.xml 1546 BLAKE2B f7af831bd9db76d5d95e88db7651c81fc2838f010daa6ff473ea55f82797fb989f2a99e640fea915da87be7255e112f9e4f5766195ad74ec807118908840690e SHA512 7531275c7d11591b8eb8ba4b490a5357bb65d12369b504639b54d3681c364ead0bce2356549028d3a02d06934a3c04ccc57204ee17702b1e7a8866e7960c768b +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 diff --git a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch deleted file mode 100644 index 010c729b92eb..000000000000 --- a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- 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 68e84b34cc48..ec38a399560c 100644 --- a/games-roguelike/stone-soup/metadata.xml +++ b/games-roguelike/stone-soup/metadata.xml @@ -1,6 +1,10 @@ <?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.20.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild deleted file mode 100644 index 3b31a1d1f7c0..000000000000 --- a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -## TODO -# add sound support (no sound files) - -EAPI=6 -VIRTUALX_REQUIRED="manual" -inherit eutils gnome2-utils toolchain-funcs versionator - -MY_P="stone_soup-${PV}" -DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" -HOMEPAGE="http://crawl.develz.org/wordpress/" -SRC_URI=" - https://crawl.develz.org/release/$(get_version_component_range 1-2)/${PN/-/_}-${PV}.tar.xz - https://dev.gentoo.org/~hasufell/distfiles/${PN}.png - https://dev.gentoo.org/~hasufell/distfiles/${PN}.svg -" - -# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h -# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs -# Public Domain|CC0: most of tiles -# 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" -IUSE="debug luajit ncurses test +tiles" -# test is broken -# see https://crawl.develz.org/mantis/view.php?id=6121 -RESTRICT="test" - -RDEPEND=" - dev-db/sqlite:3 - luajit? ( >=dev-lang/luajit-2.0.0 ) - sys-libs/zlib - !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) - ncurses? ( sys-libs/ncurses:0 ) - tiles? ( - media-fonts/dejavu - media-libs/freetype:2 - media-libs/libpng:0 - media-libs/libsdl2[X,opengl,video] - media-libs/sdl2-image[png] - virtual/glu - virtual/opengl - )" -DEPEND="${RDEPEND} - dev-lang/perl - sys-devel/flex - virtual/pkgconfig - virtual/yacc - tiles? ( - sys-libs/ncurses:0 - )" - -S=${WORKDIR}/${MY_P}/source -S_TEST=${WORKDIR}/${MY_P}_test/source -PATCHES=( - "${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch -) - -pkg_setup() { - if use !ncurses && use !tiles ; then - ewarn "Neither ncurses nor tiles frontend" - ewarn "selected, choosing ncurses only." - ewarn "Note that you can also enable both." - fi -} - -src_prepare() { - default - - rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die -} - -src_compile() { - export HOSTCXX=$(tc-getBUILD_CXX) - - # leave DATADIR at the top - myemakeargs=( - $(usex debug "FULLDEBUG=y DEBUG=y" "") - $(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled - AR="$(tc-getAR)" - CFOPTIMIZE='' - CFOTHERS="${CXXFLAGS}" - DATADIR="/usr/share/${PN}" - GCC="$(tc-getCC)" - GXX="$(tc-getCXX)" - LDFLAGS="${LDFLAGS}" - MAKEOPTS="${MAKEOPTS}" - PKGCONFIG="$(tc-getPKG_CONFIG)" - RANLIB="$(tc-getRANLIB)" - SAVEDIR="~/.crawl" - STRIP=touch - USE_LUAJIT=$(usex luajit "yes" "") - V=1 - prefix="/usr" - ) - - if use ncurses || (use !ncurses && use !tiles) ; then - emake "${myemakeargs[@]}" - # move it in case we build both variants - use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;} - fi - - if use tiles ; then - emake clean - emake "${myemakeargs[@]}" "TILES=y" - fi -} - -src_install() { - emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install - [[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses - - # don't relocate docs, needed at runtime - rm -rf "${D}/usr/share/${PN}"/docs/license - - # icons and menu for graphical build - if use tiles ; then - doicon -s 48 "${DISTDIR}"/${PN}.png - doicon -s scalable "${DISTDIR}"/${PN}.svg - make_desktop_entry crawl - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - - if use tiles && use ncurses ; then - elog "Since you have enabled both tiles and ncurses frontends" - elog "the ncurses binary is called 'crawl-ncurses' and the" - elog "tiles binary is called 'crawl'." - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} 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 14ea7d7dbe86..742c2c56bd9e 100644 --- a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 ## TODO @@ -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 diff --git a/games-roguelike/stone-soup/stone-soup-0.21.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild index 14ea7d7dbe86..876c7001d735 100644 --- a/games-roguelike/stone-soup/stone-soup-0.21.1.ebuild +++ b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 ## TODO diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest index cee0246edf36..b3f30e3adc83 100644 --- a/games-roguelike/tomenet/Manifest +++ b/games-roguelike/tomenet/Manifest @@ -1,6 +1,9 @@ AUX tomenet-4.6.1a-makefile.patch 2699 BLAKE2B 480333d83f89c557bbec4bfdbfe0146b2607c8c50269fe365b304575fd92c3948ba00e6b87dfa42a446c92a0830d267b052719b20e0a789c2454a78ab1064de7 SHA512 89e72ec53f43770b3fea6e4d99838eed37c1f537238e7b6c7a16edadcf3755e7611256435702802809575f988238f5f529c4b962994d5d13b34f77b8520cb25d +AUX tomenet-4.7.2-makefile.patch 2365 BLAKE2B 23d83d5b5bcd21b881d4fd6455087fb447d28ffbeac7bf1941e6bbd82189971a8626e5725290c6d1650f5ba6cc006056ed5a7d3546f2d4671e387ce81f7bd0c3 SHA512 b10f3de114eacbbbe95c00e09d1b76cacd2765ac975fa1fe5c661a4939755b36242ddc8cbf5ef012765e4a82a884eb2cb6062e9074c96b6898189c9467bfc2c4 AUX tomenet-server-wrapper 105 BLAKE2B 3b23750806b3bb3a6b5fa9c99aca0f2dbbcce2852bcb80296fd97b36ffb6fa0896939636fce6938f0874ece0b30abe800d10479431eac2cf6d883332d2b432e9 SHA512 9f509cdcc694fe47eed4cfdcb14f0ab3ea7006c202e7f4d8798012e62b89f34cc26834131412e18d2f0edba4237b6c66f4743ff6b780e3080a52e9da992d8cc3 -AUX tomenet-wrapper 446 BLAKE2B 8fbad2e539cbe8a66eb85acbe5a6f941b5b9519b0832a96091c104638cfc0c0b3909e0b8ee00fcfeeadd70cc2e7b17514ec0b311a4a3986dc665669d167a218d SHA512 f148ad2fb52c060ada829810edc46d3aee6bd6c5229489a52b6af080b38b164c0417157bb8ec21294e16903b3e8328329fbb86645ab57a0f0a4407875844c5a2 +AUX tomenet-wrapper 557 BLAKE2B 9b73f87c55815b49f6444e01c552ee1ba102e64b042f33bed89627c39602cf5646e287be99ffd88f26a281b64c4d023b20f2eaac8b924438709a2ac9ef4e1009 SHA512 9a913502af52c7988e8cb3b9c678e556e5f07d4bf99e7e3951f1be6192980da22b8091617d4c4daaac356cd72d7e175706f96ca62d6581ab916bc7a7034eb629 DIST tomenet-4.6.1a.tar.bz2 2990275 BLAKE2B 40d855e4f9e908a8802bba8fd95fcb8c69df026bdc9b891e14a79691e80f7caab48e7826066a761101d932116542d42240457d85998278f8a928dd64ed1ac522 SHA512 eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f +DIST tomenet-4.7.2.tar.bz2 3253873 BLAKE2B 4cba4827a64588c850691ae3b5c7ad0097a322ab1baca42492cbe42bc1e76615fb0084b7b8608e20adf303bded42a9cb80c4d09d0a29f1f68699ffa8e04240bb SHA512 284aa71374b726fd86bfa6b0d820301ec7e5004ddb140a1567c54c883c138cabd2ac55085c222aa057b234dc822f717489128b857ed527fff7d702092bdb51d5 EBUILD tomenet-4.6.1a.ebuild 2143 BLAKE2B 5d8d8090b9ee296683e037a2d84d4d0a0fbc02173fb7450bffa6495e041c268e88dba9bd6835d5de171b892f66924e71d712782b79ba5e109befab2760c23065 SHA512 6534f48ea79938264a95c05062ae10d29757b27b83241f73e2e23c6d3e83eda610c3f079c70f981a341335ac2aa2140c8e4e8d4ce3b9afeb20cf307927955c72 +EBUILD tomenet-4.7.2.ebuild 2057 BLAKE2B cdf3f6cf24757597e41a1ef5f1a2942f021ef02c8e037abdf2c31a105bc3b1e2644d54d1902142d068d73ed6676100147102571d7fc71dc9486efd41be84a410 SHA512 daf2663128b972e6e9eb74afcc03074e903fb7b11485dab4c6eb063141eef0eb3d6768f8966d8affcf668c2b960d81762444d7aa505c8e86713a40e12bb98656 MISC metadata.xml 795 BLAKE2B 61b39e7ecb9d7bee7c9488ba16b75354b92b99fcd6157f8b249406557fb93b7bdb9d476c264b4aec5501bfe73987667e94b21db81d0a6aefea0fac7b76a4d418 SHA512 4e7b25ba67a044e76013a5d2c88979d5f082872e785576b37647face2e0cff9056d138df0cd16db23b5b79328156d110d7adf667ba2481c089569fb02b18a0f1 diff --git a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch new file mode 100644 index 000000000000..1b89c2bc987d --- /dev/null +++ b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch @@ -0,0 +1,65 @@ +diff --git a/makefile b/makefile +index ee56a33..7f3c81f 100644 +--- a/makefile ++++ b/makefile +@@ -203,7 +203,7 @@ CLI_LUAOBJS = \ + # + # This is my compiler of choice, it seems to work most everywhere + # +-CC = gcc ++CC ?= gcc + + # For allowing #if..#else..#endif constructs in LUA files - C. Blue + # Note: The flags must contain +@@ -215,16 +215,26 @@ CC = gcc + # need to use the gcc invocation below instead. + # + # cpp variant: +-CPP = cpp +-CPPFLAGS = -C -P ++#CPP = cpp ++#CPPFLAGS = -C -P + # gcc variant: +-#CPP = gcc +-#CPPFLAGS = -x c -E -Wp,-C,-P ++CPP ?= gcc ++CPPFLAGS = -x c -E -Wp,-C,-P + + + # For variations with X11 + X11BASE = /usr/X11R6 + ++# defines ++ifdef USE_SDL ++CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags) ++SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer ++endif ++ ++ifdef USE_X ++CFLAGS += -I${X11BASE}/include -DUSE_X11 ++LIBS += -L${X11BASE}/lib -lX11 ++endif + + ## + ## Standard version -- supports X11 (main-x11.c) +@@ -236,6 +246,11 @@ X11BASE = /usr/X11R6 + ## With SDL + #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` + #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer ++ ++CFLAGS += -Wall ++CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 ++LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS} ++ + ## + ## Without SDL + #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 +@@ -259,7 +274,7 @@ X11BASE = /usr/X11R6 + #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIC + CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIC -Wno-format-truncation + #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer +-LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer ++LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer + ACCEDIT_LIBS = -lcurses -lcrypt + ## + ## Without SDL diff --git a/games-roguelike/tomenet/files/tomenet-wrapper b/games-roguelike/tomenet/files/tomenet-wrapper index 2ca29b862176..71abcb79cf25 100644 --- a/games-roguelike/tomenet/files/tomenet-wrapper +++ b/games-roguelike/tomenet/files/tomenet-wrapper @@ -1,11 +1,11 @@ #!/bin/sh -if [ ! -e ~/.tomenet/.gentoo ]; then +if [ ! -e ~/.tomenet/.gentoo ] || [ ! -e ~/.tomenet/game ] || [ ! -e ~/.tomenet/text ] ; then LIBDIR="@LIBDIR@" [ -e ~/.tomenet ] || mkdir ~/.tomenet - ln -s "${LIBDIR}"/game ~/.tomenet/game - ln -s "${LIBDIR}"/text ~/.tomenet/text + [ -e ~/.tomenet/game ] || ln -sf "${LIBDIR}"/game ~/.tomenet/game + [ -e ~/.tomenet/text ] || ln -sf "${LIBDIR}"/text ~/.tomenet/text cp -R "${LIBDIR}"/user "${LIBDIR}"/scpt "${LIBDIR}"/xtra ~/.tomenet/ [ -e ~/.tomenetrc ] || cp "${LIBDIR}"/.tomenetrc ~/.tomenetrc diff --git a/games-roguelike/tomenet/tomenet-4.7.2.ebuild b/games-roguelike/tomenet/tomenet-4.7.2.ebuild new file mode 100644 index 000000000000..5da772d9c22c --- /dev/null +++ b/games-roguelike/tomenet/tomenet-4.7.2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils gnome2-utils toolchain-funcs + +DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien" +HOMEPAGE="https://www.tomenet.eu" +SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2" + +LICENSE="Moria" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dedicated server +sound X" + +RDEPEND="sys-libs/ncurses:0 + !dedicated? ( + X? ( + x11-libs/libX11 + ) + sound? ( + media-libs/libsdl[sound] + media-libs/sdl-mixer[vorbis,smpeg,mp3] + ) + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )" + +S=${WORKDIR}/${P}/src + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch +) + +src_prepare() { + default + use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;} + + sed \ + -e "s#@LIBDIR@#/usr/share/${PN}#" \ + "${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die + + if use server || use dedicated ; then + sed \ + -e "s#@LIBDIR@#/usr/share/${PN}#" \ + "${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die + fi + + tc-export PKG_CONFIG +} + +src_compile() { + local mytargets="$(usex dedicated "accedit tomenet.server" "$(usex server "all" "tomenet")")" + emake \ + $(usex dedicated "" "$(usex X "USE_X=1" "")") \ + $(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \ + -f makefile \ + ${mytargets[@]} +} + +src_install() { + dodoc ../TomeNET-Guide.txt + + if ! use dedicated ; then + newbin ${PN} ${PN}.bin + dobin "${T}"/${PN} + + doicon -s 48 client/tomenet4.png + make_desktop_entry ${PN} ${PN} ${PN}4 + fi + + if use server || use dedicated ; then + newbin tomenet.server tomenet.server.bin + dobin "${T}"/${PN}.server accedit + fi + + insinto "/usr/share/${PN}" + doins -r ../lib/* + doins ../.tomenetrc +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + + if use sound; then + elog "You can get soundpacks from here:" + elog ' https://tomenet.net/downloads.php' + elog "They must be placed inside ~/.tomenet directory." + fi +} + +pkg_postrm() { + gnome2_icon_cache_update +} |