[gentoo-commits] repo/gentoo:master commit in: games-roguelike/moria/files/, games-roguelike/moria/

["Stefan Strogin" <steils@gentoo.org>]

commit:     c4d5afb9e7beb83378586c3962f8d4643b7ed6f9
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  7 23:11:40 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 23:17:32 2020 +0000
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 <steils <AT> 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() {