[gentoo-commits] repo/gentoo:master commit in: games-board/blokish/
commit: d197310dbae0e9b5a712b3bd77cf1af722a6ad1c
Author: David Seifert gentoo org>
AuthorDate: Sun Apr 4 22:28:26 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Apr 4 22:28:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d197310d
games-board/blokish: Port to EAPI 7
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert gentoo.org>
games-board/blokish/blokish-0.9.4-r3.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/games-board/blokish/blokish-0.9.4-r3.ebuild
b/games-board/blokish/blokish-0.9.4-r3.ebuild
index a932e887ce6..7316facb2a6 100644
--- a/games-board/blokish/blokish-0.9.4-r3.ebuild
+++ b/games-board/blokish/blokish-0.9.4-r3.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
WX_GTK_VER="3.0"
inherit autotools desktop wxwidgets
MY_P="${PN}_v${PV}"
+
DESCRIPTION="Open source clone of the four-player board game Blokus"
HOMEPAGE="https://sourceforge.net/projects/blokish/;
SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
@@ -16,11 +17,11 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-DEPEND="
+RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
virtual/glu
virtual/opengl"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
@@ -44,9 +45,8 @@ src_prepare() {
src_install() {
default
+ dodoc -r docs/.
doicon src/${PN}.xpm
make_desktop_entry ${PN} Blokish ${PN}
-
- dodoc docs/*
}
[gentoo-commits] repo/gentoo:master commit in: games-board/blokish/
commit: 3d33e36955e3f51bb144b0db86620db2b28e4758
Author: Sam James gentoo org>
AuthorDate: Sun Apr 4 06:18:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 4 06:32:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d33e369
games-board/blokish: eutils->desktop
Signed-off-by: Sam James gentoo.org>
games-board/blokish/blokish-0.9.4-r3.ebuild | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/games-board/blokish/blokish-0.9.4-r3.ebuild
b/games-board/blokish/blokish-0.9.4-r3.ebuild
index e45372c8a48..a932e887ce6 100644
--- a/games-board/blokish/blokish-0.9.4-r3.ebuild
+++ b/games-board/blokish/blokish-0.9.4-r3.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
WX_GTK_VER="3.0"
-inherit eutils autotools wxwidgets
+inherit autotools desktop wxwidgets
MY_P="${PN}_v${PV}"
DESCRIPTION="Open source clone of the four-player board game Blokus"
HOMEPAGE="https://sourceforge.net/projects/blokish/;
SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+DEPEND="
+ x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
virtual/glu
virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${PN}
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
[gentoo-commits] repo/gentoo:master commit in: games-board/blokish/files/, games-board/blokish/
commit: b4e485588765824440ac3e3de9fcbac95be54982
Author: Austin English gentoo org>
AuthorDate: Thu Sep 8 16:49:20 2016 +
Commit: Austin English gentoo org>
CommitDate: Thu Sep 8 17:25:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e48558
games-board/blokish: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
games-board/blokish/blokish-0.9.4-r3.ebuild| 54 ++
.../blokish/files/blokish-0.9.4-gcc43.patch| 4 +-
.../blokish/files/blokish-0.9.4-underlink.patch| 4 +-
.../blokish/files/blokish-0.9.4-wxgtk.patch| 4 +-
4 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/games-board/blokish/blokish-0.9.4-r3.ebuild
b/games-board/blokish/blokish-0.9.4-r3.ebuild
new file mode 100644
index ..780a429
--- /dev/null
+++ b/games-board/blokish/blokish-0.9.4-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+inherit eutils autotools wxwidgets
+
+MY_P="${PN}_v${PV}"
+DESCRIPTION="Open source clone of the four-player board game Blokus"
+HOMEPAGE="https://sourceforge.net/projects/blokish/;
+SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+ virtual/glu
+ virtual/opengl"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-underlink.patch
+ "${FILESDIR}"/${P}-wxgtk.patch
+)
+
+src_prepare() {
+ default
+
+ # Otherwise $WX_CONFIG is unset:
+ setup-wxwidgets
+
+ sed -i \
+ -e "s:wx-config:${WX_CONFIG}:" \
+ configure.in makefile.am || die
+ mv configure.in configure.ac || die
+
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ doicon src/${PN}.xpm
+ make_desktop_entry ${PN} Blokish ${PN}
+
+ dodoc docs/*
+}
diff --git a/games-board/blokish/files/blokish-0.9.4-gcc43.patch
b/games-board/blokish/files/blokish-0.9.4-gcc43.patch
index 3e48bce..f53e549 100644
--- a/games-board/blokish/files/blokish-0.9.4-gcc43.patch
+++ b/games-board/blokish/files/blokish-0.9.4-gcc43.patch
@@ -1,5 +1,5 @@
src/base.h
-+++ src/base.h
+--- a/src/base.h
b/src/base.h
@@ -25,6 +25,9 @@
#include
#include
diff --git a/games-board/blokish/files/blokish-0.9.4-underlink.patch
b/games-board/blokish/files/blokish-0.9.4-underlink.patch
index 9a9eb6e..a443337 100644
--- a/games-board/blokish/files/blokish-0.9.4-underlink.patch
+++ b/games-board/blokish/files/blokish-0.9.4-underlink.patch
@@ -1,5 +1,5 @@
makefile.am.old2011-06-21 08:43:21.804880067 +0200
-+++ makefile.am2011-06-21 08:43:49.875661081 +0200
+--- a/makefile.am 2011-06-21 08:43:21.804880067 +0200
b/makefile.am 2011-06-21 08:43:49.875661081 +0200
@@ -1,5 +1,5 @@
INCLUDES = `wx-config --cxxflags`
-LIBS = `wx-config --libs --gl-libs`
diff --git a/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
index 008702e..1821e0b 100644
--- a/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
+++ b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
@@ -1,5 +1,5 @@
-diff -ru blokish.orig/src/blokish.cpp blokish/src/blokish.cpp
blokish.orig/src/blokish.cpp 2007-04-01 17:01:26.0 -0400
+diff -ru blokish/src/blokish.cpp blokish/src/blokish.cpp
+--- blokish/src/blokish.cpp2007-04-01 17:01:26.0 -0400
+++ blokish/src/blokish.cpp2015-11-15 21:48:32.426081482 -0500
@@ -903,7 +903,7 @@
void OnSaveGame(wxCommandEvent )
[gentoo-commits] repo/gentoo:master commit in: games-board/blokish/
commit: b76501dc1ed515da7830aa23ddd616efd78a0192
Author: Michael Sterrett gentoo org>
AuthorDate: Tue Dec 29 04:02:17 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Tue Dec 29 07:40:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b76501dc
old
Package-Manager: portage-2.2.24
games-board/blokish/blokish-0.9.4-r1.ebuild | 44 -
1 file changed, 44 deletions(-)
diff --git a/games-board/blokish/blokish-0.9.4-r1.ebuild
b/games-board/blokish/blokish-0.9.4-r1.ebuild
deleted file mode 100644
index c3a3dd8..000
--- a/games-board/blokish/blokish-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="2.8"
-inherit eutils autotools wxwidgets games
-
-MY_P="${PN}_v${PV}"
-DESCRIPTION="Open source clone of the four-player board game Blokus"
-HOMEPAGE="http://sourceforge.net/projects/blokish/;
-SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="x11-libs/wxGTK:2.8[X,opengl]
- virtual/glu
- virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-underlink.patch
- sed -i \
- -e "s:wx-config:${WX_CONFIG}:" \
- configure.in makefile.am || die
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_install() {
- default
-
- doicon src/${PN}.xpm
- make_desktop_entry ${PN} Blokish ${PN}
-
- dohtml docs/*
- prepgamesdirs
-}
[gentoo-commits] repo/gentoo:master commit in: games-board/blokish/
commit: 2a623a6866bea8b37e4772d72102f0f43051ed2b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Dec 16 10:12:30 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Dec 16 10:12:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a623a68
games-board/blokish: amd64 stable wrt bug #568380
Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
games-board/blokish/blokish-0.9.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-board/blokish/blokish-0.9.4-r2.ebuild
b/games-board/blokish/blokish-0.9.4-r2.ebuild
index 8f3faba..a471c27 100644
--- a/games-board/blokish/blokish-0.9.4-r2.ebuild
+++ b/games-board/blokish/blokish-0.9.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
[gentoo-commits] repo/gentoo:master commit in: games-board/blokish/, games-board/blokish/files/
commit: 80984edecfd72d042e3b64cec6fece6cc575a447
Author: Michael Sterrett gentoo org>
AuthorDate: Mon Nov 16 04:09:24 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Mon Nov 16 04:09:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80984ede
patch to work with wxGTK:3.0
(bug #564082)
Package-Manager: portage-2.2.20.1
games-board/blokish/blokish-0.9.4-r2.ebuild| 45 ++
.../blokish/files/blokish-0.9.4-wxgtk.patch| 21 ++
2 files changed, 66 insertions(+)
diff --git a/games-board/blokish/blokish-0.9.4-r2.ebuild
b/games-board/blokish/blokish-0.9.4-r2.ebuild
new file mode 100644
index 000..8f3faba
--- /dev/null
+++ b/games-board/blokish/blokish-0.9.4-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils autotools wxwidgets games
+
+MY_P="${PN}_v${PV}"
+DESCRIPTION="Open source clone of the four-player board game Blokus"
+HOMEPAGE="http://sourceforge.net/projects/blokish/;
+SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+ virtual/glu
+ virtual/opengl"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-underlink.patch \
+ "${FILESDIR}"/${P}-wxgtk.patch
+ sed -i \
+ -e "s:wx-config:${WX_CONFIG}:" \
+ configure.in makefile.am || die
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ doicon src/${PN}.xpm
+ make_desktop_entry ${PN} Blokish ${PN}
+
+ dohtml docs/*
+ prepgamesdirs
+}
diff --git a/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
new file mode 100644
index 000..008702e
--- /dev/null
+++ b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
@@ -0,0 +1,21 @@
+diff -ru blokish.orig/src/blokish.cpp blokish/src/blokish.cpp
+--- blokish.orig/src/blokish.cpp 2007-04-01 17:01:26.0 -0400
blokish/src/blokish.cpp2015-11-15 21:48:32.426081482 -0500
+@@ -903,7 +903,7 @@
+ void OnSaveGame(wxCommandEvent )
+ {
+ WaitForAIToFinish();
+-wxString filename = wxFileSelector(wxString::FromAscii("Select a filename
to save as"), wxString::FromAscii(""), wxString::FromAscii("default.sav"),
wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxSAVE);
++wxString filename = wxFileSelector(wxString::FromAscii("Select a filename
to save as"), wxString::FromAscii(""), wxString::FromAscii("default.sav"),
wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxFD_SAVE);
+ if(!filename.empty())
+ {
+ std::ofstream outFile(filename.fn_str(), std::ios::binary);
+@@ -915,7 +915,7 @@
+ void OnLoadGame(wxCommandEvent )
+ {
+ WaitForAIToFinish();
+-wxString filename = wxFileSelector(wxString::FromAscii("Select a game to
load"), wxString::FromAscii(""), wxString::FromAscii(""),
wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxOPEN |
wxFILE_MUST_EXIST);
++wxString filename = wxFileSelector(wxString::FromAscii("Select a game to
load"), wxString::FromAscii(""), wxString::FromAscii(""),
wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxFD_OPEN |
wxFD_FILE_MUST_EXIST);
+ if(!filename.empty())
+ {
+ std::ifstream inFile(filename.fn_str(), std::ios::binary);
