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

2024-08-11 Thread Ulrich Müller 
commit: 2cceea3d9730a835aac7560357c8185f9745ece4
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Aug 11 11:37:16 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Aug 11 11:39:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cceea3d

games-puzzle/pingus: update LICENSE

Closes: https://bugs.gentoo.org/937748
Signed-off-by: Ulrich Müller  gentoo.org>

 games-puzzle/pingus/pingus-0.7.6-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-puzzle/pingus/pingus-0.7.6-r5.ebuild 
b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
index 0e31967af72e..80d8be7a1c2b 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Free Lemmings clone"
 HOMEPAGE="https://pingus.gitlab.io/";
 SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2";
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+ GPL-2+ ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl music"

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

2024-05-04 Thread Pacho Ramos 
commit: e6b1f926a1532107b007ece3c2f7ede18e954e50
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat May  4 17:19:37 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat May  4 17:38:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b1f926

games-puzzle/pingus: enable py3.12

Closes: https://bugs.gentoo.org/929592
Signed-off-by: Pacho Ramos  gentoo.org>

 games-puzzle/pingus/pingus-0.7.6-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/pingus/pingus-0.7.6-r5.ebuild 
b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
index 11f6cb1c5cb1..0e31967af72e 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 DESCRIPTION="Free Lemmings clone"

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

2023-04-29 Thread Pacho Ramos 
commit: 99bee84b101e6d42fb4f76019421edf344c315c6
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Apr 29 13:44:07 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Apr 29 13:44:07 2023 +
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  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 ..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() {

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

2023-04-28 Thread Pacho Ramos 
commit: 6226f613d81c0226e7bfd79e0462c36485c18072
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Apr 28 23:16:21 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Apr 28 23:17:09 2023 +
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  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/

2023-04-22 Thread Ionen Wolkens 
commit: f184af3db161e418a64f2852dadca49b22c8b1cc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Apr 23 03:59:57 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Apr 23 03:59:57 2023 +
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  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 ..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 
+ #include 
+--- a/src/util/pathname.hpp
 b/src/util/pathname.hpp
+@@ -19,2 +19,3 @@
+ 
++#include 
+ #include 

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/

2023-02-15 Thread Ionen Wolkens 
commit: 261e997d3b0b0f9421e4088579f30c09bfe80684
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 16 06:00:26 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 16 07:29:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261e997d

games-puzzle/pingus: drop broken live ebuild

- nonsense with misnamed .gitmodules
- broken with current libfmt
- broken with either gcc12 or current boost (unsure, missing headers)
(perhaps more given haven't tried to go beyond that)

Meant to do a snapshot before if situation improves (worked but was
still kind of messy / mid-development), but that does not seem to be
a good time still. Unfortunate given this would migrate to SDL2 and
get rid of scons.

Could re-add if it builds again without having to patch downstream.

Old sdl1 pingus still works somehow.

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-puzzle/pingus/pingus-.ebuild | 31 ---
 1 file changed, 31 deletions(-)

diff --git a/games-puzzle/pingus/pingus-.ebuild 
b/games-puzzle/pingus/pingus-.ebuild
deleted file mode 100644
index 86efbe6553a5..
--- a/games-puzzle/pingus/pingus-.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake git-r3
-
-DESCRIPTION="Free Lemmings clone"
-HOMEPAGE="https://pingus.gitlab.io/";
-EGIT_REPO_URI="https://gitlab.com/pingus/pingus.git";
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-   dev-libs/jsoncpp:=
-   dev-libs/libfmt:=
-   dev-libs/libsigc++:2
-   media-libs/libmodplug
-   media-libs/libpng:=
-   media-libs/libsdl2[joystick,opengl,video]
-   media-libs/libvorbis
-   media-libs/openal
-   media-libs/opusfile
-   media-libs/sdl2-image[jpeg,png]
-   media-sound/mpg123
-   virtual/opengl"
-DEPEND="
-   ${RDEPEND}
-   dev-libs/boost
-   media-libs/glm"

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

2023-02-15 Thread Ionen Wolkens 
commit: fe1991c47ebaaf6a817aec7de1018026a4e4f3ee
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 16 06:32:12 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 16 07:29:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1991c4

games-puzzle/pingus: update upstream metadata with gitlab

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-puzzle/pingus/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-puzzle/pingus/metadata.xml b/games-puzzle/pingus/metadata.xml
index 9c99fd275b97..79367cecc54e 100644
--- a/games-puzzle/pingus/metadata.xml
+++ b/games-puzzle/pingus/metadata.xml
@@ -16,7 +16,7 @@ influence them by giving them commands, like build a bridge, 
dig a hole or redir
 animals in the other direction. The goal of each level is to reach the exit, 
for fix
 multiple combination of commands are necessary. The game is presented in a 2D 
site view.

-   pingus
+   pingus/pingus


Enable playing of background music

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

2023-02-15 Thread Ionen Wolkens 
commit: 08efb38659779f40aa9ec3bc79ce9216dd13a84f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 16 05:31:08 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 16 07:29:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08efb386

games-puzzle/pingus: EAPI7->8, enable py3.11

scons junk seems to work 3.11 still, ebuild could need
more attention but given upstream has removed scons it's
likely not worth spending time on (then again, it may be
a long time before a release still, development seem to
have slowed down).

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../{pingus-0.7.6-r3.ebuild => pingus-0.7.6-r4.ebuild}   | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild 
b/games-puzzle/pingus/pingus-0.7.6-r4.ebuild
similarity index 90%
rename from games-puzzle/pingus/pingus-0.7.6-r3.ebuild
rename to games-puzzle/pingus/pingus-0.7.6-r4.ebuild
index 4ab22971d918..3efc2e7eeb36 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 DESCRIPTION="Free Lemmings clone"
@@ -16,13 +16,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="opengl music"
 
 RDEPEND="
+   dev-libs/boost:=
+   media-libs/libpng:=
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:=
+   opengl? ( media-libs/libglvnd[X] )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
@@ -36,12 +36,8 @@ PATCHES=(
"${FILESDIR}"/${P}-python3.patch
 )
 
-src_prepare() {
-   xdg_src_prepare
-   strip-flags
-}
-
 src_compile() {
+   strip-flags
escons \
CXX="$(tc-getCXX)" \
CCFLAGS="${CXXFLAGS}" \

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

2022-02-11 Thread Ionen Wolkens 
commit: fc627dacb373eef4533fa16fb9750835eeae8697
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Feb 12 01:12:10 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb 12 01:54:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc627dac

games-puzzle/pingus: enable py3.10 + respect EPREFIX

Unfortunately still no release upstream to remove scons (and
live isn't in best state for a snapshot, broken with current
libfmt and need to handle many submodules).

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-puzzle/pingus/pingus-0.7.6-r3.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild 
b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
index 1b6acb9e7d83..1318ebeae323 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 DESCRIPTION="Free Lemmings clone"
@@ -52,7 +52,7 @@ src_compile() {
 src_install() {
emake install-exec install-data \
DESTDIR="${D}" \
-   PREFIX="/usr"
+   PREFIX="${EPREFIX}"/usr
doman doc/man/pingus.6
doicon data/images/icons/pingus.svg
make_desktop_entry ${PN} Pingus

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

2021-06-12 Thread Ionen Wolkens 
commit: 15ac2d2b844da0df0643ea3535b14da698dba0fc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jun 12 21:58:40 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun 12 22:04:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ac2d2b

games-puzzle/pingus: update live ebuild

Removed unnecessary patches. Using libexec is normal for support
binaries not meant to be executed directly (it'd be better if this
wrapper script wasn't needed, but left alone so live ebuild breaks
less easily)

Updated dependencies for new submodules. These are coming from pingus'
upstream splitting code into separate repos (no releases), notably
replaces sdl2-mixer by using libmodplug/openal/etc... directly.

Closes: https://bugs.gentoo.org/795585
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../pingus/files/pingus--no_libexec.patch  | 33 --
 games-puzzle/pingus/pingus-.ebuild | 53 +-
 2 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/games-puzzle/pingus/files/pingus--no_libexec.patch 
b/games-puzzle/pingus/files/pingus--no_libexec.patch
deleted file mode 100644
index 45da29a4226..000
--- a/games-puzzle/pingus/files/pingus--no_libexec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ef01ebf5401419a0e98dfe32efa9a0bc8564e26f Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-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-.ebuild 
b/games-puzzle/pingus/pingus-.ebuild
index b0083c14fd5..86efbe6553a 100644
--- a/games-puzzle/pingus/pingus-.ebuild
+++ b/games-puzzle/pingus/pingus-.ebuild
@@ -2,41 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake flag-o-matic xdg
 
-DESCRIPTION="free Lemmings clone"
+inherit xdg cmake git-r3
+
+DESCRIPTION="Free Lemmings clone"
 HOMEPAGE="https://pingus.gitlab.io/";
-if [[ "${PV}" == * ]] ; 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"
+EGIT_REPO_URI="https://gitlab.com/pingus/pingus.git";
+
+LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
-   dev-libs/boost:=
-   dev-libs/jsoncpp
-   media-libs/libpng:0=
+   dev-libs/jsoncpp:=
+   dev-libs/libfmt:=
+   dev-libs/libsigc++:2
+   media-libs/libmodplug
+   media-libs/libpng:=
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_src_prepare
-   strip-flags
-}
+   media-libs/libvorbis
+   media-libs/openal
+   media-libs/opusfile
+   media-libs/sdl2-image[jpeg,png]
+   media-sound/mpg123
+   virtual/opengl"
+DEPEND="
+   ${RDEPEND}
+   dev-libs/boost
+   media-libs/glm"

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

2021-04-11 Thread Sam James 
commit: f7036fb376e6a96055760ffe4cd1ca0676c49118
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 12 01:42:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 12 02:30:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7036fb3

games-puzzle/pingus: toolchain-funcs--

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

 games-puzzle/pingus/pingus-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/pingus/pingus-.ebuild 
b/games-puzzle/pingus/pingus-.ebuild
index a69c1c22fc7..b0083c14fd5 100644
--- a/games-puzzle/pingus/pingus-.ebuild
+++ b/games-puzzle/pingus/pingus-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake toolchain-funcs flag-o-matic xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="free Lemmings clone"
 HOMEPAGE="https://pingus.gitlab.io/";

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

2020-08-17 Thread Pacho Ramos 
commit: 7ae3f36f6311c433ca73eaabd6bc7eed3f188c0f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Aug 17 17:18:05 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Aug 17 17:18:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae3f36f

games-puzzle/pingus: Use python3 scons

Closes: https://bugs.gentoo.org/735538
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Pacho Ramos  gentoo.org>

 .../pingus/files/pingus-0.7.6-python3.patch| 19 +++
 games-puzzle/pingus/pingus-0.7.6-r3.ebuild | 60 ++
 2 files changed, 79 insertions(+)

diff --git a/games-puzzle/pingus/files/pingus-0.7.6-python3.patch 
b/games-puzzle/pingus/files/pingus-0.7.6-python3.patch
new file mode 100644
index 000..7df3bc9e983
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-python3.patch
@@ -0,0 +1,19 @@
+--- a/SConscript.bak   2019-08-01 12:45:16.937878393 -0500
 b/SConscript   2019-08-01 12:46:13.648803035 -0500
+@@ -126,12 +126,12 @@
+ def configure_end(self):
+ self.env = self.conf.Finish()
+ 
+-print "Reports:"
+-print self.reports
++print("Reports:")
++print(self.reports)
+ 
+ if not self.fatal_error == "":
+-print "Fatal Errors:"
+-print self.fatal_error
++print("Fatal Errors:")
++print(self.fatal_error)
+ Exit(1)
+ 
+ def configure_gxx(self): 

diff --git a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild 
b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
new file mode 100644
index 000..466c772c357
--- /dev/null
+++ b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
+
+DESCRIPTION="Free Lemmings clone"
+HOMEPAGE="https://pingus.gitlab.io/";
+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}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-noopengl.patch
+   "${FILESDIR}"/${P}-gcc47.patch
+   "${FILESDIR}"/${P}-echo-e.patch
+   "${FILESDIR}"/${P}-gcc7.patch
+   "${FILESDIR}"/${P}-boost_signals2.patch
+   "${FILESDIR}"/${P}-python3.patch
+)
+
+src_prepare() {
+   xdg_src_prepare
+   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
+   einstalldocs
+}

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

2020-08-17 Thread Pacho Ramos 
commit: 709c71a9ffa487f9ca1386845db934136642d7c3
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Aug 17 17:18:23 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Aug 17 17:18:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709c71a9

games-puzzle/pingus: Drop old

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Pacho Ramos  gentoo.org>

 games-puzzle/pingus/pingus-0.7.6-r2.ebuild | 63 --
 1 file changed, 63 deletions(-)

diff --git a/games-puzzle/pingus/pingus-0.7.6-r2.ebuild 
b/games-puzzle/pingus/pingus-0.7.6-r2.ebuild
deleted file mode 100644
index 7a222f34d4f..000
--- a/games-puzzle/pingus/pingus-0.7.6-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://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
-   "${FILESDIR}"/${P}-boost_signals2.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/

2020-02-01 Thread Bernard Cafarelli 
commit: 5cc2dfe430dcc1e24ef6eafc3f44ccd0391021fc
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sat Feb  1 21:34:54 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sat Feb  1 21:35:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc2dfe4

games-puzzle/pingus: use xdg eclass to also sync icon info

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-puzzle/pingus/pingus-.ebuild | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/games-puzzle/pingus/pingus-.ebuild 
b/games-puzzle/pingus/pingus-.ebuild
index ad3f83ccf4f..ed8a17de28a 100644
--- a/games-puzzle/pingus/pingus-.ebuild
+++ b/games-puzzle/pingus/pingus-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake toolchain-funcs flag-o-matic xdg-utils
+inherit cmake toolchain-funcs flag-o-matic xdg
 
 DESCRIPTION="free Lemmings clone"
 HOMEPAGE="http://pingus.gitlab.io/";
@@ -40,11 +40,3 @@ src_prepare() {
cmake_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/

2019-04-13 Thread Pacho Ramos 
commit: 9962009680d0629f53de71ce7314bef5ebd1b8e3
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Apr 13 22:27:34 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Apr 13 22:44:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99620096

games-puzzle/pingus: Drop old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 games-puzzle/pingus/pingus-0.7.6-r1.ebuild | 62 --
 1 file changed, 62 deletions(-)

diff --git a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild 
b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
deleted file mode 100644
index e23d02f4daf..000
--- a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 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="https://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/

2019-04-03 Thread Lars Wendler 
commit: e64f0ba389e94891c5b9b8642edc3b67d341bc73
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Apr  3 16:40:45 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Apr  3 16:43:49 2019 +
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  gentoo.org>

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

diff --git a/games-puzzle/pingus/files/pingus--no_libexec.patch 
b/games-puzzle/pingus/files/pingus--no_libexec.patch
new file mode 100644
index 000..45da29a4226
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus--no_libexec.patch
@@ -0,0 +1,33 @@
+From ef01ebf5401419a0e98dfe32efa9a0bc8564e26f Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+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-.ebuild 
b/games-puzzle/pingus/pingus-.ebuild
new file mode 100644
index 000..54588481980
--- /dev/null
+++ b/games-puzzle/pingus/pingus-.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}" == * ]] ; 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/, games-puzzle/pingus/files/

2019-04-03 Thread Lars Wendler 
commit: 9dbfbec856f624c499c00f56fc5dd332eeac9d8c
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Apr  3 16:09:59 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Apr  3 16:11:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dbfbec8

games-puzzle/pingus: Revbump to use boost_signals2

the used upstream patch replaces long deprecated boost_signals with its
version 2 successor.

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

 .../pingus/files/pingus-0.7.6-boost_signals2.patch | 380 +
 games-puzzle/pingus/pingus-0.7.6-r2.ebuild |  63 
 2 files changed, 443 insertions(+)

diff --git a/games-puzzle/pingus/files/pingus-0.7.6-boost_signals2.patch 
b/games-puzzle/pingus/files/pingus-0.7.6-boost_signals2.patch
new file mode 100644
index 000..df4d4494503
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-boost_signals2.patch
@@ -0,0 +1,380 @@
+From 6b5f2eb72359ce9cece7543eebb02f2c1ac0dcf9 Mon Sep 17 00:00:00 2001
+From: Ingo Ruhnke 
+Date: Sat, 26 Jul 2014 20:49:11 +0200
+Subject: [PATCH] Switched to boost::signals2
+
+---
+ SConscript   |  5 ++---
+ src/editor/button.hpp|  4 ++--
+ src/editor/checkbox.hpp  |  4 ++--
+ src/editor/combobox.hpp  |  4 ++--
+ src/editor/file_list.hpp |  4 ++--
+ src/editor/inputbox.hpp  |  6 +++---
+ src/editor/message_box.hpp   |  2 +-
+ src/editor/object_selector.cpp   |  4 ++--
+ src/editor/viewport.hpp  |  4 ++--
+ src/pingus/components/check_box.hpp  |  4 ++--
+ src/pingus/components/choice_box.hpp |  4 ++--
+ src/pingus/components/slider_box.hpp |  4 ++--
+ src/pingus/config_manager.hpp| 28 ++--
+ src/pingus/screens/option_menu.hpp   |  4 ++--
+ 14 files changed, 40 insertions(+), 41 deletions(-)
+
+diff --git a/SConscript b/SConscript
+index 54b64680d..9caa931b6 100644
+--- a/SConscript
 b/SConscript
+@@ -187,9 +187,8 @@ class Project:
+  
'src/engine/input/xinput/xinput_device.cpp'])
+ 
+ def configure_boost(self):
+-if not self.conf.CheckLibWithHeader('boost_signals', 
'boost/signals.hpp', 'c++'):
+-if not self.conf.CheckLibWithHeader('boost_signals-mt', 
'boost/signals.hpp', 'c++'):
+-self.fatal_error += "  * library 'boost_signals' not found\n"
++if not self.conf.CheckHeader('boost/signals2.hpp', '<>', 'c++'):
++self.fatal_error += "  * library 'boost_signals2' not found\n"
+ 
+ def configure_png(self):
+ if self.conf.CheckMyProgram('pkg-config'):
+diff --git a/src/editor/button.hpp b/src/editor/button.hpp
+index c85d7da9e..d89dfe669 100644
+--- a/src/editor/button.hpp
 b/src/editor/button.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_BUTTON_HPP
+ #define HEADER_PINGUS_EDITOR_BUTTON_HPP
+ 
+-#include 
++#include 
+ 
+ #include "engine/gui/rect_component.hpp"
+ 
+@@ -48,7 +48,7 @@ public:
+   void enable()  { enabled = true; }
+   void disable() { enabled = false; }
+ 
+-  boost::signal on_click;
++  boost::signals2::signal on_click;
+ 
+ private:
+   Button (const Button&);
+diff --git a/src/editor/checkbox.hpp b/src/editor/checkbox.hpp
+index 7c3bc835f..66382d79b 100644
+--- a/src/editor/checkbox.hpp
 b/src/editor/checkbox.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+ #define HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+ 
+-#include 
++#include 
+ 
+ #include "engine/gui/rect_component.hpp"
+ 
+@@ -40,7 +40,7 @@ public:
+   bool is_checked() const { return checked; }
+   void on_primary_button_press(int x, int y);
+ 
+-  boost::signal on_change;
++  boost::signals2::signal on_change;
+  
+ private:
+   Checkbox (const Checkbox&);
+diff --git a/src/editor/combobox.hpp b/src/editor/combobox.hpp
+index 0ca742593..603556bd9 100644
+--- a/src/editor/combobox.hpp
 b/src/editor/combobox.hpp
+@@ -18,7 +18,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_COMBOBOX_HPP
+ #define HEADER_PINGUS_EDITOR_COMBOBOX_HPP
+ 
+-#include 
++#include 
+ 
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -88,7 +88,7 @@ public:
+   
+   void update_layout() {}
+   
+-  boost::signal on_select;
++  boost::signals2::signal on_select;
+ 
+ private:
+   Combobox();
+diff --git a/src/editor/file_list.hpp b/src/editor/file_list.hpp
+index cc4bba2de..85efe6aa0 100644
+--- a/src/editor/file_list.hpp
 b/src/editor/file_list.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_FILE_LIST_HPP
+ #define HEADER_PINGUS_EDITOR_FILE_LIST_HPP
+ 
+-#include 
++#include 
+ 
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -61,7 +61,7 @@ public:
+   bool has_more_next_pages();
+   bool has_more_prev_pages();
+ 
+-  boost::signal on_click;
++  boost::signals2::signal on_click;
+ 
+ private:
+   int it

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

2018-05-11 Thread James Le Cuirot 
commit: 4b8251f0e5f50a2cc44e99d612f069e8522a12ac
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri May 11 12:43:30 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri May 11 20:38:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b8251f0

games-puzzle/pingus: use HTTPS

 games-puzzle/pingus/pingus-0.7.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild 
b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
index 968fa1f3342..e23d02f4daf 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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/";
+HOMEPAGE="https://pingus.seul.org";
 SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2";
 
 LICENSE="GPL-3"

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

2018-04-14 Thread Pacho Ramos 
commit: dd4026eb5d14e5a4ef4fe83866bbef213f7000ed
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Apr 14 21:19:39 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Apr 14 21:38:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4026eb

games-puzzle/pingus: Drop old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 games-puzzle/pingus/pingus-0.7.6.ebuild | 56 -
 1 file changed, 56 deletions(-)

diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild 
b/games-puzzle/pingus/pingus-0.7.6.ebuild
deleted file mode 100644
index f5f3d77af9f..000
--- a/games-puzzle/pingus/pingus-0.7.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils scons-utils toolchain-funcs flag-o-matic games
-
-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
-)
-
-src_prepare() {
-   strip-flags
-   epatch "${PATCHES[@]}"
-}
-
-src_compile() {
-   escons \
-   CXX="$(tc-getCXX)" \
-   CCFLAGS="${CXXFLAGS}" \
-   LINKFLAGS="${LDFLAGS}" \
-   $(use_scons opengl with_opengl)
-}
-
-src_install() {
-   emake install-exec install-data \
-   DESTDIR="${D}" \
-   PREFIX="/usr" \
-   DATADIR="${GAMES_DATADIR}/${PN}" \
-   BINDIR="${GAMES_BINDIR}"
-   doman doc/man/pingus.6
-   doicon data/images/icons/pingus.svg
-   make_desktop_entry ${PN} Pingus
-   dodoc AUTHORS NEWS README TODO
-   prepgamesdirs
-}

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

2017-12-19 Thread Lars Wendler 
commit: fde7e22c94c4c535e5d3a765f396fab5bacdcac9
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Dec 19 14:24:06 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Dec 19 14:24:20 2017 +
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.orig2012-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.orig2012-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 000..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 
+Date: Mon, 30 Jan 2017 15:41:53 +
+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 
+ #include 
++#include 
+ 
+ #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.orig2012-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 000..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_databas

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

2016-08-23 Thread Lars Wendler 
commit: 2d7c75bb39c63bcead7154614999fbdd2da3a538
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug 23 17:20:42 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 23 17:20:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d7c75bb

games-puzzle/pingus: Added a patch to work around Gentoo's crippled dash.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch | 13 +
 games-puzzle/pingus/pingus-0.7.6.ebuild | 12 
 2 files changed, 21 insertions(+), 4 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
new file mode 100644
index 000..ab772d8
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
@@ -0,0 +1,13 @@
+# Work around Gentoo's crippled dash
+
+--- pingus-0.7.6/Makefile
 pingus-0.7.6/Makefile
+@@ -39,7 +39,7 @@
+   install -d "$(DESTDIR)$(BINDIR)"
+ 
+   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"
+   chmod 755 "$(DESTDIR)$(BINDIR)/pingus"
+ 
+ install-data:

diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild 
b/games-puzzle/pingus/pingus-0.7.6.ebuild
index 9183480..49ddbd7 100644
--- a/games-puzzle/pingus/pingus-0.7.6.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,11 +24,15 @@ RDEPEND="media-libs/libsdl[joystick,opengl?,video]
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-noopengl.patch
+   "${FILESDIR}"/${P}-gcc47.patch
+   "${FILESDIR}"/${P}-echo-e.patch
+)
+
 src_prepare() {
strip-flags
-   epatch \
-   "${FILESDIR}"/${P}-noopengl.patch \
-   "${FILESDIR}"/${P}-gcc47.patch
+   epatch "${PATCHES[@]}"
 }
 
 src_compile() {