[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbubble/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbubble/

[Pacho Ramos]

commit:     f0e41416313f320996feaf8cfeb2b320408e16f8
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 17:54:03 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 18:29:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e41416

games-arcade/xbubble: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-arcade/xbubble/xbubble-0.5.8.ebuild | 47 -------------------------------
 1 file changed, 47 deletions(-)

diff --git a/games-arcade/xbubble/xbubble-0.5.8.ebuild b/games-arcade/xbubble/xbubble-0.5.8.ebuild
deleted file mode 100644
index b884d4631f1..00000000000
--- a/games-arcade/xbubble/xbubble-0.5.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="a Puzzle Bobble clone similar to Frozen-Bubble"
-HOMEPAGE="http://www.nongnu.org/xbubble/"
-SRC_URI="http://www.ibiblio.org/pub/mirrors/gnu/ftp/savannah/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	media-libs/libpng:0
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-DOCS=( AUTHORS ChangeLog NEWS NetworkProtocol README TODO )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-xpaths.patch \
-		"${FILESDIR}"/${P}-locale.patch \
-		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}-png15.patch
-	sed -i \
-		-e '/^AM_CFLAGS/d' \
-		src/Makefile.in || die
-	sed -i \
-		-e '/^localedir/s:=.*:=/usr/share/locale:' \
-		configure po/Makefile.in.in || die
-}
-
-src_configure() {
-	egamesconf $(use_enable nls)
-}
-
-src_install() {
-	default
-	newicon data/themes/fancy/Bubble_black_DEAD_01.png ${PN}.png
-	make_desktop_entry ${PN} XBubble
-	prepgamesdirs
-}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/xbubble/

[Sam James]

commit:     ca226b161a18e6bc3ad8af24d2ac2805e2f9aac5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 14:51:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 15:45:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca226b16

games-arcade/xbubble: EAPI 8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ble-0.5.8-r1.ebuild => xbubble-0.5.8-r2.ebuild} | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild b/games-arcade/xbubble/xbubble-0.5.8-r2.ebuild
similarity index 75%
rename from games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
rename to games-arcade/xbubble/xbubble-0.5.8-r2.ebuild
index 67c8f575299f..812a69873e32 100644
--- a/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
+++ b/games-arcade/xbubble/xbubble-0.5.8-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit desktop
 
 DESCRIPTION="A Puzzle Bobble clone similar to Frozen-Bubble"
@@ -16,22 +17,24 @@ IUSE="nls"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXt
-	media-libs/libpng:0=
+	media-libs/libpng:=
 	nls? ( virtual/libintl )
 "
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 DOCS=( AUTHORS ChangeLog NEWS NetworkProtocol README TODO )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-xpaths.patch
+	"${FILESDIR}"/${P}-locale.patch
+	"${FILESDIR}"/${P}-libpng14.patch
+	"${FILESDIR}"/${P}-png15.patch
+)
+
 src_prepare() {
 	default
-	eapply \
-		"${FILESDIR}"/${P}-xpaths.patch \
-		"${FILESDIR}"/${P}-locale.patch \
-		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}-png15.patch
+
 	sed -i \
 		-e '/^AM_CFLAGS/d' \
 		src/Makefile.in || die
@@ -45,6 +48,7 @@ src_configure() {
 }
 
 src_install() {
+
 	default
 	newicon data/themes/fancy/Bubble_black_DEAD_01.png ${PN}.png
 	make_desktop_entry ${PN} XBubble