From 391b5b359a346aff490103da7dddc85047f83830 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 1 Oct 2021 20:54:53 +0100
Subject: gentoo resync : 01.10.2021

---
 games-puzzle/fbg/Manifest                          |  3 +-
 games-puzzle/fbg/fbg-0.9-r2.ebuild                 | 41 -------------------
 games-puzzle/fbg/fbg-0.9-r3.ebuild                 | 47 ++++++++++++++++++++++
 .../fbg/files/fbg-0.9-missing-return.patch         |  8 ++++
 4 files changed, 57 insertions(+), 42 deletions(-)
 delete mode 100644 games-puzzle/fbg/fbg-0.9-r2.ebuild
 create mode 100644 games-puzzle/fbg/fbg-0.9-r3.ebuild
 create mode 100644 games-puzzle/fbg/files/fbg-0.9-missing-return.patch

(limited to 'games-puzzle/fbg')

diff --git a/games-puzzle/fbg/Manifest b/games-puzzle/fbg/Manifest
index 71555cc78700..5dc8643c4542 100644
--- a/games-puzzle/fbg/Manifest
+++ b/games-puzzle/fbg/Manifest
@@ -1,3 +1,4 @@
+AUX fbg-0.9-missing-return.patch 280 BLAKE2B f1c0f5bc3da5a16228f9e1e720b753900c53e0ba6e3491a936380cc07fd45e6946097890dce020182af595a13c24e3fe5ac158e4389629285d8190b21dbee053 SHA512 a699b1f34d844798b9b31fbcbc7fc6b5f05c51e40ebed9249b0100dfa416d1c94fbe26f122f9d24886ca59ff09d0984ea836fee23bc9e244760e9fe04957b68a
 DIST fbg-0.9.tar.gz 1127384 BLAKE2B c732f0bfce5cdf92ed94b75764403f1e64efebdb6be92b900704601922a9a3e9f86de975613778aad9c5685303fc9e31dbd624283cc8ad2964cbf3c9c42b27b6 SHA512 8aede56515da472509068037bd295d7a37f365dd54ea8332c02409e84bf685b76f1733b93b90fa49ca58e9094a4506137c6459d4761a929cfa2e60bb0907a353
-EBUILD fbg-0.9-r2.ebuild 791 BLAKE2B 0eec4a1245d54542666bc46299034668774242b606a9e904d879661b295460b448f03ee9d02c99b15caed692c6b190ace7acfce91a8146b81c448d3abc59b01b SHA512 34ee1ebd58eaccb2dddbe8742c006dd5a6ddf47d8b5dc572cdd7ce0fbdd473313c80fdd1f5856c94d25f434b22cf80909a2d80a1b92ccb250b894d43cb8b96a5
+EBUILD fbg-0.9-r3.ebuild 839 BLAKE2B 1cfcfa8f13f7e3638598e29b4fec8d5345e6301f47baff151c4b262c4b55d1c8e42cad15c006fee9c6909c1fad17ebf40cd88853ec7e5270512808c7cbd3ff48 SHA512 3b93645c5da9a723e1b346ff7de18142d7acb5f561a3b5158a2a19439fa8c5ff6aa738014d60245b96d141b71738263396d810e309e446499c98fcec7a29530b
 MISC metadata.xml 327 BLAKE2B 42ccb827b43cb37d26eb332ad93c476fbcdb5868bee92ca1a97560b7ef822672b71c56a90e568abec6e29aa527a0694bb1a9458cbae492e0e609c6619b9c24f4 SHA512 a1bfea86b82179e648acf357f1505a85ee6c0c8877b8574400d4538989fa2fb0faf60114b7bbaac480b798c7e20ae4bfbda3c804cf7046289cd866597106e3d4
diff --git a/games-puzzle/fbg/fbg-0.9-r2.ebuild b/games-puzzle/fbg/fbg-0.9-r2.ebuild
deleted file mode 100644
index b0c84fa8eeca..000000000000
--- a/games-puzzle/fbg/fbg-0.9-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A Tetris clone written in OpenGL"
-HOMEPAGE="http://fbg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fbg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	virtual/glu
-	dev-games/physfs
-	media-libs/libsdl[opengl,video]
-	media-libs/libmikmod
-	x11-libs/libXt"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/FBGDATADIR=/s:\".*\":\"/usr/share/${PN}\":" \
-		-e '/^datadir=/d' \
-		configure || die
-}
-
-src_configure() {
-	econf --disable-fbglaunch
-}
-
-src_install() {
-	default
-	newicon startfbg/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Falling Block Game" ${PN}
-	rm -rf "${ED}/usr/doc"
-}
diff --git a/games-puzzle/fbg/fbg-0.9-r3.ebuild b/games-puzzle/fbg/fbg-0.9-r3.ebuild
new file mode 100644
index 000000000000..5da0c0508858
--- /dev/null
+++ b/games-puzzle/fbg/fbg-0.9-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Tetris clone written in OpenGL"
+HOMEPAGE="http://fbg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fbg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-games/physfs
+	media-libs/libmikmod
+	media-libs/libsdl[opengl,video]
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-return.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "/FBGDATADIR=/s|=.*|=\"${EPREFIX}/usr/share/${PN}\"|" \
+		-e '/^datadir=/d' \
+		-i configure || die
+}
+
+src_configure() {
+	econf --disable-fbglaunch --without-x
+}
+
+src_install() {
+	default
+
+	newicon startfbg/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Falling Block Game"
+
+	rm -r "${ED}"/usr/doc || die
+}
diff --git a/games-puzzle/fbg/files/fbg-0.9-missing-return.patch b/games-puzzle/fbg/files/fbg-0.9-missing-return.patch
new file mode 100644
index 000000000000..86b0b551957f
--- /dev/null
+++ b/games-puzzle/fbg/files/fbg-0.9-missing-return.patch
@@ -0,0 +1,8 @@
+Lack of return leads to segmentation fault on startup.
+https://bugs.gentoo.org/815259
+--- a/src/glTGAImage.cc
++++ b/src/glTGAImage.cc
+@@ -180,2 +180,3 @@
+ 	glTexImage2D(GL_TEXTURE_2D, 0, type, getWidth(), getHeight(), 0, type, GL_UNSIGNED_BYTE, getImageData());
++	return true;
+ }
-- 
cgit v1.2.3