[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/

2023-11-24 Thread Pacho Ramos 
commit: a3476fb6536d851d7a80ab638783150d61371103
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Nov 24 12:57:01 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Nov 24 12:57:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3476fb6

games-board/openyahtzee: fix UnusedInherits

Signed-off-by: Pacho Ramos  gentoo.org>

 games-board/openyahtzee/openyahtzee-1.9.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-board/openyahtzee/openyahtzee-1.9.3-r2.ebuild 
b/games-board/openyahtzee/openyahtzee-1.9.3-r2.ebuild
index bdbe466b02da..9ded508d8921 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.3-r2.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.3-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
-inherit flag-o-matic toolchain-funcs wxwidgets
+inherit flag-o-matic wxwidgets
 
 DESCRIPTION="Full-featured wxWidgets version of the classic dice game Yahtzee"
 HOMEPAGE="https://openyahtzee.sourceforge.net/;

[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/, games-board/openyahtzee/files/

2023-11-24 Thread Pacho Ramos 
commit: b231eca789fe217f37537e185f023c8d47dba62a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Nov 24 12:56:15 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Nov 24 12:56:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b231eca7

games-board/openyahtzee: Port to wxGTK 3.2

Signed-off-by: Pacho Ramos  gentoo.org>

 .../openyahtzee/files/openyahtzee-1.9.3-wx32.patch | 11 
 .../openyahtzee/openyahtzee-1.9.3-r2.ebuild| 29 ++
 2 files changed, 40 insertions(+)

diff --git a/games-board/openyahtzee/files/openyahtzee-1.9.3-wx32.patch 
b/games-board/openyahtzee/files/openyahtzee-1.9.3-wx32.patch
new file mode 100644
index ..0ac1d300bd0b
--- /dev/null
+++ b/games-board/openyahtzee/files/openyahtzee-1.9.3-wx32.patch
@@ -0,0 +1,11 @@
+--- a/src/about.cpp
 b/src/about.cpp
+@@ -40,7 +40,7 @@ void AboutDialog::addControlsAndLayout()
+ 
+   wxStaticText* app_label = new wxStaticText(this,wxID_ANY,wxT("Open 
Yahtzee ") wxT(VERSION));
+   app_label->SetFont(wxFont(14, wxDEFAULT, wxNORMAL, wxBOLD, false));
+-  title_sizer->Add(app_label, 0, 
wxALL|wxALIGN_CENTER_VERTICAL|wxADJUST_MINSIZE, 10);
++  title_sizer->Add(app_label, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10);
+ 
+   wxNotebook* notebook_main = new wxNotebook(this, wxID_ANY);
+   notebookAboutTab(notebook_main);

diff --git a/games-board/openyahtzee/openyahtzee-1.9.3-r2.ebuild 
b/games-board/openyahtzee/openyahtzee-1.9.3-r2.ebuild
new file mode 100644
index ..bdbe466b02da
--- /dev/null
+++ b/games-board/openyahtzee/openyahtzee-1.9.3-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit flag-o-matic toolchain-funcs wxwidgets
+
+DESCRIPTION="Full-featured wxWidgets version of the classic dice game Yahtzee"
+HOMEPAGE="https://openyahtzee.sourceforge.net/;
+SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="
+   ${RDEPEND}
+   dev-libs/boost
+"
+
+PATCHES=( "${FILESDIR}"/${P}-wx32.patch )
+
+src_configure() {
+   append-cxxflags -std=c++11
+   setup-wxwidgets
+   econf --datadir=/usr/share
+}

[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/

2021-04-04 Thread Sam James 
commit: 45d7e62adc78275f9a1d1c2549b211848e39839a
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr  4 11:39:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  4 12:38:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d7e62a

games-board/openyahtzee: fix wxwidgets

Closes: https://bugs.gentoo.org/779979
Signed-off-by: Sam James  gentoo.org>

 .../{openyahtzee-1.9.3.ebuild => openyahtzee-1.9.3-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild 
b/games-board/openyahtzee/openyahtzee-1.9.3-r1.ebuild
similarity index 97%
rename from games-board/openyahtzee/openyahtzee-1.9.3.ebuild
rename to games-board/openyahtzee/openyahtzee-1.9.3-r1.ebuild
index dbf5ebc9bb8..9d1c1b6e389 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.3-r1.ebuild
@@ -35,6 +35,6 @@ pkg_pretend() {
 
 src_configure() {
append-cxxflags -std=c++11
-   need-wxwidgets unicode
+   setup-wxwidgets
econf --datadir=/usr/share
 }

[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/

2021-04-04 Thread Sam James 
commit: ecd102c35a753b734f72d48ee61c048b806da760
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr  4 06:56:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  4 07:21:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecd102c3

games-board/openyahtzee: port to EAPI 7, eutils--

Signed-off-by: Sam James  gentoo.org>

 games-board/openyahtzee/openyahtzee-1.9.3.ebuild | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild 
b/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
index def1007cccb..dbf5ebc9bb8 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 eutils flag-o-matic wxwidgets toolchain-funcs versionator
+inherit flag-o-matic toolchain-funcs wxwidgets
 
 DESCRIPTION="A full-featured wxWidgets version of the classic dice game 
Yahtzee"
 HOMEPAGE="http://openyahtzee.sourceforge.net/;
@@ -12,19 +13,19 @@ SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   >=sys-devel/gcc-4.6
-   dev-libs/boost"
+DEPEND="
+   ${RDEPEND}
+   dev-libs/boost
+"
 
 pkg_pretend() {
local ver=4.6
local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' 
and nullptr support."
 
if tc-is-gcc ; then
-   if ! version_is_at_least ${ver} $(gcc-version); then
+   if ver_test ${ver} -gt $(gcc-version); then
die ${msg}
fi
else

[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/

2020-10-31 Thread David Seifert 
commit: 4ed3babce036407e137f6037c9caceed27fd1214
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct 31 11:11:02 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 31 11:11:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed3babc

games-board/openyahtzee: [QA] Inherit flag-o-matic.eclass explicitly

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-board/openyahtzee/openyahtzee-1.9.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild 
b/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
index 35b4ee304f5..def1007cccb 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 WX_GTK_VER="3.0"
-inherit eutils wxwidgets toolchain-funcs versionator
+inherit eutils flag-o-matic wxwidgets toolchain-funcs versionator
 
 DESCRIPTION="A full-featured wxWidgets version of the classic dice game 
Yahtzee"
 HOMEPAGE="http://openyahtzee.sourceforge.net/;

[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/files/

2017-12-23 Thread David Seifert 
commit: c1a8004af263b5b9a6a4dce5502dcdfda7ed23d0
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Dec 22 15:20:23 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Dec 23 13:09:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a8004a

games-board/openyahtzee: remove unused patch

 .../files/openyahtzee-1.9.2-wx3.0.patch| 67 --
 1 file changed, 67 deletions(-)

diff --git a/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch 
b/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch
deleted file mode 100644
index 485a14c9cee..000
--- a/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Guy Rutenberg 
-Date: Sat, 25 Oct 2014 15:33:42 +0200
-Subject: wxstrtol
-
-Fixes a FTBFS with recent versions of wx3.0.

- src/MainFrame.cpp | 12 ++--
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/MainFrame.cpp b/src/MainFrame.cpp
-index 2128376..8e29d6d 100644
 a/src/MainFrame.cpp
-+++ b/src/MainFrame.cpp
-@@ -510,7 +510,7 @@ void MainFrame::OnUndo(wxCommandEvent& event)
-   wxString tempstr;
-   
-   tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> 
GetValue();
--  tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) - 100);
-+  tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) - 
100);
-   ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> 
SetValue(tempstr);
-   }
- 
-@@ -936,7 +936,7 @@ void MainFrame::YahtzeeBonus()
-   return;
-   if (m_score_dice.IsYahtzee()) {
-   tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> 
GetValue();
--  tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) + 100);
-+  tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) + 
100);
-   ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> 
SetValue(tempstr);
-   m_yahtzeebonus = true;
-   }   
-@@ -973,7 +973,7 @@ void MainFrame::EndofGame()
- 
-   for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){
-   tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
--  upperscore += wxStrtol(tempstr, NULL, 10);
-+  upperscore += strtol(tempstr.mb_str(), NULL, 10);
-   }
-   
-   tempstr.Printf(wxT("%li"),upperscore);
-@@ -992,7 +992,7 @@ void MainFrame::EndofGame()
-   //calculate total on lower section
-   for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) {
-   tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
--  lowerscore += wxStrtol(tempstr, NULL, 10);
-+  lowerscore += strtol(tempstr.mb_str(), NULL, 10);
-   }
-   
-   tempstr.Printf(wxT("%li"),lowerscore);
-@@ -1091,7 +1091,7 @@ void MainFrame::CalculateSubTotal()
- 
-   for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){
-   tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
--  upperscore += wxStrtol(tempstr, NULL, 10);
-+  upperscore += strtol(tempstr.mb_str(), NULL, 10);
-   }
-   
-   tempstr.Printf(wxT("%li"),upperscore);
-@@ -1105,7 +1105,7 @@ void MainFrame::CalculateSubTotal()
- 
-   for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) {
-   tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
--  lowerscore += wxStrtol(tempstr, NULL, 10);
-+  lowerscore += strtol(tempstr.mb_str(), NULL, 10);
-   }
-   
-   tempstr.Printf(wxT("%li"),lowerscore);

[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/

2016-07-25 Thread Austin English 
commit: 28de8a84a7cee0d27503e403d1dd3cd3e7129adb
Author: Austin English  gentoo  org>
AuthorDate: Tue Jul 26 00:06:43 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Tue Jul 26 00:06:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28de8a84

games-board/openyahtzee: version bump to 1.9.3

Also:
* remove deprecated games eclass
* update to EAPI 6
* drop upstreamed patch
* add tc-is-gcc check, warn for other compilers
* add -std=c++11 to CXXFLAGS, needed by gcc-4.9 and clang

Gentoo-Bug: https://bugs.gentoo.org/588234
Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 games-board/openyahtzee/Manifest |  1 +
 games-board/openyahtzee/openyahtzee-1.9.3.ebuild | 40 
 2 files changed, 41 insertions(+)

diff --git a/games-board/openyahtzee/Manifest b/games-board/openyahtzee/Manifest
index c62fa8e..1f1b8de 100644
--- a/games-board/openyahtzee/Manifest
+++ b/games-board/openyahtzee/Manifest
@@ -1 +1,2 @@
 DIST openyahtzee-1.9.2.tar.bz2 194053 SHA256 
a56c2c16fc6ec3f4eba5a85afcf19467b364ec38f4374724673a0360fc3f83cd SHA512 
012b7081eafafb28ada3d15f82d42b0a7fe5fe2e4c728dfbd1e3c688ef0e00bd22a55b1450e267c6e1d9d3cc2a8cf76dbec336c744a239df7dd46a473038b141
 WHIRLPOOL 
9013b7006fe4da86f69127c9a5a11544bd1022e31a4f0197d4fce58d75113b0246d5b76e1adf6a7e4d73ddd4beff0ce2a1a53a0e853366c59effbb3dfd406e80
+DIST openyahtzee-1.9.3.tar.xz 178868 SHA256 
a6a02a5cd61d7094c6280b5b701de5a1b8769056cb2305fbd083970f0187762b SHA512 
7e696141d8f567247300c7f4924889b0a2f88866c70a10ad7619709990cacb726ec0af28bcee62a9f0d607d7f83ca5bb62d7275b2cc6e0343004f9125e4fb506
 WHIRLPOOL 
36a399405d087c9631f0723550a3dec1247622dae80450d49079281d273244004173b448522295598c0020bb7e618ee446ba10e5ee28b1eb5441cd081220c868

diff --git a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild 
b/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
new file mode 100644
index 000..bb45a29
--- /dev/null
+++ b/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
@@ -0,0 +1,40 @@
+# 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 wxwidgets toolchain-funcs versionator
+
+DESCRIPTION="A full-featured wxWidgets version of the classic dice game 
Yahtzee"
+HOMEPAGE="http://openyahtzee.sourceforge.net/;
+SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   >=sys-devel/gcc-4.6
+   dev-libs/boost"
+
+pkg_pretend() {
+   local ver=4.6
+   local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' 
and nullptr support."
+
+   if tc-is-gcc ; then
+   if ! version_is_at_least ${ver} $(gcc-version); then
+   die ${msg}
+   fi
+   else
+   ewarn "Ensure your compiler has C++11 support, otherwise build 
will fail."
+   fi
+}
+
+src_configure() {
+   append-cxxflags -std=c++11
+   need-wxwidgets unicode
+   econf --datadir=/usr/share
+}

[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/

2015-12-28 Thread Michael Sterrett 
commit: 4d70e5cb111a0cc7ea02fae6e773f4211bfe4351
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Dec 29 04:01:55 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Dec 29 07:40:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d70e5cb

old

Package-Manager: portage-2.2.24

 games-board/openyahtzee/Manifest |  1 -
 games-board/openyahtzee/openyahtzee-1.9.1.ebuild | 39 
 2 files changed, 40 deletions(-)

diff --git a/games-board/openyahtzee/Manifest b/games-board/openyahtzee/Manifest
index 71706973..c62fa8e 100644
--- a/games-board/openyahtzee/Manifest
+++ b/games-board/openyahtzee/Manifest
@@ -1,2 +1 @@
-DIST openyahtzee-1.9.1.tar.bz2 159149 SHA256 
aa553a248d30ba259abb8dee735d5728bfdbb8d4705805bc716453245f1cb0a0 SHA512 
2833a7085bb03d157b58a5e3a95c03b8a51cc8b527aec204188c8f773c492f4822655ec15dbedd4330c25bc4382132694ae7d3935dfb27756e859149ab66ef59
 WHIRLPOOL 
8c9986f163576d2d5ab31ea4083139645513c6d3e1a171cba9cb7030186a2f022984e8a9925f7524e2b25b9c7ad3a989eb39bb76b13642cef848e66daabfa86d
 DIST openyahtzee-1.9.2.tar.bz2 194053 SHA256 
a56c2c16fc6ec3f4eba5a85afcf19467b364ec38f4374724673a0360fc3f83cd SHA512 
012b7081eafafb28ada3d15f82d42b0a7fe5fe2e4c728dfbd1e3c688ef0e00bd22a55b1450e267c6e1d9d3cc2a8cf76dbec336c744a239df7dd46a473038b141
 WHIRLPOOL 
9013b7006fe4da86f69127c9a5a11544bd1022e31a4f0197d4fce58d75113b0246d5b76e1adf6a7e4d73ddd4beff0ce2a1a53a0e853366c59effbb3dfd406e80

diff --git a/games-board/openyahtzee/openyahtzee-1.9.1.ebuild 
b/games-board/openyahtzee/openyahtzee-1.9.1.ebuild
deleted file mode 100644
index 3fecc1a..000
--- a/games-board/openyahtzee/openyahtzee-1.9.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="2.8"
-inherit wxwidgets toolchain-funcs versionator games
-
-DESCRIPTION="A full-featured wxWidgets version of the classic dice game 
Yahtzee"
-HOMEPAGE="http://openyahtzee.sourceforge.net/;
-SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/wxGTK:2.8[X]"
-DEPEND="${RDEPEND}
-   >=sys-devel/gcc-4.6
-   dev-libs/boost"
-
-pkg_pretend() {
-   local ver=4.6
-   local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' 
and nullptr support."
-   if ! version_is_at_least ${ver} $(gcc-version); then
-   eerror ${msg}
-   die ${msg}
-   fi
-}
-
-src_configure() {
-   egamesconf --datadir=/usr/share
-}
-
-src_install() {
-   default
-   prepgamesdirs
-}

[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/

2015-12-09 Thread Agostino Sarubbo 
commit: af4a09909b177273133783849c6b1ce194384cfa
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Dec  9 10:47:31 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Dec  9 10:47:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4a0990

games-board/openyahtzee: amd64 stable wrt bug #567736

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-board/openyahtzee/openyahtzee-1.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-board/openyahtzee/openyahtzee-1.9.2.ebuild 
b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
index 8458d30..b1170a6 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"

[gentoo-commits] repo/gentoo:master commit in: games-board/openyahtzee/files/, games-board/openyahtzee/

2015-11-07 Thread Pacho Ramos 
commit: b7af69e8e1e4b595c3dd4e4a477cbb7d21c0203c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Nov  7 13:32:57 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Nov  7 13:33:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7af69e8

games-board/openyahtzee: Version bump and support wxGTK:3.0 (#563962)

Package-Manager: portage-2.2.23

 games-board/openyahtzee/Manifest   |  1 +
 .../files/openyahtzee-1.9.2-wx3.0.patch| 67 ++
 games-board/openyahtzee/openyahtzee-1.9.2.ebuild   | 46 +++
 3 files changed, 114 insertions(+)

diff --git a/games-board/openyahtzee/Manifest b/games-board/openyahtzee/Manifest
index 1a1267e..71706973 100644
--- a/games-board/openyahtzee/Manifest
+++ b/games-board/openyahtzee/Manifest
@@ -1 +1,2 @@
 DIST openyahtzee-1.9.1.tar.bz2 159149 SHA256 
aa553a248d30ba259abb8dee735d5728bfdbb8d4705805bc716453245f1cb0a0 SHA512 
2833a7085bb03d157b58a5e3a95c03b8a51cc8b527aec204188c8f773c492f4822655ec15dbedd4330c25bc4382132694ae7d3935dfb27756e859149ab66ef59
 WHIRLPOOL 
8c9986f163576d2d5ab31ea4083139645513c6d3e1a171cba9cb7030186a2f022984e8a9925f7524e2b25b9c7ad3a989eb39bb76b13642cef848e66daabfa86d
+DIST openyahtzee-1.9.2.tar.bz2 194053 SHA256 
a56c2c16fc6ec3f4eba5a85afcf19467b364ec38f4374724673a0360fc3f83cd SHA512 
012b7081eafafb28ada3d15f82d42b0a7fe5fe2e4c728dfbd1e3c688ef0e00bd22a55b1450e267c6e1d9d3cc2a8cf76dbec336c744a239df7dd46a473038b141
 WHIRLPOOL 
9013b7006fe4da86f69127c9a5a11544bd1022e31a4f0197d4fce58d75113b0246d5b76e1adf6a7e4d73ddd4beff0ce2a1a53a0e853366c59effbb3dfd406e80

diff --git a/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch 
b/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch
new file mode 100644
index 000..485a14c
--- /dev/null
+++ b/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch
@@ -0,0 +1,67 @@
+From: Guy Rutenberg 
+Date: Sat, 25 Oct 2014 15:33:42 +0200
+Subject: wxstrtol
+
+Fixes a FTBFS with recent versions of wx3.0.
+---
+ src/MainFrame.cpp | 12 ++--
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/MainFrame.cpp b/src/MainFrame.cpp
+index 2128376..8e29d6d 100644
+--- a/src/MainFrame.cpp
 b/src/MainFrame.cpp
+@@ -510,7 +510,7 @@ void MainFrame::OnUndo(wxCommandEvent& event)
+   wxString tempstr;
+   
+   tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> 
GetValue();
+-  tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) - 100);
++  tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) - 
100);
+   ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> 
SetValue(tempstr);
+   }
+ 
+@@ -936,7 +936,7 @@ void MainFrame::YahtzeeBonus()
+   return;
+   if (m_score_dice.IsYahtzee()) {
+   tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> 
GetValue();
+-  tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) + 100);
++  tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) + 
100);
+   ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> 
SetValue(tempstr);
+   m_yahtzeebonus = true;
+   }   
+@@ -973,7 +973,7 @@ void MainFrame::EndofGame()
+ 
+   for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){
+   tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+-  upperscore += wxStrtol(tempstr, NULL, 10);
++  upperscore += strtol(tempstr.mb_str(), NULL, 10);
+   }
+   
+   tempstr.Printf(wxT("%li"),upperscore);
+@@ -992,7 +992,7 @@ void MainFrame::EndofGame()
+   //calculate total on lower section
+   for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) {
+   tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+-  lowerscore += wxStrtol(tempstr, NULL, 10);
++  lowerscore += strtol(tempstr.mb_str(), NULL, 10);
+   }
+   
+   tempstr.Printf(wxT("%li"),lowerscore);
+@@ -1091,7 +1091,7 @@ void MainFrame::CalculateSubTotal()
+ 
+   for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){
+   tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+-  upperscore += wxStrtol(tempstr, NULL, 10);
++  upperscore += strtol(tempstr.mb_str(), NULL, 10);
+   }
+   
+   tempstr.Printf(wxT("%li"),upperscore);
+@@ -1105,7 +1105,7 @@ void MainFrame::CalculateSubTotal()
+ 
+   for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) {
+   tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
+-  lowerscore += wxStrtol(tempstr, NULL, 10);
++  lowerscore += strtol(tempstr.mb_str(), NULL, 10);
+   }
+   
+   tempstr.Printf(wxT("%li"),lowerscore);

diff --git a/games-board/openyahtzee/openyahtzee-1.9.2.ebuild 
b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
new file mode 100644
index