public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/, games-puzzle/xbomb/files/
@ 2016-01-31 22:38 Michael Sterrett
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett @ 2016-01-31 22:38 UTC (permalink / raw
  To: gentoo-commits

commit:     495bafc616c908f857fdd14d73fce40fa37bf7ea
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 22:36:30 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 22:36:30 2016 +0000
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 3ccca22a384de9a487ab7a183acb7bf33339e5cd4aa82ac2903c83f5ef2271fa832b629ef70b4b0b5684f8186b1c2126ad312f343989b84977270f44c2236a43
+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 0000000..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.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

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 0000000..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 0000000..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
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/, games-puzzle/xbomb/files/
@ 2016-03-20 20:51 Michael Sterrett
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett @ 2016-03-20 20:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5a903e0456a16d2f1d03587647e1fadb93f63234
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 20:26:02 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 20:51:19 2016 +0000
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 3ccca22a384de9a487ab7a183acb7bf33339e5cd4aa82ac2903c83f5ef2271fa832b629ef70b4b0b5684f8186b1c2126ad312f343989b84977270f44c2236a43
 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..0000000
--- 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.000000000 -0500
---- xbomb-2.1.new/Makefile	2002-11-13 10:31:30.000000000 -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..0000000
--- a/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2010-09-22 14:18:37.000000000 +0200
-+++ Makefile	2010-09-22 14:19:06.000000000 +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..0000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-03-20 20:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-31 22:38 [gentoo-commits] repo/gentoo:master commit in: games-puzzle/xbomb/, games-puzzle/xbomb/files/ Michael Sterrett
  -- strict thread matches above, loose matches on Subject: below --
2016-03-20 20:51 Michael Sterrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox