From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69425138334 for ; Fri, 13 Jul 2018 09:27:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09102E087C; Fri, 13 Jul 2018 09:27:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2520E0878 for ; Fri, 13 Jul 2018 09:27:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7289F33BEE9 for ; Fri, 13 Jul 2018 09:27:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE3D2371 for ; Fri, 13 Jul 2018 09:27:22 +0000 (UTC) From: "Tony Vroon" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tony Vroon" Message-ID: <1531474031.81314cd16c5799e482ba4c20d3f5f4dee3136e88.chainsaw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/hatari/files/, games-emulation/hatari/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/hatari/Manifest games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch games-emulation/hatari/files/hatari-1.8.0-gentoo.patch games-emulation/hatari/hatari-1.8.0.ebuild X-VCS-Directories: games-emulation/hatari/files/ games-emulation/hatari/ X-VCS-Committer: chainsaw X-VCS-Committer-Name: Tony Vroon X-VCS-Revision: 81314cd16c5799e482ba4c20d3f5f4dee3136e88 X-VCS-Branch: master Date: Fri, 13 Jul 2018 09:27:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e0dff374-5bad-428a-bd52-a5b814139800 X-Archives-Hash: 2953b4415c4b6b5befa96f59b6ff7051 commit: 81314cd16c5799e482ba4c20d3f5f4dee3136e88 Author: Azamat H. Hackimov gmail com> AuthorDate: Wed Jul 11 22:11:23 2018 +0000 Commit: Tony Vroon gentoo org> CommitDate: Fri Jul 13 09:27:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81314cd1 games-emulation/hatari: remove old Removed old games.eclass based version Package-Manager: Portage-2.3.40, Repoman-2.3.9 games-emulation/hatari/Manifest | 1 - .../hatari/files/hatari-1.8.0-gentoo-docdir.patch | 13 --- .../hatari/files/hatari-1.8.0-gentoo.patch | 112 --------------------- games-emulation/hatari/hatari-1.8.0.ebuild | 89 ---------------- 4 files changed, 215 deletions(-) diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest index 8f2de08f387..e061a3037e6 100644 --- a/games-emulation/hatari/Manifest +++ b/games-emulation/hatari/Manifest @@ -1,2 +1 @@ -DIST hatari-1.8.0.tar.bz2 1985358 BLAKE2B 12fc000dd04c0f0dcead0b6713837a0d4c02df5ecdab9c2d4d2d91bd4cf6f8657acf2d97649a5704b646fae4fefe0626300e297b9e8698e7b8b72854d37b7097 SHA512 498a6636eef78e85a4715e9df169d928ce97c0548145a95b41aa3aae28817b8e843de1d1390893863be05e4e9981c89236571ab2eb9239faad23b711542e4fa0 DIST hatari-2.1.0.tar.bz2 4072778 BLAKE2B 934ab28e799d0d13c26c291005513511367eb2ddbeda0f9756c19f10fa9e6bb8e10451057fa7e0b49a30e3f562eb5f327057d324b2a92e09b1115f63132dca97 SHA512 d1fbf6e60e2df2c43d070bee6a9c1dc93c36a8ea7f75bbf2a67790840952661cee136ebccd6b2ed523ef9b7b56391e058384f2e3f46acb609bb362cac05b9753 diff --git a/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch b/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch deleted file mode 100644 index 715fb189143..00000000000 --- a/games-emulation/hatari/files/hatari-1.8.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.8.0-gentoo.patch b/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch deleted file mode 100644 index 4f10d6d9e3c..00000000000 --- a/games-emulation/hatari/files/hatari-1.8.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.8.0.ebuild b/games-emulation/hatari/hatari-1.8.0.ebuild deleted file mode 100644 index 0ec9601e183..00000000000 --- a/games-emulation/hatari/hatari-1.8.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( 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 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - media-libs/libsdl[X,sound,video] - sys-libs/readline:0 - media-libs/libpng:0 - sys-libs/zlib" -DEPEND="${RDEPEND} - virtual/pkgconfig" -RDEPEND="${RDEPEND} - dev-python/pygtk[${PYTHON_USEDEP}] - games-emulation/emutos" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-gentoo-docdir.patch -) - -pkg_setup() { - games_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - # 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 -}