[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/
commit: 776ebddc04e9e262e6d187902cd914f821d230ea Author: Alexey Sokolov asokolov org> AuthorDate: Fri Aug 27 16:09:42 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Aug 27 19:03:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776ebddc games-puzzle/xbomb: various fixes, bump eapi Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexey Sokolov asokolov.org> Closes: https://bugs.gentoo.org/710600 Closes: https://github.com/gentoo/gentoo/pull/22130 Signed-off-by: Ionen Wolkens gentoo.org> .../{xbomb-2.2b-r2.ebuild => xbomb-2.2b-r3.ebuild} | 34 -- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild similarity index 58% rename from games-puzzle/xbomb/xbomb-2.2b-r2.ebuild rename to games-puzzle/xbomb/xbomb-2.2b-r3.ebuild index d43f0aec54a..f5c0a4225be 100644 --- a/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild +++ b/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop toolchain-funcs @@ -13,10 +13,15 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -DEPEND="x11-libs/libXaw" +DEPEND=" + acct-group/gamestat + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXt +" RDEPEND=" ${DEPEND} - acct-group/gamestat + media-fonts/font-misc-misc " PATCHES=( @@ -27,28 +32,25 @@ PATCHES=( src_prepare() { default + sed -i -e '/strip/d' Makefile || die sed -i \ - -e '/strip/d' \ - -e '/^CC=/d' \ - -e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \ - Makefile || die - sed -i \ - -e "s:/var/tmp:/var/lib/${PN}:g" \ + -e "s:/var/tmp:${EPREFIX}/var/games/${PN}:g" \ hiscore.c || die } -src_configure() { - tc-export CC +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" } src_install() { - default + emake DESTDIR="${ED}" install + einstalldocs - 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 + dodir /var/games/${PN} + touch "${ED}"/var/games/${PN}/${PN}{3,4,6}.hi || die "touch failed" + fperms 660 /var/games/${PN}/${PN}{3,4,6}.hi - fowners root:gamestat /var/lib/${PN} /usr/bin/${PN} + fowners root:gamestat /var/games/${PN} /usr/bin/${PN} fperms g+s /usr/bin/${PN} make_desktop_entry xbomb XBomb
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/
commit: fb8ced6b16ec6691483b74e66373afefa557b713 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Aug 27 18:42:53 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Aug 27 19:03:15 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8ced6b games-puzzle/xbomb: set highscore files themselves to gamestat Not caused by previous PR, was wrong in the first place (confirmed that highscores do get saved now) Signed-off-by: Ionen Wolkens gentoo.org> games-puzzle/xbomb/xbomb-2.2b-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild index f5c0a4225be..ac1174f80e2 100644 --- a/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild +++ b/games-puzzle/xbomb/xbomb-2.2b-r3.ebuild @@ -48,9 +48,9 @@ src_install() { dodir /var/games/${PN} touch "${ED}"/var/games/${PN}/${PN}{3,4,6}.hi || die "touch failed" - fperms 660 /var/games/${PN}/${PN}{3,4,6}.hi - fowners root:gamestat /var/games/${PN} /usr/bin/${PN} + fowners :gamestat /var/games/${PN}{,/${PN}{3,4,6}.hi} /usr/bin/${PN} + fperms 660 /var/games/${PN}/${PN}{3,4,6}.hi fperms g+s /usr/bin/${PN} make_desktop_entry xbomb XBomb
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/
commit: b920a253cdd0256b108ecebcaed105911d2b2e8c Author: Sam James gentoo org> AuthorDate: Mon Aug 23 04:20:33 2021 + Commit: Sam James gentoo org> CommitDate: Mon Aug 23 05:05:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b920a253 games-puzzle/xbomb: fix group of binary Closes: https://bugs.gentoo.org/809353 Signed-off-by: Sam James gentoo.org> games-puzzle/xbomb/{xbomb-2.2b-r1.ebuild => xbomb-2.2b-r2.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild similarity index 95% rename from games-puzzle/xbomb/xbomb-2.2b-r1.ebuild rename to games-puzzle/xbomb/xbomb-2.2b-r2.ebuild index d717dc1dcef..d43f0aec54a 100644 --- a/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild +++ b/games-puzzle/xbomb/xbomb-2.2b-r2.ebuild @@ -48,7 +48,7 @@ src_install() { 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} + fowners root:gamestat /var/lib/${PN} /usr/bin/${PN} fperms g+s /usr/bin/${PN} make_desktop_entry xbomb XBomb
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/files/, games-puzzle/xbomb/
commit: c851c49041fb730f64eeaf699110f0795a8a3b85 Author: Sam James gentoo org> AuthorDate: Sun Apr 4 00:10:09 2021 + Commit: Sam James gentoo org> CommitDate: Sun Apr 4 06:32:31 2021 + 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.0 -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
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/, games-puzzle/xbomb/files/
commit: 5a903e0456a16d2f1d03587647e1fadb93f63234 Author: Michael Sterrett gentoo org> AuthorDate: Sun Mar 20 20:26:02 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Sun Mar 20 20:51:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a903e04 games-puzzle/xbomb: clean old Package-Manager: portage-2.2.26 games-puzzle/xbomb/Manifest | 1 - games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch | 35 --- games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch | 11 -- games-puzzle/xbomb/xbomb-2.2a.ebuild | 42 --- 4 files changed, 89 deletions(-) diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest index 7a9e390..aed474b 100644 --- a/games-puzzle/xbomb/Manifest +++ b/games-puzzle/xbomb/Manifest @@ -1,2 +1 @@ -DIST xbomb-2.2a.tgz 25080 SHA256 be9372a0447b9b606af2f705bcf24760e7cf5a51e7e917da43d4804c6ca8f068 SHA512 e0b223fbbbc1e3bf552b045134856e460e3c11366ace1b27564f9d3ae44c7fd32d65ba78b327b460a5c7f70deea01ab63aa21c9dab4996f813543347c86bd282 WHIRLPOOL 3ccca22a384de9a487ab7a183acb7bf9e5cd4aa82ac2903c83f5ef2271fa832b629ef70b4b0b5684f8186b1c2126ad312f343989b84977270f44c2236a43 DIST xbomb-2.2b.tgz 24774 SHA256 350d8443c0f6339ef463effbb17c9347f669b8641a159a2447706324b87c2219 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1 WHIRLPOOL 0db3088207bb14548d300b3c19aa5310b71f81d05068de8070bd1195524849cdf47ea82f585b2461db0259a543d323d6a15f93be1dcf43c482fb84b90c2c1059 diff --git a/games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch deleted file mode 100644 index 945ac70..000 --- a/games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -c xbomb-2.1/Makefile xbomb-2.1.new/Makefile -*** xbomb-2.1/Makefile 1996-01-20 16:02:46.0 -0500 xbomb-2.1.new/Makefile 2002-11-13 10:31:30.0 -0500 -*** -*** 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 diff --git a/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch deleted file mode 100644 index b1a1878..000 --- a/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ Makefile.old 2010-09-22 14:18:37.0 +0200 -+++ Makefile 2010-09-22 14:19:06.0 +0200 -@@ -30,7 +30,7 @@ - - - xbomb : $(OBJ) -- $(LINK) $(OBJ) -o $@ $(LIB) $(XLIB) -+ $(LINK) $(LDFLAGS) $(OBJ) -o $@ $(LIB) $(XLIB) - - - diff --git a/games-puzzle/xbomb/xbomb-2.2a.ebuild b/games-puzzle/xbomb/xbomb-2.2a.ebuild deleted file mode 100644 index dc722a6..000 --- a/games-puzzle/xbomb/xbomb-2.2a.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils games - -DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid" -HOMEPAGE="http://www.gedanken.demon.co.uk/xbomb/; -SRC_URI="http://www.gedanken.demon.co.uk/download-xbomb/${P}.tgz; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -DEPEND="x11-libs/libXaw" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-DESTDIR.patch \ - "${FILESDIR}"/${P}-ldflags.patch - sed -i \ - -e '/strip/d' \ - -e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \ - -e "s:/usr/bin:${GAMES_BINDIR}:" \ - Makefile \ - || die "sed Makefile failed" - sed -i \ - -e "s:/var/tmp:${GAMES_STATEDIR}/${PN}:g" \ - hiscore.c \ - || die "sed hiscore.c failed" -} - -src_install() { - default - dodoc LSM - 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 - prepgamesdirs -}
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/
commit: 5b8ef5dffb9510b8efc8086f6624b04527ef9456 Author: Michael Sterrett gentoo org> AuthorDate: Sun Jan 31 22:37:49 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Sun Jan 31 22:37:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8ef5df games-puzzle/xbomb: whitespace cleanup Package-Manager: portage-2.2.26 games-puzzle/xbomb/xbomb-2.2b.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b.ebuild index 83969db..19a9d67 100644 --- a/games-puzzle/xbomb/xbomb-2.2b.ebuild +++ b/games-puzzle/xbomb/xbomb-2.2b.ebuild @@ -9,7 +9,6 @@ DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid" HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/; SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz; - LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/, games-puzzle/xbomb/files/
commit: 495bafc616c908f857fdd14d73fce40fa37bf7ea Author: Michael Sterrett gentoo org> AuthorDate: Sun Jan 31 22:36:30 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Sun Jan 31 22:36:30 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=495bafc6 games-puzzle/xbomb: version bump (bug #573412) Package-Manager: portage-2.2.26 games-puzzle/xbomb/Manifest | 1 + games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch | 34 ++ games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch | 11 ++ games-puzzle/xbomb/xbomb-2.2b.ebuild | 42 +++ 4 files changed, 88 insertions(+) diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest index f55deea..7a9e390 100644 --- a/games-puzzle/xbomb/Manifest +++ b/games-puzzle/xbomb/Manifest @@ -1 +1,2 @@ DIST xbomb-2.2a.tgz 25080 SHA256 be9372a0447b9b606af2f705bcf24760e7cf5a51e7e917da43d4804c6ca8f068 SHA512 e0b223fbbbc1e3bf552b045134856e460e3c11366ace1b27564f9d3ae44c7fd32d65ba78b327b460a5c7f70deea01ab63aa21c9dab4996f813543347c86bd282 WHIRLPOOL 3ccca22a384de9a487ab7a183acb7bf9e5cd4aa82ac2903c83f5ef2271fa832b629ef70b4b0b5684f8186b1c2126ad312f343989b84977270f44c2236a43 +DIST xbomb-2.2b.tgz 24774 SHA256 350d8443c0f6339ef463effbb17c9347f669b8641a159a2447706324b87c2219 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1 WHIRLPOOL 0db3088207bb14548d300b3c19aa5310b71f81d05068de8070bd1195524849cdf47ea82f585b2461db0259a543d323d6a15f93be1dcf43c482fb84b90c2c1059 diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch new file mode 100644 index 000..2ee8edd --- /dev/null +++ b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch @@ -0,0 +1,34 @@ +*** xbomb-2.1/Makefile 1996-01-20 16:02:46.0 -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 diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch new file mode 100644 index 000..a320b09 --- /dev/null +++ b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch @@ -0,0 +1,11 @@ +--- Makefile.old Makefile +@@ -30,7 +30,7 @@ + + + xbomb : $(OBJ) +- $(LINK) $(OBJ) -o $@ $(LIB) $(XLIB) ++ $(LINK) $(LDFLAGS) $(OBJ) -o $@ $(LIB) $(XLIB) + + + diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b.ebuild new file mode 100644 index 000..83969db --- /dev/null +++ b/games-puzzle/xbomb/xbomb-2.2b.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils games + +DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid" +HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/; +SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz; + + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +DEPEND="x11-libs/libXaw" +RDEPEND=${DEPEND} + +src_prepare() { + epatch "${FILESDIR}"/${P}-DESTDIR.patch \ + "${FILESDIR}"/${P}-ldflags.patch + 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" \ + hiscore.c || die +} + +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 + make_desktop_entry xbomb XBomb + prepgamesdirs +}