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 <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2021-06-12 18:04:19 -04:00
parent 135b269e74
commit 15ac2d2b84
2 changed files with 21 additions and 65 deletions
@@ -1,33 +0,0 @@
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
+21 -32
View File
@@ -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}" == *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"
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"