[gentoo-commits] repo/gentoo:master commit in: games-roguelike/moria/files/, games-roguelike/moria/
commit: c4d5afb9e7beb83378586c3962f8d4643b7ed6f9
Author: Stefan Strogin gentoo org>
AuthorDate: Sun Jun 7 23:11:40 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Sun Jun 7 23:17:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4d5afb9
games-roguelike/moria: don't install license; read it from /usr/portage/
And install files from ${build_dir} which is umoria/, not data/,
otherwise splash.txt and versions.txt are not installed.
It changes the installed files, so bump the revision.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Stefan Strogin gentoo.org>
...10-gentoo-paths.patch => moria-5.7.12-gentoo-paths.patch} | 8
.../moria/{moria-5.7.12.ebuild => moria-5.7.12-r1.ebuild}| 12 +++-
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch
b/games-roguelike/moria/files/moria-5.7.12-gentoo-paths.patch
similarity index 91%
rename from games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch
rename to games-roguelike/moria/files/moria-5.7.12-gentoo-paths.patch
index 0d17c549e77..a5ae834413d 100644
--- a/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch
+++ b/games-roguelike/moria/files/moria-5.7.12-gentoo-paths.patch
@@ -1,8 +1,8 @@
diff --git a/src/config.cpp b/src/config.cpp
-index 09528f7..1c299ed 100644
+index 36f565b..bfe1b18 100644
--- a/src/config.cpp
+++ b/src/config.cpp
-@@ -12,17 +12,17 @@ namespace config {
+@@ -13,17 +13,17 @@ namespace config {
// Data files used by Umoria
// NOTE: use relative paths to the executable binary.
namespace files {
@@ -19,7 +19,7 @@ index 09528f7..1c299ed 100644
-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 license = "/usr/portage/licenses/GPL-2";
+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";
@@ -29,5 +29,5 @@ index 09528f7..1c299ed 100644
+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";
- }
+ } // namespace files
diff --git a/games-roguelike/moria/moria-5.7.12.ebuild
b/games-roguelike/moria/moria-5.7.12-r1.ebuild
similarity index 78%
rename from games-roguelike/moria/moria-5.7.12.ebuild
rename to games-roguelike/moria/moria-5.7.12-r1.ebuild
index dbdd1675933..4e425eb4de6 100644
--- a/games-roguelike/moria/moria-5.7.12.ebuild
+++ b/games-roguelike/moria/moria-5.7.12-r1.ebuild
@@ -22,11 +22,10 @@ BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/umoria-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-5.7.10-gentoo-paths.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.7.12-gentoo-paths.patch" )
src_prepare() {
cmake_src_prepare
- sed -i "s/@PF@/${PF}/" src/config.cpp || die
hprefixify src/config.cpp
}
@@ -34,20 +33,15 @@ src_install() {
newbin umoria/umoria moria
insinto /usr/share/moria
- doins data/*.txt
+ doins umoria/data/*.txt
insinto /var/lib/moria
- doins data/scores.dat
+ doins umoria/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 CHANGELOG.md CONTRIBUTING.md README.md historical
-
- # 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() {
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/moria/files/, games-roguelike/moria/
commit: 2a81109ee4433d86f3cff85feeadd5e0cb3ec7ac
Author: Stefan Strogin gentoo org>
AuthorDate: Sun Jun 7 20:26:31 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Sun Jun 7 20:29:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a81109e
games-roguelike/moria: upgrade 5.7.10 -> 5.7.12
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Stefan Strogin gentoo.org>
games-roguelike/moria/Manifest | 2 +-
.../moria/files/moria-5.7.10-tinfo.patch | 24 --
.../{moria-5.7.10.ebuild => moria-5.7.12.ebuild} | 7 ++-
3 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index 7ac29351c30..49b1ce1a8e9 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -1 +1 @@
-DIST moria-5.7.10.tar.gz 392842 BLAKE2B
6b1f372d2c5503c708428b119e2c0333d3134eab3bd76ad8453ee062764b41d9dccca31c1512bd9561b5ba48b59dac32a447bb058c26c1cd9595cdc2e06cb9fc
SHA512
f81754f03ae36ab5a8737fb0ae18da422b87da8684d00c88c934afa2c0b42e429c23a475751c506b499f809a421d1d3dfcc729e0d64d901b2e6c74e444d0f06f
+DIST moria-5.7.12.tar.gz 394633 BLAKE2B
a73213809ee2f68249cd6c91b9b90a68b91fb1ffb40609c62becd05fd8f874bc6ce7ede97e76dcaab6f8081203f42c5295a1f5613d2d47644b5c585b4e96f2e1
SHA512
007768586e5a8fe11a6f65981fa1fe0071b00c53730b309883710a8f1f6bb8f812926467ec2947be7f582228f6d2e5d3d7306ee5504f2ffc056d3ed343d7a9cb
diff --git a/games-roguelike/moria/files/moria-5.7.10-tinfo.patch
b/games-roguelike/moria/files/moria-5.7.10-tinfo.patch
deleted file mode 100644
index 5173a7d00f4..000
--- a/games-roguelike/moria/files/moria-5.7.10-tinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From aa3ebbd2eb4b4a6ab92833060c212255d90c68b4 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin
-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.12.ebuild
similarity index 90%
rename from games-roguelike/moria/moria-5.7.10.ebuild
rename to games-roguelike/moria/moria-5.7.12.ebuild
index 39187828c50..dbdd1675933 100644
--- a/games-roguelike/moria/moria-5.7.10.ebuild
+++ b/games-roguelike/moria/moria-5.7.12.ebuild
@@ -22,10 +22,7 @@ BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/umoria-${PV}"
-PATCHES=(
- "${FILESDIR}/${P}-gentoo-paths.patch"
- "${FILESDIR}/${P}-tinfo.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.7.10-gentoo-paths.patch" )
src_prepare() {
cmake_src_prepare
@@ -45,7 +42,7 @@ src_install() {
fperms g+w /var/lib/moria/scores.dat
doman "${FILESDIR}"/${PN}.6
- dodoc -r AUTHORS README.md docs
+ dodoc -r AUTHORS CHANGELOG.md CONTRIBUTING.md README.md historical
# The game binary will look for plain text LICENSE
insinto /usr/share/doc/${PF}
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/moria/files/, games-roguelike/moria/
commit: 87873260e20e28328606357a3bf8c41eeae87dbb
Author: Stefan Strogin gmail com>
AuthorDate: Mon Feb 11 00:41:09 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Feb 12 22:01:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87873260
games-roguelike/moria: fix build with sys-libs/ncurses[tinfo]
Closes: https://bugs.gentoo.org/677672
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Stefan Strogin gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11025
Signed-off-by: James Le Cuirot gentoo.org>
.../moria/files/moria-5.7.10-tinfo.patch | 24 ++
games-roguelike/moria/moria-5.7.10.ebuild | 5 -
2 files changed, 28 insertions(+), 1 deletion(-)
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 000..5173a7d00f4
--- /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
+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 77fadf27a04..999c073daa4 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
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/moria/files/, games-roguelike/moria/
commit: c27a8b891c263d60c4685c9a314953a65a1e6a7c
Author: Stefan Strogin gmail com>
AuthorDate: Wed Jan 23 22:08:20 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 3 14:07:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27a8b89
games-roguelike/moria: version 5.7.10
Closes: https://bugs.gentoo.org/674540
Package-Manager: Portage-2.3.57, Repoman-2.3.12
Signed-off-by: Stefan Strogin gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10899
Signed-off-by: Andreas Sturmlechner gentoo.org>
games-roguelike/moria/Manifest | 1 +
.../moria/files/moria-5.7.10-gentoo-paths.patch| 33 +++
games-roguelike/moria/files/moria.6| 108 +
games-roguelike/moria/metadata.xml | 11 ++-
games-roguelike/moria/moria-5.7.10.ebuild | 49 ++
5 files changed, 198 insertions(+), 4 deletions(-)
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index cbe1291829f..c64583a00c4 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -1,2 +1,3 @@
+DIST moria-5.7.10.tar.gz 392842 BLAKE2B
6b1f372d2c5503c708428b119e2c0333d3134eab3bd76ad8453ee062764b41d9dccca31c1512bd9561b5ba48b59dac32a447bb058c26c1cd9595cdc2e06cb9fc
SHA512
f81754f03ae36ab5a8737fb0ae18da422b87da8684d00c88c934afa2c0b42e429c23a475751c506b499f809a421d1d3dfcc729e0d64d901b2e6c74e444d0f06f
DIST moria-extras.tar.bz2 57324 BLAKE2B
7a885e5595c8c3a3d0a29c65729e03ab1d26ad514b96a1d078a436960c1245283a51544dc54c6a5f225b77da3c3a72f8c7407efeac2b0629d51330b3abf9af49
SHA512
39d04ffdbe779fc070ee72084df5c731f8db25116e9156898d4c78c86e02288cf3560849461f2081209a06a74274789a671b104dc806b63a0d955adad17fd85f
DIST um5.5.2.tar.Z 910536 BLAKE2B
d36d5cbb45992937f8e7c2f98cf2ad568e11e2d2b1af107e77ba98d8cfc23f2f4bcdb43ab9d5a9dd05e0ec45a5ecd298a1c4c7307bc0f75ca629c9c63cf9d3bb
SHA512
987bbccb9cb4870ec91704cd20cf19875320d1cfe62c4c5a0063bfc3827732a0e3334a4ea3712137f3262d7418db0ea7e803d724e2dec4d5eb41ebe741f326cc
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 000..0d17c549e77
--- /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 000..be1fc7cc353
--- /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
