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 B29E1138334 for ; Sun, 10 Feb 2019 03:18:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE381E09AE; Sun, 10 Feb 2019 03:18:38 +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 932D1E09AE for ; Sun, 10 Feb 2019 03:18:38 +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 17BA3335D48 for ; Sun, 10 Feb 2019 03:18:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B46AB539 for ; Sun, 10 Feb 2019 03:18:35 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1549768701.26d81c98d89ae5875cba71a8b8bccee40f879f16.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/tomenet/files/, games-roguelike/tomenet/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch games-roguelike/tomenet/files/tomenet-wrapper games-roguelike/tomenet/tomenet-4.7.2.ebuild X-VCS-Directories: games-roguelike/tomenet/files/ games-roguelike/tomenet/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 26d81c98d89ae5875cba71a8b8bccee40f879f16 X-VCS-Branch: master Date: Sun, 10 Feb 2019 03:18:35 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b971c21-83c7-451c-9e70-2f3e0774645e X-Archives-Hash: 050653004ca49336e1c3783b22995341 commit: 26d81c98d89ae5875cba71a8b8bccee40f879f16 Author: Stefan Strogin gmail com> AuthorDate: Thu Jan 17 22:17:28 2019 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Sun Feb 10 03:18:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d81c98 games-roguelike/tomenet: drop games eclass, EAPI=6 Let tomenet-wrapper check symlinks in ~/.tomenet/. Recreate them if they target to nowhere (e.g. /usr/share/games/tomenet/...). Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Stefan Strogin gmail.com> Signed-off-by: Aaron Bauman gentoo.org> .../tomenet/files/tomenet-4.7.2-makefile.patch | 6 ++--- games-roguelike/tomenet/files/tomenet-wrapper | 6 ++--- games-roguelike/tomenet/tomenet-4.7.2.ebuild | 30 +++++++++++----------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch index 474ebd370c2..1b89c2bc987 100644 --- a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch +++ b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch @@ -1,7 +1,7 @@ -diff --git a/src/makefile b/src/makefile +diff --git a/makefile b/makefile index ee56a33..7f3c81f 100644 ---- a/src/makefile -+++ b/src/makefile +--- a/makefile ++++ b/makefile @@ -203,7 +203,7 @@ CLI_LUAOBJS = \ # # This is my compiler of choice, it seems to work most everywhere diff --git a/games-roguelike/tomenet/files/tomenet-wrapper b/games-roguelike/tomenet/files/tomenet-wrapper index 2ca29b86217..71abcb79cf2 100644 --- a/games-roguelike/tomenet/files/tomenet-wrapper +++ b/games-roguelike/tomenet/files/tomenet-wrapper @@ -1,11 +1,11 @@ #!/bin/sh -if [ ! -e ~/.tomenet/.gentoo ]; then +if [ ! -e ~/.tomenet/.gentoo ] || [ ! -e ~/.tomenet/game ] || [ ! -e ~/.tomenet/text ] ; then LIBDIR="@LIBDIR@" [ -e ~/.tomenet ] || mkdir ~/.tomenet - ln -s "${LIBDIR}"/game ~/.tomenet/game - ln -s "${LIBDIR}"/text ~/.tomenet/text + [ -e ~/.tomenet/game ] || ln -sf "${LIBDIR}"/game ~/.tomenet/game + [ -e ~/.tomenet/text ] || ln -sf "${LIBDIR}"/text ~/.tomenet/text cp -R "${LIBDIR}"/user "${LIBDIR}"/scpt "${LIBDIR}"/xtra ~/.tomenet/ [ -e ~/.tomenetrc ] || cp "${LIBDIR}"/.tomenetrc ~/.tomenetrc diff --git a/games-roguelike/tomenet/tomenet-4.7.2.ebuild b/games-roguelike/tomenet/tomenet-4.7.2.ebuild index c51b641ecf4..5da772d9c22 100644 --- a/games-roguelike/tomenet/tomenet-4.7.2.ebuild +++ b/games-roguelike/tomenet/tomenet-4.7.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils gnome2-utils toolchain-funcs games +EAPI=6 +inherit eutils gnome2-utils toolchain-funcs DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien" HOMEPAGE="https://www.tomenet.eu" @@ -29,17 +29,21 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P}/src +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch + default use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;} sed \ - -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \ + -e "s#@LIBDIR@#/usr/share/${PN}#" \ "${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die if use server || use dedicated ; then sed \ - -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \ + -e "s#@LIBDIR@#/usr/share/${PN}#" \ "${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die fi @@ -59,37 +63,33 @@ src_install() { dodoc ../TomeNET-Guide.txt if ! use dedicated ; then - newgamesbin ${PN} ${PN}.bin - dogamesbin "${T}"/${PN} + newbin ${PN} ${PN}.bin + dobin "${T}"/${PN} doicon -s 48 client/tomenet4.png make_desktop_entry ${PN} ${PN} ${PN}4 fi if use server || use dedicated ; then - newgamesbin tomenet.server tomenet.server.bin - dogamesbin "${T}"/${PN}.server accedit + newbin tomenet.server tomenet.server.bin + dobin "${T}"/${PN}.server accedit fi - insinto "${GAMES_DATADIR}/${PN}" + insinto "/usr/share/${PN}" doins -r ../lib/* doins ../.tomenetrc - - prepgamesdirs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update if use sound; then elog "You can get soundpacks from here:" - elog ' http://tomenet.net/downloads.php' + elog ' https://tomenet.net/downloads.php' elog "They must be placed inside ~/.tomenet directory." fi }