[gentoo-commits] repo/gentoo:master commit in: profiles/, games-simulation/cannonsmash/, games-simulation/cannonsmash/files/

[gentoo-commits] repo/gentoo:master commit in: profiles/, games-simulation/cannonsmash/, games-simulation/cannonsmash/files/

[Arthur Zamarin]

commit:     2a67d17a0fbe2a19d8598ea75d2eb3a9a1be2db8
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 17:45:09 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 17:45:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a67d17a

games-simulation/cannonsmash: treeclean

Closes: https://bugs.gentoo.org/936299 (pkgremoved)
Closes: https://bugs.gentoo.org/899018 (pkgremoved)
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 games-simulation/cannonsmash/Manifest              |  2 -
 .../cannonsmash/cannonsmash-0.6.6-r1.ebuild        | 71 ----------------------
 .../files/cannonsmash-0.6.6-flags.patch            | 21 -------
 .../files/cannonsmash-0.6.6-gcc41.patch            | 22 -------
 .../files/cannonsmash-0.6.6-sizeof-cast.patch      | 11 ----
 .../files/cannonsmash-0.6.6-x-inc.patch            | 18 ------
 games-simulation/cannonsmash/metadata.xml          | 11 ----
 profiles/package.mask                              |  1 -
 8 files changed, 157 deletions(-)

diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest
deleted file mode 100644
index 290f892e0618..000000000000
--- a/games-simulation/cannonsmash/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST csmash-0.6.6.tar.gz 1989943 BLAKE2B 723b7accd9a899f6d80df07573f8583684606c6b5bf8f11753902f4db196a9a2738cd11899e0a3b4e5637b04553173d75701edbed6e2d800b7b18edb82b2a10f SHA512 e8406eb17adf6c6cc4454b7d0a432ad1b071e1f72d9867fd46e458ade2d1dc1e927a7f2a336c80988b97051b9d188c3027dd8207f89f7e1fa60e1d0a6a5e8916
-DIST danslatristesse2-48.ogg 1070787 BLAKE2B 91bb5b552a45349d6b34d459f2d5071498b6def76c9b7e7ce1538c29af762698708d4ad6fe780e087f14b6ca42dad258c8ed2a7cd368027a5080aab52d02575a SHA512 5cbc457d511bdc736f3b359a8ddd3a514bd0d14418f2dbd68409394baadfcd9fd7630b228e4e9654b14b513e158e9a46b67bc58c5c04bfe382ee6e624dd16834

diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild
deleted file mode 100644
index 69ca215e63a6..000000000000
--- a/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_OGG=danslatristesse2-48.ogg
-DESCRIPTION="3D tabletennis game"
-HOMEPAGE="http://cannonsmash.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/csmash-${PV}.tar.gz
-	vorbis? ( http://nan.p.utmc.or.jp/${MY_OGG} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vorbis nls"
-
-RDEPEND="
-	virtual/opengl
-	virtual/glu
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer[vorbis?]
-	media-libs/sdl-image[jpeg,png]
-	x11-libs/gtk+:2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/csmash-${PV}"
-
-src_unpack() {
-	unpack csmash-${PV}.tar.gz
-}
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-x-inc.patch \
-		"${FILESDIR}"/${P}-sizeof-cast.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-flags.patch
-	if use vorbis ; then
-		sed -i \
-			-e "s:${MY_OGG}:/usr/share/csmash/games/${MY_OGG}:" ttinc.h \
-			|| die "sed failed"
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--datadir="/usr/share"
-}
-
-src_compile() {
-	emake \
-		localedir="/usr/share"
-}
-
-src_install() {
-	default
-	if use vorbis ; then
-		insinto /usr/share/games/csmash
-		doins "${DISTDIR}"/${MY_OGG}
-	fi
-	newicon win32/orange.ico ${PN}.ico
-	make_desktop_entry csmash "Cannon Smash" /usr/share/pixmaps/${PN}.ico
-}

diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
deleted file mode 100644
index c7b3b561d2d1..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.old	2010-10-18 15:05:02.000000000 +0200
-+++ b/configure	2010-10-18 15:05:31.000000000 +0200
-@@ -5516,12 +5516,12 @@
- 
- 
- if test "x$x_includes" != "x"; then
--  CFLAGS="-I $x_includes"
--else
--  CFLAGS=""
--fi
--LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
--CXXFLAGS="$CFLAGS -Wall"
-+  CFLAGS="${CFLAGS} -I $x_includes"
-+else
-+  CFLAGS="${CFLAGS}"
-+fi
-+LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir"
-+CXXFLAGS="${CXXFLAGS} -Wall"
- 
- 
- echo "$as_me:$LINENO: checking for main in -lXmu" >&5

diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
deleted file mode 100644
index 6602c2f09304..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/BallView.h.old	2006-04-11 00:10:37.000000000 +0200
-+++ b/BallView.h	2006-04-11 00:10:53.000000000 +0200
-@@ -32,7 +32,7 @@
- 
-   static GLuint m_number[10];
- private:
--  void BallView::DrawTargetCircle();
-+  void DrawTargetCircle();
-   GLUquadricObj *m_quad;
- 
-   void DrawBall();
---- a/matrix.old	2006-04-11 00:13:18.000000000 +0200
-+++ b/matrix	2006-04-11 00:19:34.000000000 +0200
-@@ -42,7 +42,7 @@
- 
- /* __BEGIN__BEGIN__ */
- //__NAMESPACE_BEGIN(ese);
--#if (!defined __GNUG__) || (__GNUC__ == 3)
-+#if (!defined __GNUG__) || (__GNUC__ >= 3)
- template<typename T>
- void swap(T& a, T& b)
- {

diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
deleted file mode 100644
index ead10c90400b..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Don't typecast otherwise C++ will fail to match on some arches.
-
-http://bugs.gentoo.org/84187
-
---- a/loadparts.cpp
-+++ b/loadparts.cpp
-@@ -247,3 +247,3 @@
-             // concat next line(s)
--	    int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
-+	    int bufsize = clamp((size_t)0, sizeof(line)-l, sizeof(line)-1);
- 	    fgets(&line[l-2], bufsize, fp);

diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
deleted file mode 100644
index e56b51e0b92a..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch by Jason Bucata.
-http://bugs.gentoo.org/84187
-
---- a/configure
-+++ b/configure
-@@ -5515,7 +5515,11 @@
- fi
- 
- 
--CFLAGS="-I $x_includes"
-+if test "x$x_includes" != "x"; then
-+  CFLAGS="-I $x_includes"
-+else
-+  CFLAGS=""
-+fi
- LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
- CXXFLAGS="$CFLAGS -Wall"
- 

diff --git a/games-simulation/cannonsmash/metadata.xml b/games-simulation/cannonsmash/metadata.xml
deleted file mode 100644
index adbc0279ac0e..000000000000
--- a/games-simulation/cannonsmash/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">cannonsmash</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 70e4b4a2a824..dccc7722fe49 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -204,7 +204,6 @@ games-puzzle/color-lines
 games-puzzle/hangman
 games-puzzle/scramble
 games-puzzle/zaz
-games-simulation/cannonsmash
 
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2024-07-07)
 # New major ffmpeg version. Tracker bug #928905.