[gentoo-commits] repo/gentoo:master commit in: games-puzzle/pingus/files/, games-puzzle/pingus/

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/pingus/files/, games-puzzle/pingus/

[Lars Wendler]

commit:     fde7e22c94c4c535e5d3a765f396fab5bacdcac9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 14:24:06 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 14:24:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde7e22c

games-puzzle/pingus: Revbump to EAPI-6. Also fixing build with gcc7.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch |  8 +--
 games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch  | 21 ++++++++
 .../pingus/files/pingus-0.7.6-noopengl.patch       |  4 +-
 games-puzzle/pingus/pingus-0.7.6-r1.ebuild         | 62 ++++++++++++++++++++++
 4 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
index b1397da31f6..3c1cac5589e 100644
--- a/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
+++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
@@ -1,5 +1,5 @@
---- src/pingus/pingus_main.cpp.orig	2012-07-08 14:02:40.343767438 +0200
-+++ src/pingus/pingus_main.cpp	2012-07-08 14:02:54.062768168 +0200
+--- a/src/pingus/pingus_main.cpp
++++ b/src/pingus/pingus_main.cpp
 @@ -465,7 +465,7 @@
  void
  PingusMain::print_greeting_message()
@@ -9,8 +9,8 @@
    greeting += "!";
    std::cout <<  greeting << std::endl;
    for (unsigned int i = 0; i < greeting.length(); ++i)
---- src/pingus/screens/pingus_menu.cpp.orig	2012-07-08 14:03:05.549768782 +0200
-+++ src/pingus/screens/pingus_menu.cpp	2012-07-08 14:03:17.015769393 +0200
+--- a/src/pingus/screens/pingus_menu.cpp
++++ b/src/pingus/screens/pingus_menu.cpp
 @@ -153,7 +153,7 @@
                           gc.get_height()/2 - 280));
  

diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch
new file mode 100644
index 00000000000..bf04ccd047c
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch
@@ -0,0 +1,21 @@
+From df6e2f445d3e2925a94d22faeb17be9444513e92 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Mon, 30 Jan 2017 15:41:53 +0000
+Subject: [PATCH] Add missing header for std::function and std::bind
+
+---
+ src/pingus/screens/demo_session.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pingus/screens/demo_session.cpp b/src/pingus/screens/demo_session.cpp
+index e3ec49a2c..f887e50f0 100644
+--- a/src/pingus/screens/demo_session.cpp
++++ b/src/pingus/screens/demo_session.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include <algorithm>
+ #include <iostream>
++#include <functional>
+ 
+ #include "engine/gui/gui_manager.hpp"
+ #include "engine/gui/surface_button.hpp"

diff --git a/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch b/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
index e474ef7376e..6d1af794b03 100644
--- a/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
+++ b/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
@@ -1,5 +1,5 @@
---- src/engine/display/display.cpp.orig	2012-06-30 00:30:13.043995049 -0400
-+++ src/engine/display/display.cpp	2012-06-30 00:30:28.194501544 -0400
+--- a/src/engine/display/display.cpp
++++ b/src/engine/display/display.cpp
 @@ -28,6 +28,7 @@
  #include "engine/display/delta/delta_framebuffer.hpp"
  #include "engine/display/null_framebuffer.hpp"

diff --git a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
new file mode 100644
index 00000000000..968fa1f3342
--- /dev/null
+++ b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit scons-utils toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="free Lemmings clone"
+HOMEPAGE="http://pingus.seul.org/"
+SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl music"
+
+RDEPEND="media-libs/libsdl[joystick,opengl?,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	music? ( media-libs/sdl-mixer[mod] )
+	opengl? ( virtual/opengl )
+	media-libs/libpng:0=
+	dev-libs/boost:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noopengl.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-echo-e.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+)
+
+src_prepare() {
+	default
+	strip-flags
+}
+
+src_compile() {
+	escons \
+		CXX="$(tc-getCXX)" \
+		CCFLAGS="${CXXFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		with_opengl=$(usex opengl 1 0)
+}
+
+src_install() {
+	emake install-exec install-data \
+		DESTDIR="${D}" \
+		PREFIX="/usr"
+	doman doc/man/pingus.6
+	doicon data/images/icons/pingus.svg
+	make_desktop_entry ${PN} Pingus
+	dodoc AUTHORS NEWS README TODO
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/pingus/files/, games-puzzle/pingus/

[Lars Wendler]

commit:     e64f0ba389e94891c5b9b8642edc3b67d341bc73
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 16:40:45 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 16:43:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e64f0ba3

games-puzzle/pingus: Added live ebuild

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../pingus/files/pingus-9999-no_libexec.patch      | 33 ++++++++++++++
 games-puzzle/pingus/pingus-9999.ebuild             | 50 ++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/games-puzzle/pingus/files/pingus-9999-no_libexec.patch b/games-puzzle/pingus/files/pingus-9999-no_libexec.patch
new file mode 100644
index 00000000000..45da29a4226
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-9999-no_libexec.patch
@@ -0,0 +1,33 @@
+From ef01ebf5401419a0e98dfe32efa9a0bc8564e26f Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 3 Apr 2019 18:35:28 +0200
+Subject: [PATCH] Don't install pingus executable into libexec
+
+This doesn't really make any sense.
+---
+ CMakeLists.txt | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f3a92be64..fa835236d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -213,15 +213,6 @@ if(BUILD_TESTS)
+ endif(BUILD_TESTS)
+ 
+ install(TARGETS pingus
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
+-
+-configure_file(
+-  ${CMAKE_CURRENT_SOURCE_DIR}/pingus.sh.in
+-  ${CMAKE_BINARY_DIR}/pingus.sh)
+-
+-install(FILES
+-  ${CMAKE_BINARY_DIR}/pingus.sh
+-  RENAME pingus
+   PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+   DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-- 
+2.21.0
+

diff --git a/games-puzzle/pingus/pingus-9999.ebuild b/games-puzzle/pingus/pingus-9999.ebuild
new file mode 100644
index 00000000000..54588481980
--- /dev/null
+++ b/games-puzzle/pingus/pingus-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="free Lemmings clone"
+HOMEPAGE="http://pingus.gitlab.io/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/pingus/pingus.git"
+else
+	SRC_URI="https://github.com/Pingus/pingus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/jsoncpp
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[mod]
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.6-noopengl.patch
+	"${FILESDIR}"/${P}-no_libexec.patch
+)
+
+src_prepare() {
+	sed '/find_package(Boost/s@ signals@@' -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+	strip-flags
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/pingus/files/, games-puzzle/pingus/

[Ionen Wolkens]

commit:     f184af3db161e418a64f2852dadca49b22c8b1cc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 03:59:57 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 03:59:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f184af3d

games-puzzle/pingus: fix build w/ gcc13

Closes: https://bugs.gentoo.org/899574
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-puzzle/pingus/files/pingus-0.7.6-gcc13.patch | 13 +++++++++++++
 games-puzzle/pingus/pingus-0.7.6-r4.ebuild         |  1 +
 2 files changed, 14 insertions(+)

diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc13.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc13.patch
new file mode 100644
index 000000000000..2e12a76e1aaf
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc13.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/899574
+--- a/src/engine/display/font_description.hpp
++++ b/src/engine/display/font_description.hpp
+@@ -19,2 +19,3 @@
+ 
++#include <cstdint>
+ #include <vector>
+--- a/src/util/pathname.hpp
++++ b/src/util/pathname.hpp
+@@ -19,2 +19,3 @@
+ 
++#include <cstdint>
+ #include <string>

diff --git a/games-puzzle/pingus/pingus-0.7.6-r4.ebuild b/games-puzzle/pingus/pingus-0.7.6-r4.ebuild
index 3efc2e7eeb36..99a5e62da97e 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r4.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r4.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc7.patch
 	"${FILESDIR}"/${P}-boost_signals2.patch
 	"${FILESDIR}"/${P}-python3.patch
+	"${FILESDIR}"/${P}-gcc13.patch
 )
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/pingus/files/, games-puzzle/pingus/

[Pacho Ramos]

commit:     6226f613d81c0226e7bfd79e0462c36485c18072
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 23:16:21 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 23:17:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6226f613

games-puzzle/pingus: Honour arguments in the wrapper

And respect AR variabke

Closes: https://bugs.gentoo.org/782394
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch                   | 4 ++--
 .../pingus/{pingus-0.7.6-r4.ebuild => pingus-0.7.6-r5.ebuild}         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch b/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
index ab772d8c72e9..ac329c0dd58d 100644
--- a/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
+++ b/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
@@ -1,5 +1,5 @@
 # Work around Gentoo's crippled dash
-
+# Also add "$@" to accept options
 --- pingus-0.7.6/Makefile
 +++ pingus-0.7.6/Makefile
 @@ -39,7 +39,7 @@
@@ -7,7 +7,7 @@
  
  	install -D build/pingus "$(DESTDIR)$(BINDIR)/pingus.bin"
 -	echo -e "#!/bin/sh\nexec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\"" > "$(DESTDIR)$(BINDIR)/pingus"
-+	printf '%s\n%s' "#!/bin/sh" "exec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\"" > "$(DESTDIR)$(BINDIR)/pingus"
++	printf '%s\n%s' "#!/bin/sh" "exec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\" \"\$$@\"" > "$(DESTDIR)$(BINDIR)/pingus"
  	chmod 755 "$(DESTDIR)$(BINDIR)/pingus"
  
  install-data:

diff --git a/games-puzzle/pingus/pingus-0.7.6-r4.ebuild b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
similarity index 98%
rename from games-puzzle/pingus/pingus-0.7.6-r4.ebuild
rename to games-puzzle/pingus/pingus-0.7.6-r5.ebuild
index 99a5e62da97e..b9cf5c7b0a22 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r4.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
 src_compile() {
 	strip-flags
 	escons \
+		AR="$(tc-getAR)" \
 		CXX="$(tc-getCXX)" \
 		CCFLAGS="${CXXFLAGS}" \
 		LINKFLAGS="${LDFLAGS}" \

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/pingus/files/, games-puzzle/pingus/

[Pacho Ramos]

commit:     99bee84b101e6d42fb4f76019421edf344c315c6
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 13:44:07 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 13:44:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99bee84b

games-puzzle/pingus: Fix AR detection

Thanks-to: Ionen Wolkens
Thanks-to: Agostino Sarubbo
Closes: https://bugs.gentoo.org/905269
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 games-puzzle/pingus/files/pingus-0.7.6-ar-detection.patch | 10 ++++++++++
 games-puzzle/pingus/pingus-0.7.6-r5.ebuild                |  1 +
 2 files changed, 11 insertions(+)

diff --git a/games-puzzle/pingus/files/pingus-0.7.6-ar-detection.patch b/games-puzzle/pingus/files/pingus-0.7.6-ar-detection.patch
new file mode 100644
index 000000000000..839138f317eb
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-ar-detection.patch
@@ -0,0 +1,10 @@
+--- a/SConscript.old	2023-04-29 15:35:01.161090820 +0200
++++ b/SConscript	2023-04-29 15:36:38.909311880 +0200
+@@ -88,6 +88,7 @@
+         self.opts.Add('BUILD', 'Set the build type', "default")
+         self.opts.Add('CC', 'C Compiler', 'gcc')
+         self.opts.Add('CXX', 'C++ Compiler', 'g++')
++        self.opts.Add('AR', 'Archiver', 'ar')
+     #   self.opts.Add('debug', 'Build with debugging options', 0)
+     #   self.opts.Add('profile', 'Build with profiling support', 0)
+     

diff --git a/games-puzzle/pingus/pingus-0.7.6-r5.ebuild b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
index b9cf5c7b0a22..11f6cb1c5cb1 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-boost_signals2.patch
 	"${FILESDIR}"/${P}-python3.patch
 	"${FILESDIR}"/${P}-gcc13.patch
+	"${FILESDIR}"/${P}-ar-detection.patch
 )
 
 src_compile() {