version bump wrt #424321

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 230 insertions, 9 deletions

diff --git a/games-emulation/hatari/ChangeLog b/games-emulation/hatari/ChangeLog
index f9c3e1034170..f614116b31ae 100644
--- a/games-emulation/hatari/ChangeLog
+++ b/games-emulation/hatari/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/hatari
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.40 2013/06/13 10:37:26 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.41 2013/06/13 10:45:58 hasufell Exp $
+
+*hatari-1.6.2 (13 Jun 2013)
+
+  13 Jun 2013; Julian Ospald <hasufell@gentoo.org> +hatari-1.6.2.ebuild,
+  +files/hatari-1.6.2-gentoo.patch, +files/hatari-1.6.2-gentoo-docdir.patch:
+  version bump wrt #424321
 
 *hatari-1.6.1-r1 (13 Jun 2013)
 
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 768df240050d..f2e8431c9a06 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -4,21 +4,25 @@ Hash: SHA256
 AUX hatari-1.5.0-gentoo.patch 3174 SHA256 5f64695305cf1076e795ff8c17a903aa9aed4be02960b9491b637a0a93f8c3bc SHA512 d3b0240f657b219d7c770b8b64b0c904020036b71e4ebb7988b3f3f899010667cd4431db672b91f201ee16151ab1f278833e83c59decd9a4ce062930e8fda68e WHIRLPOOL 365d14b2aa87ae9213aac48367728605665cf3dc05ed3c2a12956b446dbba6514f60f6fd1c966cd70c42462dbe1c0605c341b751f1cb36c6d0450b58d920b982
 AUX hatari-1.6.1-gentoo-docdir.patch 583 SHA256 159dd7203fa9feefb33f49b331f237f5d80639bc2d0ca33342c4359648161782 SHA512 95ee37df0b0bca685c2e03f02bcbcced71eb8463c32356956b440cb53248accd970d63a77bbb072d2703201cc7d40de1d13bacab2e8c36370664f4d8e085ebb9 WHIRLPOOL 4a6f7aa067293d9206ed8d4a693ce264d188fec70bc7447e7135a1484419f83ace5e178502aa81ac1e32f145d2d08b178235c5c4d9d42593c29b9c2611d197de
 AUX hatari-1.6.1-gentoo.patch 3174 SHA256 5f64695305cf1076e795ff8c17a903aa9aed4be02960b9491b637a0a93f8c3bc SHA512 d3b0240f657b219d7c770b8b64b0c904020036b71e4ebb7988b3f3f899010667cd4431db672b91f201ee16151ab1f278833e83c59decd9a4ce062930e8fda68e WHIRLPOOL 365d14b2aa87ae9213aac48367728605665cf3dc05ed3c2a12956b446dbba6514f60f6fd1c966cd70c42462dbe1c0605c341b751f1cb36c6d0450b58d920b982
+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
 DIST hatari-1.5.0.tar.bz2 1570048 SHA256 0cb9c627ea6942bc60908c3a59b4b5c86a54e5bd0551cd95d8cff76bbde61e7f
 DIST hatari-1.6.1.tar.bz2 1777736 SHA256 f6142b4d0c8f1731f990fcc4cf125d9b7a1822384c46e6af79058a461443e853 SHA512 e21ccc30dded5b28471246ee1b941981d9736f6cdc915b642fe987f9d36e712bc58f874a43807e64f32e581032d1593672651faad5616dec2fdf5741ce15824e WHIRLPOOL c639a238d6cef8ad918ad608c75b1a64b959fbeb3f108a43b65668ae5b0099dd68544e351c9efd5e02469fb1ec83833702d6ef09212921b30918fe18be732c54
+DIST hatari-1.6.2.tar.bz2 1739570 SHA256 20de0430eb8950d206e9df4d8088fa759625e23390e7604484e351d030761b3f SHA512 b6486f0f29fd63458a9b8a040ba26d4902754186e00bfd296d3ddb47b9ff58073f9afb450248ecb715f0d00f754895ba14fc9c8867bb1ddb0cc15d9efa8d4827 WHIRLPOOL 27298778609295ade265e36f7536d4ce9b7b88fd51f47f9288c1c05b6f2ab6c604ced225b709de73278724f71f70a7d6ed145590df5cd9e0f420a7839ae5b85d
 EBUILD hatari-1.5.0.ebuild 1822 SHA256 e163287af71c9d9179c680c3b160c1b1282a31cab7797353f2339e0ab85249b5 SHA512 9ee8cb2841f55a2c4b2d6efd154e1cba3ac0fcf9566c4e0eceef0457178e7390fa25e40420f07b03217d71536f4467d2d2de6743e3b19baf80bec76fa2f03fd0 WHIRLPOOL 42e69d27b710c6fba691138b28ab8e18b18a9ad985afc2520698da5274a0c8517a4aec6525c3f579547e31999c56c78e6e9fbe5afcac108d0d0fbea6b49826e2
 EBUILD hatari-1.6.1-r1.ebuild 2533 SHA256 03e7511fb66858ce403ff955c6d71476e28cca95a9bdab2b8b61443e06d118c9 SHA512 5170968ca08352b101d4615f3eeaebc7514d988218b09a3950689fbc7ac279652b7c4f9777166e052910d178dba541b31705b4cd169d3ad1e5c5584e54129f32 WHIRLPOOL 1315bf9b40684a75efaf9b6e8df1ef9d171c721e8102906a4bd4c8c737eb809800f4ce419ca7cd4889d85ca1ed0bbcc369d299c416ab0dca3e4d7c157538bdbd
 EBUILD hatari-1.6.1.ebuild 1899 SHA256 684f69416f14317dd6c7d9b6eaad2c7ab6cc21174149e96e4668da1e9969b3c1 SHA512 bdb53c5cbf323727fbd760530fa1355ceb06e46a97496eaf5cd2b86b6a1e1d2345ad0864c776c347d371f0c1464b7b1a7b3fcd0d2e32fe169c9e21e6fa6a5d48 WHIRLPOOL 20e1384419a92d896e7992b476f8bea685f8e68630dce2c266fb696dba7a3dde9e1385101247d6cda613dff1d869129051cc690ac12eda75370c29ba85987ed4
-MISC ChangeLog 5466 SHA256 0b3f4779af1e346669840f32a3bf7cc49e2e12bf4e724b52de0a29e13fb31aad SHA512 0a4404795dfd56ef8e29fa180f686fa7ae23bc3415337a92f9fa99a42f6a287feb26c1be57df696cf218b961749b0d4bb37a0ebf4f265fbdfbea4d64dc6ae13b WHIRLPOOL b9e093c1ec35355e30c484e25733803dbc24cbd6dd9c267b105d51a859f6d4f735d114badb224f831fc4e483f148bcb892013f10b8b515858839c47189107dd6
+EBUILD hatari-1.6.2.ebuild 2530 SHA256 51bd90e608d3d88e491f52b1b956278a8a218e57b86d1abc2f2d1a900c0b26f6 SHA512 e40ebedfe9f2cf309bdf69b1ad495df952fa154c54a05e08374e77775aca377ae2447e3fdeb24262ec9f69435ccf20f6ddac3cd136dbe009352e018fc407410c WHIRLPOOL 7b4cdf449febde0078f3b7c13e7e354c64e020c8ead4e7f1694d5ec5a5368a81ba852e409a2cd02cc7abbeda5a2e00798996ef061926a7d873a7138995267718
+MISC ChangeLog 5673 SHA256 01f05cdd81eed3a08bc8ddb5f60b15a8208f51fbd0be2c794ab0db468517f9e4 SHA512 05b152f77597fdc25719f5cad28bc4bb83851a5b62520225457a4a766ffcef79c9bc5903c42ff4166c49b6e82147859a922ddabea4e4af5d40b58a109b9bf53d WHIRLPOOL 26acf6ff27ae30645223a5975187332c35be06a15547adcb2ec69f54563f3256511e0ebb188810456661059663142582cccd2fcc17209e5c92b9f104c3a36e43
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRuaDnAAoJEFpvPKfnPDWz9DAH/RH7ooG4D4DdkWj3m54KIq+Y
-qClUpMHZx/sK3hiiF5gQpcDvvnmDZjePMO7crNvWvu2Lpn6RD2c+U+ldROgUG7gR
-9yW4QzMsmCro21zC7zWcTEIlnTgAQCOFAAacFqBtNu1za+7a4R3XbF9xuVAoSw1b
-T5HRuy5CJOqum+gV6HuR2T5uWuSPnevHwF1IXRjp9M1DHA/AEck51meCJ2W0/qoY
-iRP4BEVRMy5ugOkdpcqrxM7TnOr1T4nY6LjhGOv8e/KD5kIyDwi/BMTIqmpQwrS7
-acwKne1C01VoZIa4k0FAzHKmxgmNCXxbsDw/LnH/feJcj5yA02ywzXkEpu0IcWg=
-=eiSY
+iQEcBAEBCAAGBQJRuaLlAAoJEFpvPKfnPDWzPc0H+QFPYkFtEU/otXHSLvZrVMRR
+OXgHlzFOlotxAmrwzpOElduAw2dC7wlWnRrRJ2nOrm9qusrbTEloEXRJSE1AOp4p
+NHAaoMtmgcFdpDBN2E/I4D2o6DFDtkFS5twvaR2OC14lR0en2fHEZpmJItGWrRkV
+Aer1wuPLc7HK0nHxXej/s5QbUrpcJlj5NSisGKepxTfEYh294ICBiaBJNpGVk1ah
+AY9HhWzVIfp6ZhDhrzx27MZrga+07BlmUuaCYY09k93RreJIzTZsYkBYlByGKGz5
+xSeiXFVmKTi6GIfCcusG8frkCH1LrO04nDIap9Hf8Yf7X2pdcg1zBF4DbRZ8IYA=
+=Lxzt
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/hatari/files/hatari-1.6.2-gentoo-docdir.patch b/games-emulation/hatari/files/hatari-1.6.2-gentoo-docdir.patch
new file mode 100644
index 000000000000..715fb189143f
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-1.6.2-gentoo-docdir.patch
@@ -0,0 +1,13 @@
+--- 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.6.2-gentoo.patch b/games-emulation/hatari/files/hatari-1.6.2-gentoo.patch
new file mode 100644
index 000000000000..4f10d6d9e3ce
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-1.6.2-gentoo.patch
@@ -0,0 +1,112 @@
+--- 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.6.2.ebuild b/games-emulation/hatari/hatari-1.6.2.ebuild
new file mode 100644
index 000000000000..650792d252a0
--- /dev/null
+++ b/games-emulation/hatari/hatari-1.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.6.2.ebuild,v 1.1 2013/06/13 10:45:58 hasufell 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.berlios.de/"
+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,audio,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}/*.py
+	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
+}