commit: b68ba6db7ffa19da31fcd005f37cc01139c6fb6d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jul 18 13:06:56 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jul 18 13:09:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b68ba6db
games-puzzle/gtetrinet: Remove last-rited package Closes: https://bugs.gentoo.org/726798 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-puzzle/gtetrinet/Manifest | 2 - .../files/gtetrinet-0.7.11-desktopfile.patch | 28 ----- .../files/gtetrinet-0.7.11-format-security.patch | 16 --- .../gtetrinet/files/gtetrinet-0.7.11-noesd.patch | 130 --------------------- games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild | 58 --------- games-puzzle/gtetrinet/metadata.xml | 27 ----- profiles/package.mask | 2 - 7 files changed, 263 deletions(-) diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest deleted file mode 100644 index f8b9797f69d..00000000000 --- a/games-puzzle/gtetrinet/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gtetrinet-0.7.11.tar.bz2 416744 BLAKE2B f3bb72b307066e1af41de5c1483fa5b9c88377a3f70924520bc1e36206ad7b75c233d5fb10c0398aac4ed228d8cac6f26a1acaaf97c27858f1c24e4d0aebc4aa SHA512 5de7df7647ed9f7c0b6aba4eac976c625b7632eb5ab8034b11ef09aeb4582f90b4f9fc1791dc5371e1067d59c90b792a70276c69b75ebd6dc8c74c96c47c7130 -DIST gtetrinet-gentoo-theme-0.1.tbz2 88240 BLAKE2B 60ead98512ddd812cf1f95f041479f9dad9e7e0f3a55931779382b95fc7aada11498b6517cbd425547d3d46281bb6ec982325b0ad361ef339daa321d45a6ffe8 SHA512 6834ed4d70d94d94c201c5fa76d670ed21e4451ad18b1f41292c69e8ba18f56198898bb9d0c90343e28fa05a53e2e92536aa07fad747d4321d2e67c638d7ab8d diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch deleted file mode 100644 index 9bf7c2e506d..00000000000 --- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Julian Ospald <[email protected]> -Date: Fri Nov 30 20:02:03 UTC 2012 -Subject: desktop file - - fix desktop file according to fd.o spec - ---- gtetrinet.desktop -+++ gtetrinet.desktop -@@ -1,5 +1,4 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=GTetrinet - Name[am]=GTetrinet - Name[bg]=GTetrinet -@@ -99,11 +98,11 @@ - Comment[zh_HK]=Tetrinet 的 GNOME 客戶端程式 - Comment[zh_TW]=Tetrinet 的 GNOME 客戶端程式 - Exec=gtetrinet --Icon=gtetrinet.png -+Icon=gtetrinet - StartupNotify=true - Terminal=false - Type=Application --Categories=GNOME;Application;Game;BlocksGame; -+Categories=GNOME;Game;BlocksGame; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=gtetrinet - X-GNOME-Bugzilla-Component=general diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch deleted file mode 100644 index 59389a18f7c..00000000000 --- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Jordi Mallach <[email protected]> -Description: Fix build when using -Werror=format-security, now default - on Debian. -Status: committed-upstream - ---- gtetrinet-0.7.11.orig/src/tetrinet.c -+++ gtetrinet-0.7.11/src/tetrinet.c -@@ -232,7 +232,7 @@ - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, -- buf); -+ "%s", buf); - gtk_dialog_run (GTK_DIALOG(dialog)); - gtk_widget_destroy (dialog); - g_free (data_utf8); diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch deleted file mode 100644 index b4975840129..00000000000 --- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- gtetrinet-0.7.11/configure.in~ 2006-11-15 17:02:36.000000000 +0000 -+++ gtetrinet-0.7.11/configure.in 2011-03-06 15:39:10.000000000 +0000 -@@ -30,7 +30,6 @@ - LIBGTK_REQUIRED=2.6.0 - LIBGNOME_REQUIRED=2.0.0 - LIBGNOMEUI_REQUIRED=2.0.0 --LIBESD_REQUIRED=0.2.36 - - dnl ***************************************** - dnl libgnome, libgnomeui needed for all utils -@@ -40,21 +39,21 @@ - AC_SUBST(GTET_CFLAGS) - AC_SUBST(GTET_LIBS) - --dnl Check for libesd --if pkg-config --exists esound ; then -- have_esound=yes -+dnl Check for libcanberra -+if pkg-config --exists libcanberra ; then -+ have_libcanberra=yes - else -- have_esound=no -+ have_libcanberra=no - fi - --if test "x$have_esound" = "xyes"; then --AC_DEFINE(HAVE_ESD, 1, [Define this to enable EsounD support.]) --PKG_CHECK_MODULES(ESOUND, esound >= $LIBESD_REQUIRED) --AC_SUBST(ESOUND_CFLAGS) --AC_SUBST(ESOUND_LIBS) -+if test "x$have_libcanberra" = "xyes"; then -+AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define this to enable libcanberra support.]) -+PKG_CHECK_MODULES(LIBCANBERRA, libcanberra) -+AC_SUBST(LIBCANBERRA_CFLAGS) -+AC_SUBST(LIBCANBERRA_LIBS) - fi - --AM_CONDITIONAL(HAVE_ESOUND, test "x$have_esound" = "xyes") -+AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xyes") - - AC_HEADER_STDC - AC_HEADER_SYS_WAIT ---- gtetrinet-0.7.11/config.h.in~ 2006-11-15 17:03:53.000000000 +0000 -+++ gtetrinet-0.7.11/config.h.in 2011-03-06 15:39:31.000000000 +0000 -@@ -15,8 +15,8 @@ - /* Define to 1 if you have the `dcgettext' function. */ - #undef HAVE_DCGETTEXT - --/* Define this to enable EsounD support. */ --#undef HAVE_ESD -+/* Define this to enable libcanberra support. */ -+#undef HAVE_LIBCANBERRA - - /* Define if the GNU gettext() function is already present or preinstalled. */ - #undef HAVE_GETTEXT ---- gtetrinet-0.7.11/src/dialogs.c~ 2006-11-03 12:49:49.000000000 +0000 -+++ gtetrinet-0.7.11/src/dialogs.c 2011-03-06 15:40:45.000000000 +0000 -@@ -1054,7 +1054,7 @@ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(soundcheck), soundenable); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(midicheck), midienable); - --#ifdef HAVE_ESD -+#ifdef HAVE_LIBCANBERRA - if (midienable) prefdialog_midion (); - else prefdialog_midioff (); - if (soundenable) prefdialog_soundon (); ---- gtetrinet-0.7.11/src/sound.c~ 2005-03-18 21:19:18.000000000 +0000 -+++ gtetrinet-0.7.11/src/sound.c 2011-03-06 15:47:24.000000000 +0000 -@@ -36,33 +36,36 @@ - char midifile[1024]; - char midicmd[1024]; - --#ifdef HAVE_ESD -+#ifdef HAVE_LIBCANBERRA - --#include <esd.h> --#include <libgnome/gnome-sound.h> -+#include <canberra.h> - --static int soundsamples[S_NUM]; - static int midipid = 0; -+static ca_context *ctx = 0; - - void sound_cache (void) - { - int i; - if (!soundenable) return; -+ if (!ctx) -+ ca_context_create(&ctx); -+ if (ctx) { - for (i = 0; i < S_NUM; i ++) { -- if (soundsamples[i]) -- esd_sample_free (gnome_sound_connection_get (), soundsamples[i]); - if (soundfiles[i][0]) -- soundsamples[i] = gnome_sound_sample_load (soundfiles[i], soundfiles[i]); -- else -- soundsamples[i] = 0; -+ ca_context_cache(ctx, -+ CA_PROP_MEDIA_FILENAME, soundfiles[i], -+ NULL); -+ } - } - } - - void sound_playsound (int id) - { -- if (!soundenable) return; -- if (soundsamples[id] > 0) -- esd_sample_play (gnome_sound_connection_get (), soundsamples[id]); -+ if (!soundenable || !ctx) return; -+ if (soundfiles[id][0]) -+ ca_context_play(ctx, 0, -+ CA_PROP_MEDIA_FILENAME, soundfiles[id], -+ NULL); - } - - void sound_playmidi (char *file) ---- gtetrinet-0.7.11/src/Makefile.am~ 2006-11-03 16:20:08.000000000 +0000 -+++ gtetrinet-0.7.11/src/Makefile.am 2011-03-06 15:57:32.000000000 +0000 -@@ -7,8 +7,8 @@ - -DGTETPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" \ - $(GTET_CFLAGS) - --if HAVE_ESOUND --LDADD = $(GTET_LIBS) $(ESOUND_LIBS) -+if HAVE_LIBCANBERRA -+LDADD = $(GTET_LIBS) $(LIBCANBERRA_LIBS) - else - LDADD = $(GTET_LIBS) - endif diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild deleted file mode 100644 index 44052954303..00000000000 --- a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils gnome2 - -DESCRIPTION="Tetrinet Clone for GNOME" -HOMEPAGE="http://gtetrinet.sourceforge.net/"; -SRC_URI="${SRC_URI} - mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls ipv6" - -RDEPEND=" - dev-libs/libxml2 - media-libs/libcanberra - >=gnome-base/gconf-2 - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-noesd.patch - epatch "${FILESDIR}"/${P}-desktopfile.patch - epatch "${FILESDIR}"/${P}-format-security.patch - sed -i \ - -e "/^pkgdatadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \ - src/Makefile.in themes/*/Makefile.in || die - sed -i \ - -e '/^gamesdir/s:=.*:=@bindir@:' \ - src/Makefile.am || die - - rm -rf "${WORKDIR}"/gentoo/.xvpics || die # Remove cruft - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_enable ipv6) -} - -src_install() { - gnome2_src_install - mv "${WORKDIR}"/gentoo "${ED}/usr/share/${PN}/themes/" || die -} diff --git a/games-puzzle/gtetrinet/metadata.xml b/games-puzzle/gtetrinet/metadata.xml deleted file mode 100644 index a29c0a42dfe..00000000000 --- a/games-puzzle/gtetrinet/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Games Project</name> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <longdescription> -GTetrinet is a client program for the popular Tetrinet game, a -multiplayer tetris game that is played over the internet. - -Gee, Tetris? Whats that? Yeah, yeah, so it's been -done 2 billion times before (give or take a few bil), -but this is different! Yes, all you tetris addicts -out there be prepared for even MORE excitement.. -internet tetris! Now you can play your five best -buddies in one of the most well known games in -existence! - </longdescription> - <upstream> - <remote-id type="sourceforge">gtetrinet</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 57ba12bb0d2..4b1e63d6ac9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -433,10 +433,8 @@ dev-tex/feynmf # Andreas Sturmlechner <[email protected]> (2020-06-18) # Games depending on dead gnome-base/libgnomeui. # games-board/gnono: Bug #726788, last release 2007, abandoned upstream. -# games-puzzle/gtetrinet: Bug #726798 last release 2006, abandoned upstream. # Masked for removal in 30 days. games-board/gnono -games-puzzle/gtetrinet # Hans de Graaff <[email protected]> (2020-06-14) # Ruby 2.4 is no longer supported by upstream and no longer gets
