diff options
| author |   Stefan Strogin <steils@gentoo.org> | 2020-06-08 02:11:40 +0300 |
|---|---|---|
| committer | Stefan Strogin <steils@gentoo.org> | 2020-06-08 02:17:32 +0300 |
| commit | c4d5afb9e7beb83378586c3962f8d4643b7ed6f9 (patch) | |
| tree | bb76edc605fe9032c005b82360e55200de168ed0 | |
| parent | dev-util/idea-community: Version bump (diff) | |
| download | gentoo-c4d5afb9e7beb83378586c3962f8d4643b7ed6f9.tar.gz gentoo-c4d5afb9e7beb83378586c3962f8d4643b7ed6f9.tar.bz2 gentoo-c4d5afb9e7beb83378586c3962f8d4643b7ed6f9.zip | |
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@gentoo.org>
| -rw-r--r-- | games-roguelike/moria/files/moria-5.7.12-gentoo-paths.patch (renamed from games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch) | 8 | ||||
| -rw-r--r-- | games-roguelike/moria/moria-5.7.12-r1.ebuild (renamed from games-roguelike/moria/moria-5.7.12.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 index 0d17c549e773..a5ae834413d7 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 index dbdd16759330..4e425eb4de66 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() { |