Correct installation of files when GAMES_DATADIR is different than

/usr/share/games; bug #145008.
Package-Manager: portage-2.1.2_rc4-r5

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index f1dada5672329396018d726f9e0c121cafa5c4a6..5572e281bff3a5845448cf9868e6fece145e8dc6 100644 (file)
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/openttd
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.30 2006/12/03 17:22:25 pylon Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.31 2007/01/06 16:05:00 pylon Exp $
+
+  06 Jan 2007; Lars Weiler <pylon@gentoo.org> openttd-0.4.8.ebuild:
+  Correct installation of files when GAMES_DATADIR is different than
+  /usr/share/games; bug #145008.
 
   03 Dec 2006; Lars Weiler <pylon@gentoo.org> -openttd-0.4.0.1-r1.ebuild,
   openttd-0.4.8.ebuild:

diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 5a53629e3a34b0772036643f9eef6ecf2654951f..4ac74f474a3b0d6fb57a2cf4c1b9ac1ded8ca9d2 100644 (file)
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -8,14 +8,14 @@ RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd files/openttd.initd 529
 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 files/openttd.initd 529
 DIST openttd-0.4.8-scenarios.tar.bz2 5000799 RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 SHA1 88b3caff739fbf7bd4eb143ae97925556e813ce4 SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca
 DIST openttd-0.4.8-source.tar.bz2 2212990 RMD160 9ec9d8ee3531dc5a4f421eae6844a50299c22455 SHA1 8161079003dadbd7153d65cc88f373f16a0c0aab SHA256 39556ac3524e762c7bfbd6b1438590c9d5010bed99b4aff725e68897a0d62f8f
-EBUILD openttd-0.4.8.ebuild 5042 RMD160 d7e84bf83476a794e5cee306289a66a4a2ac7638 SHA1 01c50f0e2171506b36ef8d4ba70a71a43f0939d3 SHA256 ab396217dd81192cb93dbb49440dd65346dfba3a88cf628d56c4a893f4cfeae4
-MD5 1efb79e0424ed97de3b030bab5801db4 openttd-0.4.8.ebuild 5042
-RMD160 d7e84bf83476a794e5cee306289a66a4a2ac7638 openttd-0.4.8.ebuild 5042
-SHA256 ab396217dd81192cb93dbb49440dd65346dfba3a88cf628d56c4a893f4cfeae4 openttd-0.4.8.ebuild 5042
-MISC ChangeLog 5172 RMD160 749f8b71b9cfaf58aceb9b76d14a2536723400c4 SHA1 ed48fc5b4179c40dde45d7a2b5dc834c1f44a4c1 SHA256 7b74fe8f0f3e773f34fb17195d53a190e048fc41e4c0eb0de35bb385c2cf0f3e
-MD5 945cfee124193c4be13e10ea9c38443d ChangeLog 5172
-RMD160 749f8b71b9cfaf58aceb9b76d14a2536723400c4 ChangeLog 5172
-SHA256 7b74fe8f0f3e773f34fb17195d53a190e048fc41e4c0eb0de35bb385c2cf0f3e ChangeLog 5172
+EBUILD openttd-0.4.8.ebuild 5315 RMD160 615025d777a177ba1fc888d22c819359fd9afdce SHA1 13bf0d1cd47d5bf01cf4fb703eccc48cdd82752d SHA256 f94a1a6dc9982f0a6af38cc4b5297ede3f406659f5bc78ec902dbe0d3c8b46bc
+MD5 5a4bf2dac6a5acf721ecb7cf30e4caa4 openttd-0.4.8.ebuild 5315
+RMD160 615025d777a177ba1fc888d22c819359fd9afdce openttd-0.4.8.ebuild 5315
+SHA256 f94a1a6dc9982f0a6af38cc4b5297ede3f406659f5bc78ec902dbe0d3c8b46bc openttd-0.4.8.ebuild 5315
+MISC ChangeLog 5343 RMD160 c6ff68f567b210ac37c2c9d261afd82ac282c4ef SHA1 60d2eb89b02b5eb9407ad73df74a7c4a02a5a01c SHA256 93eed7a09f0d9d360b46ffe273326672589aa27b790274dd8ebe6dc6f9bc9334
+MD5 17e5d9a4db79099bcfc7152529716ba8 ChangeLog 5343
+RMD160 c6ff68f567b210ac37c2c9d261afd82ac282c4ef ChangeLog 5343
+SHA256 93eed7a09f0d9d360b46ffe273326672589aa27b790274dd8ebe6dc6f9bc9334 ChangeLog 5343
 MISC metadata.xml 379 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e SHA1 8b42b16535813e370be26ed1be6c97e947aca724 SHA256 8ba83d4305e1fa7698ab48d81f15053607da61690be4ec95e9c6a2aa499160c3
 MD5 255758e5fa9c77c52b49ed29dc311262 metadata.xml 379
 RMD160 58e5ec6d6482e2b60f3bdd99a26cb68ff16e0a3e metadata.xml 379

diff --git a/games-simulation/openttd/openttd-0.4.8.ebuild b/games-simulation/openttd/openttd-0.4.8.ebuild
index 324b28bfead7b5c76ac5fef994bd836be2ff36e1..515509d391389b48a8c3326eff36a5b4d31cb65c 100644 (file)
--- a/games-simulation/openttd/openttd-0.4.8.ebuild
+++ b/games-simulation/openttd/openttd-0.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.4.8.ebuild,v 1.6 2006/12/03 17:22:25 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.4.8.ebuild,v 1.7 2007/01/06 16:05:00 pylon Exp $
 
 inherit eutils games
 
@@ -36,7 +36,9 @@ src_unpack() {
        fi
        cd ${S}
        # Don't pre-strip binaries (bug #137822)
-       sed -i '/+= -s$/s/-s//' Makefile || die "sed failed"
+       sed -i -e '/+= -s$/s/-s//' Makefile || die "sed failed"
+       # Don't install into prefixed DATA_DIR
+       sed -i -e 's#DATA_DIR_PREFIXED:=$(PREFIX)/$(DATA_DIR)#DATA_DIR_PREFIXED:=$(DATA_DIR)#' Makefile || die "sed failed"
 }
 
 src_compile() {
@@ -60,9 +62,11 @@ src_compile() {
                INSTALL=1 \
                RELEASE=${PV} \
                USE_HOMEDIR=1 \
+               DEST_DIR=${D} \
                PERSONAL_DIR=.openttd \
-               PREFIX=/usr \
-               DATA_DIR=share/games/${PN} \
+               PREFIX=${GAMES_PREFIX} \
+               DATA_DIR=${GAMES_DATADIR}/${PN} \
+               CUSTOM_LANG_DIR=${GAMES_DATADIR}/${PN}/lang \
                ${myopts} \
                || die "emake failed"
 }
@@ -100,6 +104,7 @@ src_install() {
        fi
 
        dodoc readme.txt known-bugs.txt changelog.txt docs/Manual.txt docs/console.txt docs/multiplayer.txt
+       dohtml -a html,gif,png docs/*
        newdoc scripts/readme.txt readme_scripts.txt
        doman docs/openttd.6
        prepgamesdirs