From: Michael Sterrett Date: Tue, 27 Jan 2015 07:11:23 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2665b8dd219f8a941a9d3df31b44f2e171fb6240;p=gentoo.git old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/games-emulation/hatari/ChangeLog b/games-emulation/hatari/ChangeLog index b0e2f8006ed7..898e12c04f0d 100644 --- a/games-emulation/hatari/ChangeLog +++ b/games-emulation/hatari/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-emulation/hatari # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.48 2015/01/18 09:50:31 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.49 2015/01/27 07:11:18 mr_bones_ Exp $ + + 27 Jan 2015; Michael Sterrett + -files/hatari-1.7.0-gentoo-docdir.patch, -files/hatari-1.7.0-gentoo.patch, + -hatari-1.7.0.ebuild: + old *hatari-1.8.0 (18 Jan 2015) diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest index b76e08f5398d..9732998715bd 100644 --- a/games-emulation/hatari/Manifest +++ b/games-emulation/hatari/Manifest @@ -1,24 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX hatari-1.6.2-gentoo-docdir.patch 583 SHA256 159dd7203fa9feefb33f49b331f237f5d80639bc2d0ca33342c4359648161782 SHA512 95ee37df0b0bca685c2e03f02bcbcced71eb8463c32356956b440cb53248accd970d63a77bbb072d2703201cc7d40de1d13bacab2e8c36370664f4d8e085ebb9 WHIRLPOOL 4a6f7aa067293d9206ed8d4a693ce264d188fec70bc7447e7135a1484419f83ace5e178502aa81ac1e32f145d2d08b178235c5c4d9d42593c29b9c2611d197de AUX hatari-1.6.2-gentoo.patch 3174 SHA256 5f64695305cf1076e795ff8c17a903aa9aed4be02960b9491b637a0a93f8c3bc SHA512 d3b0240f657b219d7c770b8b64b0c904020036b71e4ebb7988b3f3f899010667cd4431db672b91f201ee16151ab1f278833e83c59decd9a4ce062930e8fda68e WHIRLPOOL 365d14b2aa87ae9213aac48367728605665cf3dc05ed3c2a12956b446dbba6514f60f6fd1c966cd70c42462dbe1c0605c341b751f1cb36c6d0450b58d920b982 -AUX hatari-1.7.0-gentoo-docdir.patch 583 SHA256 159dd7203fa9feefb33f49b331f237f5d80639bc2d0ca33342c4359648161782 SHA512 95ee37df0b0bca685c2e03f02bcbcced71eb8463c32356956b440cb53248accd970d63a77bbb072d2703201cc7d40de1d13bacab2e8c36370664f4d8e085ebb9 WHIRLPOOL 4a6f7aa067293d9206ed8d4a693ce264d188fec70bc7447e7135a1484419f83ace5e178502aa81ac1e32f145d2d08b178235c5c4d9d42593c29b9c2611d197de -AUX hatari-1.7.0-gentoo.patch 3174 SHA256 5f64695305cf1076e795ff8c17a903aa9aed4be02960b9491b637a0a93f8c3bc SHA512 d3b0240f657b219d7c770b8b64b0c904020036b71e4ebb7988b3f3f899010667cd4431db672b91f201ee16151ab1f278833e83c59decd9a4ce062930e8fda68e WHIRLPOOL 365d14b2aa87ae9213aac48367728605665cf3dc05ed3c2a12956b446dbba6514f60f6fd1c966cd70c42462dbe1c0605c341b751f1cb36c6d0450b58d920b982 AUX hatari-1.8.0-gentoo-docdir.patch 583 SHA256 159dd7203fa9feefb33f49b331f237f5d80639bc2d0ca33342c4359648161782 SHA512 95ee37df0b0bca685c2e03f02bcbcced71eb8463c32356956b440cb53248accd970d63a77bbb072d2703201cc7d40de1d13bacab2e8c36370664f4d8e085ebb9 WHIRLPOOL 4a6f7aa067293d9206ed8d4a693ce264d188fec70bc7447e7135a1484419f83ace5e178502aa81ac1e32f145d2d08b178235c5c4d9d42593c29b9c2611d197de AUX hatari-1.8.0-gentoo.patch 3174 SHA256 5f64695305cf1076e795ff8c17a903aa9aed4be02960b9491b637a0a93f8c3bc SHA512 d3b0240f657b219d7c770b8b64b0c904020036b71e4ebb7988b3f3f899010667cd4431db672b91f201ee16151ab1f278833e83c59decd9a4ce062930e8fda68e WHIRLPOOL 365d14b2aa87ae9213aac48367728605665cf3dc05ed3c2a12956b446dbba6514f60f6fd1c966cd70c42462dbe1c0605c341b751f1cb36c6d0450b58d920b982 DIST hatari-1.6.2.tar.bz2 1739570 SHA256 20de0430eb8950d206e9df4d8088fa759625e23390e7604484e351d030761b3f SHA512 b6486f0f29fd63458a9b8a040ba26d4902754186e00bfd296d3ddb47b9ff58073f9afb450248ecb715f0d00f754895ba14fc9c8867bb1ddb0cc15d9efa8d4827 WHIRLPOOL 27298778609295ade265e36f7536d4ce9b7b88fd51f47f9288c1c05b6f2ab6c604ced225b709de73278724f71f70a7d6ed145590df5cd9e0f420a7839ae5b85d -DIST hatari-1.7.0.tar.bz2 2254241 SHA256 2056d12807cb827585f337912238492f8b66b7ff3d9d0628090e58209a519e4d SHA512 bb142e4c2264752e465d9916ab7569db0179e4ac42d6bd197421e434bd58cc8c6ce82285b9d4983b648c3e79f1f39e7ade8f1b7a598664063f812dc6941d898c WHIRLPOOL c2941ea31d042622fc6f19d495595ce4d61efa6089cc6d536fef2cbc710ddbb6c259989838590bc9ac711cdf08be392553534b27a799e31eebaccbae3ba76d2f DIST hatari-1.8.0.tar.bz2 1985358 SHA256 7ecf486ba578e3b4d7a3d3e86ef3e879d5e5611b39c2504e38ccafdaacb5ffeb SHA512 498a6636eef78e85a4715e9df169d928ce97c0548145a95b41aa3aae28817b8e843de1d1390893863be05e4e9981c89236571ab2eb9239faad23b711542e4fa0 WHIRLPOOL 9e62bdf08247da20e451e032355849cbb0c4b683711ed5cea29f03a52cb5b276e996b9ea4fe5c38ecc09456248bd099eb8b1f35d93e6cba5d00b93a456329a01 EBUILD hatari-1.6.2.ebuild 2522 SHA256 d8294a84d51271c4856edc1825a2341d7e55c2a4c9ad7527b1385f5723d8d143 SHA512 e76192cd8d4c2a2ffc589755787dc5a5567a1074760c517cad18c6171d0f34505186b7680d78bb6d791f7f89cce4ef72aa8dae9a2a8c0c72d57ce59536649840 WHIRLPOOL ecf3e4e619cef0c7f450a0bd9b0a5e392c5d09934f0aefe89b4a919ba5af01d8f71e37efaaa54301ecab0d613e3cab5893160935822b574dd03584e0d2eb3652 -EBUILD hatari-1.7.0.ebuild 2529 SHA256 5e19ec72b2914e32d8629fc4f15d0b16de452514f4ef4f06d21f9bc0fc9c402e SHA512 90fc8f48fb2ded8691293b10efd8a0efda43b0e077961d964b70a73aa1a2500b4f0e071e2e7745480e6df5b45183f23e63708087f045cb74f6d8ada64b910106 WHIRLPOOL 066dff498f54a7cef8ecc5faaefdd8a7fc763e2ae955087b94909aa142d3e3c095e52a76214346cc7ad2f3c6c9fde2b1e18fb44129d1e08335c7d58f91efb073 EBUILD hatari-1.8.0.ebuild 2526 SHA256 5103ebfbbda5c48f6650ff2a7e9e222919009dca4a80b18deea8f94516b3e121 SHA512 5bff52d2a0b9747e5e717c67d8c209d94d629130bb51e03f8f2a6bf63f86bf61e24e1b43fcbcc57b7e580cdbbe7c82d9571a05f7d29d487c5c80980bd03ceb1a WHIRLPOOL c6f035721c1c326bb5156adba36abf7bc7e9c84ef2dfe20676c3cb8206f34d9546dfdc5200352e638a71259e0671f21b2bdcae1b233a149b79e64f0fa0bc4e2b -MISC ChangeLog 7112 SHA256 a9dc4a04fd16109446f67738c65274d48c48d519e6f0b043026676cc37c0243d SHA512 f9c7a6a974d36cd525c3476c41a35da6bb9b3ddb67ddadba3b9de0bcb5214094fb9e27e5e85198f24acd361c8424b2c6f08aef66700892cd2e85873edaf666d4 WHIRLPOOL c688960dc7a7ce25fc54e8461b72cd4b1f7f8e9fc54ac2573400ee67f9106a085a6396b416acfdbbc74685147580aee665d93c886ad96bc6c1158b4ff503a0e5 +MISC ChangeLog 7278 SHA256 e4cf90a561949f87ef19342e92b5f06d0d9afa0c51cc552034e8b39516a7e985 SHA512 a8624df42449c3fb824744081e809aa0aa56f9f2fcea00319576f1634ac569aeb58d47465ac7a33a7a6d6b4a0d104bd0949edc8a326423b3fee33347384a405c WHIRLPOOL f6816b49ac39b1b2226e7d6a8093f942ca2a5cfeeac2801cf113eacd4a42124076c1eb155a0a3f2d11c6523e223bc1363916f394a9c65f553cb193bd5c32168d MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEAREIAAYFAlS7gewACgkQIY77eQFFFC34bACg55j239p163K4BhM1VngynSOg -MpgAn1tgL2EARKRHFYsOJaFxq34kR0rD -=x/Tx ------END PGP SIGNATURE----- diff --git a/games-emulation/hatari/files/hatari-1.7.0-gentoo-docdir.patch b/games-emulation/hatari/files/hatari-1.7.0-gentoo-docdir.patch deleted file mode 100644 index 715fb189143f..000000000000 --- a/games-emulation/hatari/files/hatari-1.7.0-gentoo-docdir.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- hatari-1.6.1/python-ui/uihelpers.py -+++ hatari-1.6.1/python-ui/uihelpers.py -@@ -97,9 +97,7 @@ - # first try whether there are local Hatari docs in standard place - # for this Hatari/UI version - sep = os.sep -- path = self.get_binary_path("hatari") -- path = sep.join(path.split(sep)[:-2]) # remove "bin/hatari" -- path = path + sep + "share" + sep + "doc" + sep + "hatari" + sep -+ path = "@DOCDIR@" - if os.path.exists(path + "manual.html"): - return path - # if not, point to latest Hatari HG version docs diff --git a/games-emulation/hatari/files/hatari-1.7.0-gentoo.patch b/games-emulation/hatari/files/hatari-1.7.0-gentoo.patch deleted file mode 100644 index 4f10d6d9e3ce..000000000000 --- a/games-emulation/hatari/files/hatari-1.7.0-gentoo.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- hatari-1.4.0.orig/src/paths.c -+++ hatari-1.4.0/src/paths.c -@@ -109,71 +109,6 @@ - free(pTmpName); - } - -- --/** -- * Locate the directory where the hatari executable resides -- */ --static char *Paths_InitExecDir(const char *argv0) --{ -- char *psExecDir; /* Path string where the hatari executable can be found */ -- -- /* Allocate memory for storing the path string of the executable */ -- psExecDir = malloc(FILENAME_MAX); -- if (!psExecDir) -- { -- fprintf(stderr, "Out of memory (Paths_Init)\n"); -- exit(-1); -- } -- -- /* Determine the bindir... -- * Start with empty string, then try to use OS specific functions, -- * and finally analyze the PATH variable if it has not been found yet. */ -- psExecDir[0] = '\0'; -- --#if defined(__linux__) -- { -- int i; -- /* On Linux, we can analyze the symlink /proc/self/exe */ -- i = readlink("/proc/self/exe", psExecDir, FILENAME_MAX); -- if (i > 0) -- { -- char *p; -- psExecDir[i] = '\0'; -- p = strrchr(psExecDir, '/'); /* Search last slash */ -- if (p) -- *p = 0; /* Strip file name from path */ -- } -- } --//#elif defined(WIN32) || defined(__CEGCC__) --// /* On Windows we can use GetModuleFileName for getting the exe path */ --// GetModuleFileName(NULL, psExecDir, FILENAME_MAX); --#endif -- -- /* If we do not have the execdir yet, analyze argv[0] and the PATH: */ -- if (psExecDir[0] == 0) -- { -- if (strchr(argv0, PATHSEP) == 0) -- { -- /* No separator in argv[0], we have to explore PATH... */ -- Paths_GetExecDirFromPATH(argv0, psExecDir, FILENAME_MAX); -- } -- else -- { -- /* There was a path separator in argv[0], so let's assume a -- * relative or absolute path to the current directory in argv[0] */ -- char *p; -- strncpy(psExecDir, argv0, FILENAME_MAX); -- psExecDir[FILENAME_MAX-1] = 0; -- p = strrchr(psExecDir, PATHSEP); /* Search last slash */ -- if (p) -- *p = 0; /* Strip file name from path */ -- } -- } -- -- return psExecDir; --} -- -- - /** - * Initialize the users home directory string - * and Hatari's home directory (~/.hatari) -@@ -226,8 +161,6 @@ - */ - void Paths_Init(const char *argv0) - { -- char *psExecDir; /* Path string where the hatari executable can be found */ -- - /* Init working directory string */ - if (getcwd(sWorkingDir, FILENAME_MAX) == NULL) - { -@@ -238,27 +171,11 @@ - /* Init the user's home directory string */ - Paths_InitHomeDirs(); - -- /* Get the directory where the executable resides */ -- psExecDir = Paths_InitExecDir(argv0); -- -- /* Now create the datadir path name from the bindir path name: */ -- if (psExecDir && strlen(psExecDir) > 0) -- { -- snprintf(sDataDir, sizeof(sDataDir), "%s%c%s", -- psExecDir, PATHSEP, BIN2DATADIR); -- } -- else -- { -- /* bindir could not be determined, let's assume datadir is relative -- * to current working directory... */ -- strcpy(sDataDir, BIN2DATADIR); -- } -+ strcpy(sDataDir, BIN2DATADIR); - - /* And finally make a proper absolute path out of datadir: */ - File_MakeAbsoluteName(sDataDir); - -- free(psExecDir); -- - /* fprintf(stderr, " WorkingDir = %s\n DataDir = %s\n UserHomeDir = %s\n HatariHomeDir = %s\n", - sWorkingDir, sDataDir, sUserHomeDir, sHatariHomeDir); */ - } diff --git a/games-emulation/hatari/hatari-1.7.0.ebuild b/games-emulation/hatari/hatari-1.7.0.ebuild deleted file mode 100644 index b2ffd566ef74..000000000000 --- a/games-emulation/hatari/hatari-1.7.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.7.0.ebuild,v 1.1 2014/07/16 02:48:29 mr_bones_ Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_6 python2_7 ) -inherit eutils toolchain-funcs cmake-utils python-single-r1 games - -DESCRIPTION="Atari ST emulator" -HOMEPAGE="http://hatari.tuxfamily.org/" -SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - media-libs/libsdl[X,sound,video] - sys-libs/readline - media-libs/libpng - sys-libs/zlib" -DEPEND="${RDEPEND} - virtual/pkgconfig" -RDEPEND="${RDEPEND} - dev-python/pygtk[${PYTHON_USEDEP}] - games-emulation/emutos" - -pkg_setup() { - games_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-gentoo-docdir.patch - # build with newer zlib (bug #387829) - sed -i -e '1i#define OF(x) x' src/includes/unzip.h || die - sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die - sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die - sed -i \ - -e "s%conf=.*$%conf=\"${GAMES_SYSCONFDIR}\"%" \ - -e "s%path=.*$%path=\"${GAMES_DATADIR}/${PN}/hatariui\"%" \ - python-ui/hatariui || die - sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die - rm -f doc/CMakeLists.txt -} - -src_configure() { - mycmakeargs=( - "-DCMAKE_VERBOSE_MAKEFILE=TRUE" - "-DCMAKE_BUILD_TYPE:STRING=Release" - "-DDATADIR=${GAMES_DATADIR}/${PN}" - "-DBIN2DATADIR=${GAMES_DATADIR}/${PN}" - "-DBINDIR=${GAMES_BINDIR}" - "-DICONDIR=/usr/share/pixmaps" - "-DDESKTOPDIR=/usr/share/applications" - "-DMANDIR=/usr/share/man/man1" - "-DDOCDIR=/usr/share/doc/${PF}" - ) - cmake-utils_src_configure -} - -src_install() { - DOCS="readme.txt doc/*.txt" cmake-utils_src_install - dohtml -r doc/ - python_fix_shebang "${ED%/}"/usr/share/games/hatari/{hatariui,hconsole}/ - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - elog "You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation," - elog "has been installed in $(games_get_libdir) with a .img extension (there" - elog "are several from which to choose)." - elog - elog "Another option is to go to http://www.atari.st/ and get a real TOS:" - elog " http://www.atari.st/" - elog - elog "The first time you run hatari, you should configure it to find the" - elog "TOS you prefer to use. Be sure to save your settings." - echo -}