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 AE0E51382C5 for ; Sun, 4 Apr 2021 06:33:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FCFAE0858; Sun, 4 Apr 2021 06:33:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6854FE0858 for ; Sun, 4 Apr 2021 06:33:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9A209340B98 for ; Sun, 4 Apr 2021 06:33:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D9CD644 for ; Sun, 4 Apr 2021 06:33:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617517951.c851c49041fb730f64eeaf699110f0795a8a3b85.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/files/, games-puzzle/xbomb/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch games-puzzle/xbomb/xbomb-2.2b-r1.ebuild games-puzzle/xbomb/xbomb-2.2b.ebuild X-VCS-Directories: games-puzzle/xbomb/ games-puzzle/xbomb/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c851c49041fb730f64eeaf699110f0795a8a3b85 X-VCS-Branch: master Date: Sun, 4 Apr 2021 06:33:02 +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: 15c8cea1-5d6a-40c2-84e3-960551f292a2 X-Archives-Hash: 28c9e6f48044cf73196c2f8b5af93a75 commit: c851c49041fb730f64eeaf699110f0795a8a3b85 Author: Sam James gentoo org> AuthorDate: Sun Apr 4 00:10:09 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 4 06:32:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c851c490 games-puzzle/xbomb: port to EAPI 7, games.eclass-- Signed-off-by: Sam James gentoo.org> games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch | 61 ++++++++++------------ games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch | 4 +- .../{xbomb-2.2b.ebuild => xbomb-2.2b-r1.ebuild} | 41 ++++++++++----- 3 files changed, 57 insertions(+), 49 deletions(-) diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch index 2ee8edd4ec9..6f45b4c82fa 100644 --- a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch +++ b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch @@ -1,34 +1,27 @@ -*** xbomb-2.1/Makefile 1996-01-20 16:02:46.000000000 -0500 ---- xbomb-2.1.new/Makefile -*************** -*** 27,34 **** - - OBJ=xbomb.o xwindow.o hiscore.o - -- INSTDIR=/usr/local -- - ######## - - xbomb : $(OBJ) ---- 27,32 ---- -*************** -*** 52,60 **** - - install : - strip xbomb -! install -d $(INSTDIR)/bin -! install -d $(INSTDIR)/man/man6 -! install -d $(INSTDIR)/lib/app-defaults -! install -m 755 xbomb $(INSTDIR)/bin -! install -m 644 xbomb.6 $(INSTDIR)/man/man6 -! install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb ---- 50,58 ---- - - install : - strip xbomb -! install -d $(DESTDIR)/usr/bin -! install -d $(DESTDIR)/usr/share/man/man6 -! install -d $(DESTDIR)/etc/X11/app-defaults -! install -m 755 xbomb $(DESTDIR)/usr/bin -! install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6 -! install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb +--- a/Makefile ++++ b/Makefile +@@ -27,8 +27,6 @@ + + OBJ=xbomb.o xwindow.o hiscore.o + +-INSTDIR=/usr/local +- + ######## + + xbomb : $(OBJ) +@@ -52,9 +50,9 @@ + + install : + strip xbomb +- install -d $(INSTDIR)/bin +- install -d $(INSTDIR)/man/man6 +- install -d $(INSTDIR)/lib/app-defaults +- install -m 755 xbomb $(INSTDIR)/bin +- install -m 644 xbomb.6 $(INSTDIR)/man/man6 +- install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb ++ install -d $(DESTDIR)/usr/bin ++ install -d $(DESTDIR)/usr/share/man/man6 ++ install -d $(DESTDIR)/etc/X11/app-defaults ++ install -m 755 xbomb $(DESTDIR)/usr/bin ++ install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6 ++ install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch index a320b0900c5..9f1f524b33c 100644 --- a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch +++ b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile.old -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -30,7 +30,7 @@ ######## diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild similarity index 53% rename from games-puzzle/xbomb/xbomb-2.2b.ebuild rename to games-puzzle/xbomb/xbomb-2.2b-r1.ebuild index 488c4de4bd5..d717dc1dcef 100644 --- a/games-puzzle/xbomb/xbomb-2.2b.ebuild +++ b/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 + +inherit desktop toolchain-funcs DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid" HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/" @@ -11,30 +12,44 @@ SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" DEPEND="x11-libs/libXaw" -RDEPEND=${DEPEND} +RDEPEND=" + ${DEPEND} + acct-group/gamestat +" + +PATCHES=( + "${FILESDIR}"/${P}-DESTDIR.patch + "${FILESDIR}"/${P}-ldflags.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-DESTDIR.patch \ - "${FILESDIR}"/${P}-ldflags.patch + default + sed -i \ -e '/strip/d' \ -e '/^CC=/d' \ -e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \ - -e "s:/usr/bin:${GAMES_BINDIR}:" \ Makefile || die sed -i \ - -e "s:/var/tmp:${GAMES_STATEDIR}/${PN}:g" \ + -e "s:/var/tmp:/var/lib/${PN}:g" \ hiscore.c || die } +src_configure() { + tc-export CC +} + src_install() { default - dodir "${GAMES_STATEDIR}"/${PN} - touch "${D}/${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi || die "touch failed" - fperms 660 "${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi + + dodir /var/lib/${PN} + touch "${ED}"/var/lib/${PN}/${PN}{3,4,6}.hi || die "touch failed" + fperms 660 /var/lib/${PN}/${PN}{3,4,6}.hi + + fowners root:gamestat /var/lib/${PN} + fperms g+s /usr/bin/${PN} + make_desktop_entry xbomb XBomb - prepgamesdirs }