[gentoo-commits] repo/gentoo:master commit in: games-arcade/kobodeluxe/, games-arcade/kobodeluxe/files/

[David Seifert]

commit:     e624893590dfecf6979b4cf5a4b6a5047424ea5c
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Fri Dec 25 15:19:10 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 15:19:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6248935

games-arcade/kobodeluxe: fix build with clang, bump EAPI

Closes: https://bugs.gentoo.org/739080
(Portage version: 3.0.9/hg/Linux x86_64, unsigned Manifest commit)
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../kobodeluxe/files/kobodeluxe-0.5.1-clang.patch  | 22 ++++++++
 games-arcade/kobodeluxe/kobodeluxe-0.5.1-r2.ebuild | 59 ++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-clang.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-clang.patch
new file mode 100644
index 00000000000..7732b6e147d
--- /dev/null
+++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-clang.patch
@@ -0,0 +1,22 @@
+--- a/filemap.cpp
++++ b/filemap.cpp
+@@ -851,7 +851,7 @@
+ 	while(k)
+ 	{
+ 		if(strcmp(k->key, key) == 0 || all)
+-			fprintf(f, "%s"FM_DEREF_TOKEN" --> \"%s\"\n", k->key, k->path);
++			fprintf(f, "%s" FM_DEREF_TOKEN " --> \"%s\"\n", k->key, k->path);
+ 		k = k->next;
+ 	}
+ }
+--- a/prefs.cpp
++++ b/prefs.cpp
+@@ -30,7 +30,7 @@
+ void prefs_t::init()
+ {
+ 	comment("--------------------------------------------");
+-	comment(" Kobo Deluxe "VERSION" Configuration File");
++	comment(" Kobo Deluxe " VERSION " Configuration File");
+ 	comment("--------------------------------------------");
+ 	comment(" Switches - [no]<switch>");
+ 	comment(" Values - <key> [<value>|\"<string>\"]");

diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r2.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r2.ebuild
new file mode 100644
index 00000000000..b813ddc2a1b
--- /dev/null
+++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop
+
+MY_P="KoboDeluxe-${PV/_/}"
+DESCRIPTION="An SDL port of xkobo, a addictive space shoot-em-up"
+HOMEPAGE="http://www.olofson.net/kobodl/"
+SRC_URI="http://www.olofson.net/kobodl/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
+IUSE="opengl"
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-image[png]
+	opengl? ( virtual/opengl )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc29.patch
+	"${FILESDIR}"/${P}-glibc2.10.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unpack ./icons.tar.gz
+}
+
+src_prepare() {
+	default
+	# Fix paths
+	sed -i \
+		-e 's:\$(datadir)/kobo-deluxe:$(datadir)/kobodeluxe:' \
+		-e 's:\$(sharedstatedir)/kobo-deluxe/scores:$(localstatedir)/kobodeluxe:' \
+		configure || die "sed configure failed"
+	sed -i \
+		-e 's:kobo-deluxe:kobodeluxe:' \
+		data/gfx/Makefile.in \
+		data/sfx/Makefile.in || die "sed data/Makefile.in failed"
+}
+
+src_configure() {
+	econf $(use_enable opengl)
+}
+
+src_install() {
+	default
+	newicon icons/KDE/icons/32x32/kobodl.png ${PN}.png
+	make_desktop_entry kobodl "Kobo Deluxe"
+	keepdir /var/lib/${PN}
+}