From: Tristan Heaven Date: Thu, 23 Nov 2006 21:39:23 +0000 (+0000) Subject: Fix hardcoded paths X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=202a4a1bab7945a8cbdf7c3a04c6e041e01d63a1;p=gentoo.git Fix hardcoded paths Package-Manager: portage-2.1.2_rc2-r1 --- diff --git a/games-emulation/atari800/ChangeLog b/games-emulation/atari800/ChangeLog index 6fb59418982a..4bfcef238117 100644 --- a/games-emulation/atari800/ChangeLog +++ b/games-emulation/atari800/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-emulation/atari800 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/ChangeLog,v 1.17 2006/11/22 15:55:16 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/ChangeLog,v 1.18 2006/11/23 21:39:23 nyhm Exp $ + + 23 Nov 2006; Tristan Heaven atari800-2.0.2.ebuild: + Fix hardcoded paths 22 Nov 2006; Joseph Jezak atari800-2.0.2.ebuild: Marked ppc stable for bug #153645. diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest index 3e2abb294023..6d973974ed05 100644 --- a/games-emulation/atari800/Manifest +++ b/games-emulation/atari800/Manifest @@ -7,7 +7,7 @@ RMD160 a67459343b81a879aa58bddd5706512bec7fa8a9 files/atari800.cfg 467 SHA256 562981fd5d3e1e028c3da484ca18bbe5c0a7f5a01eb8740cff14c4a18e05a3e7 files/atari800.cfg 467 DIST atari800-1.3.6.tar.gz 1012231 DIST atari800-2.0.1.tar.gz 939745 RMD160 42b5f94dfe396cb8d62b7e4fe83958c385e14b4e SHA256 6e272db5ab7dba56257e189062e4ee05eb5a8d7aa5254eeb92691cfc9a79ca9e -DIST atari800-2.0.2.tar.gz 982758 RMD160 a9e3d971b62192be945abf828552bab0a16a7fda SHA256 d41fc78c264738f2304d8795764b89e6c4705f445e3aaab38f0eaafe92e66c37 +DIST atari800-2.0.2.tar.gz 982758 RMD160 a9e3d971b62192be945abf828552bab0a16a7fda SHA1 23dd5e2ce9232945fb3c694cb011c86966b49863 SHA256 d41fc78c264738f2304d8795764b89e6c4705f445e3aaab38f0eaafe92e66c37 DIST xf25.zip 188942 RMD160 e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7 SHA1 e65923fd3a4845c1c72d1677db0fda969187eb42 SHA256 98ae0ad10413dd6f35ed80f5662dba6d790def70c7829046e52012a03b574b8a EBUILD atari800-1.3.6.ebuild 2534 RMD160 8691db09ed4e1ae3bd3fe53b39f4d369dd17783b SHA1 a16b9b9fd1d4d5e57f967ded7dfd89717d314dde SHA256 502204f9bd34bd977b669e73313259dca7ba29c76e3a295e5d9dc9abb8d8287a MD5 7d59e3bc1e527ea3c21489e9f191a0f4 atari800-1.3.6.ebuild 2534 @@ -17,14 +17,14 @@ EBUILD atari800-2.0.1.ebuild 2535 RMD160 d57daf977384ca0b9d37fed8917c95f96a93382 MD5 5037ed474181e2cefd71e26ce0e925e2 atari800-2.0.1.ebuild 2535 RMD160 d57daf977384ca0b9d37fed8917c95f96a933825 atari800-2.0.1.ebuild 2535 SHA256 ee9449a586aa27691a64e11e2d42f1c7407e7570d2212878958c2001e15a14b8 atari800-2.0.1.ebuild 2535 -EBUILD atari800-2.0.2.ebuild 2532 RMD160 548955ef527a80b9d051a413832fd3d376712211 SHA1 4476fe329468b3cb3d371fd8f4cec83084d6b00b SHA256 2663a8bf77254000212cd2b3b3991d12b52121a5ac7582bec8b367ab5694c5e7 -MD5 512ba0ed38bae9a263261bc92211da1e atari800-2.0.2.ebuild 2532 -RMD160 548955ef527a80b9d051a413832fd3d376712211 atari800-2.0.2.ebuild 2532 -SHA256 2663a8bf77254000212cd2b3b3991d12b52121a5ac7582bec8b367ab5694c5e7 atari800-2.0.2.ebuild 2532 -MISC ChangeLog 3395 RMD160 f8868b02fb72fbf3caa308e20cfc230f11a9363f SHA1 2cf4238a64ad45d739bc70bb98454eace334a578 SHA256 9cd76855ffbc4dda341d1ad4845bab9aaeaed114dd3d22a0be9921ccfffd1ce5 -MD5 e8813a074126caba74b5af61010e0a7f ChangeLog 3395 -RMD160 f8868b02fb72fbf3caa308e20cfc230f11a9363f ChangeLog 3395 -SHA256 9cd76855ffbc4dda341d1ad4845bab9aaeaed114dd3d22a0be9921ccfffd1ce5 ChangeLog 3395 +EBUILD atari800-2.0.2.ebuild 2647 RMD160 49b0321e99f37990d7e8fcbf8cbb632bff57f1c1 SHA1 e14dedbaa01faf332ca24a7ea38d08f70eadd088 SHA256 df330fce2f286657f12cd89cdcba6b873c2ee352f3d1cf5668209b73fe77d8e2 +MD5 44a8ab814f700823813bbd96f7d35447 atari800-2.0.2.ebuild 2647 +RMD160 49b0321e99f37990d7e8fcbf8cbb632bff57f1c1 atari800-2.0.2.ebuild 2647 +SHA256 df330fce2f286657f12cd89cdcba6b873c2ee352f3d1cf5668209b73fe77d8e2 atari800-2.0.2.ebuild 2647 +MISC ChangeLog 3487 RMD160 de59bd47d801340d6d637c3941d981003678c117 SHA1 9f678c487e2e30dfea9f0fc05597c99682d60c41 SHA256 724e7de4867c19c22d1a93b5a06ef0f22c04f1256e6eff1e9f85349bae2bcd6c +MD5 a68171145f7f249777ff53768d2c4f8a ChangeLog 3487 +RMD160 de59bd47d801340d6d637c3941d981003678c117 ChangeLog 3487 +SHA256 724e7de4867c19c22d1a93b5a06ef0f22c04f1256e6eff1e9f85349bae2bcd6c ChangeLog 3487 MISC metadata.xml 776 RMD160 c2603c6c29079814365631d86c43df08370791d9 SHA1 18fabdae1b36c25275fa255e84cbc34f8fd065aa SHA256 220ac4874a800bf3105d0c8c715b3f105d257d9e3b55a909cd602537ee96e9bf MD5 def6e0b636bc74dc3c20a4ec29262591 metadata.xml 776 RMD160 c2603c6c29079814365631d86c43df08370791d9 metadata.xml 776 @@ -41,7 +41,7 @@ SHA256 c111ba03e541969be410ce2d19bfcd92f3d7aad01fa7fcd24789e3fb7b1e48e6 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFZHLmcsIHjyDViGQRAlKmAJ4zjadTNQVIKse8LKaZXt3YRcTyjQCfUYVx -1yQM76M8XgfU5ZWcouFMVbg= -=hKFU +iD8DBQFFZhURdz7hIScOURERAnRHAJ45QIY4V13JdkWz07O4tdBUfPQi0gCfdw4k +qT8Ss1+yhDHXHgr3/fQRxNI= +=hIfR -----END PGP SIGNATURE----- diff --git a/games-emulation/atari800/atari800-2.0.2.ebuild b/games-emulation/atari800/atari800-2.0.2.ebuild index 3f2ffd3ecf6c..d35fbedbe720 100644 --- a/games-emulation/atari800/atari800-2.0.2.ebuild +++ b/games-emulation/atari800/atari800-2.0.2.ebuild @@ -1,29 +1,27 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/atari800-2.0.2.ebuild,v 1.4 2006/11/22 15:55:16 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/atari800/atari800-2.0.2.ebuild,v 1.5 2006/11/23 21:39:23 nyhm Exp $ inherit games DESCRIPTION="Atari 800 emulator" HOMEPAGE="http://atari800.sourceforge.net/" -SRC_URI="mirror://sourceforge/atari800/${P}.tar.gz - mirror://sourceforge/atari800/xf25.zip" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + mirror://sourceforge/${PN}/xf25.zip" -LICENSE="GPL-1" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ppc sparc x86" IUSE="sdl" RDEPEND="sdl? ( >=media-libs/libsdl-1.2.0 ) - !sdl? ( || ( ( x11-libs/libX11 ) virtual/x11 ) )" + !sdl? ( x11-libs/libX11 )" DEPEND="${RDEPEND} !sdl? ( - || ( - ( x11-libs/libXt - x11-libs/libX11 - x11-proto/xextproto - x11-proto/xproto ) - virtual/x11 ) ) + x11-libs/libXt + x11-libs/libX11 + x11-proto/xextproto + x11-proto/xproto ) app-arch/unzip" src_unpack() { @@ -31,6 +29,8 @@ src_unpack() { cd "${S}" # remove some not-so-interesting ones rm -f DOC/{INSTALL.*,*.in,CHANGES.OLD} + sed -i "/CFG_FILE/s:/etc:${GAMES_SYSCONFDIR}:" \ + src/atari.c || die "sed failed" } src_compile() { @@ -60,8 +60,11 @@ src_install () { dodoc README.1ST DOC/* insinto "${GAMES_DATADIR}/${PN}" doins "${WORKDIR}/"*.ROM || die "doins failed (ROM)" - insinto /etc - doins "${FILESDIR}/atari800.cfg" || die "doins failed (cfg)" + sed "s:/usr/share/games:${GAMES_DATADIR}:" \ + "${FILESDIR}"/atari800.cfg > "${T}"/atari800.cfg \ + || die "sed failed" + insinto "${GAMES_SYSCONFDIR}" + doins "${T}"/atari800.cfg || die "doins failed (cfg)" prepgamesdirs } @@ -69,30 +72,27 @@ pkg_postinst() { games_pkg_postinst if use sdl ; then echo + elog 'The emulator has been compiled using the SDL libraries. By default,' + elog 'atari800 switches to fullscreen mode, so a 400x300 entry in your' + elog 'XF86Config-4 file is recommended. Otherwise, the emulated Atari' + elog 'screen is postage-stamp sized in the middle of your display.' echo - einfo 'The emulator has been compiled using the SDL libraries. By default,' - einfo 'atari800 switches to fullscreen mode, so a 400x300 entry in your' - einfo 'XF86Config-4 file is recommended. Otherwise, the emulated Atari' - einfo 'screen is postage-stamp sized in the middle of your display.' - echo - einfo 'For example, in the "Screen" section of your /etc/XF86Config-4 file,' - einfo 'add the entry "400x300" to the end of the list of modes:' - echo - einfo ' Section "Screen"' - einfo ' [...]' - einfo - einfo ' Subsection "Display"' - einfo ' Depth 16' - einfo ' Modes "1600x1200" "1024x768" "400x300"' - einfo ' ViewPort 0 0' - einfo ' EndSubsection' - einfo ' EndSection' - echo - einfo 'You should not need to specify a modeline for this mode,' - einfo 'since in most cases it is a standard mode calculated by' - einfo 'the X server.' + elog 'For example, in the "Screen" section of your /etc/XF86Config-4 file,' + elog 'add the entry "400x300" to the end of the list of modes:' echo + elog ' Section "Screen"' + elog ' [...]' + elog + elog ' Subsection "Display"' + elog ' Depth 16' + elog ' Modes "1600x1200" "1024x768" "400x300"' + elog ' ViewPort 0 0' + elog ' EndSubsection' + elog ' EndSection' echo + elog 'You should not need to specify a modeline for this mode,' + elog 'since in most cases it is a standard mode calculated by' + elog 'the X server.' echo fi }