Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/gnome-hearts/files/, games-board/gnome-hearts/, profiles/
Date: Mon, 26 Oct 2020 07:39:50
Message-Id: 1603697945.1d203150b80477ceeebf3c65fd1a4d303fc5189e.mgorny@gentoo
1 commit: 1d203150b80477ceeebf3c65fd1a4d303fc5189e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 07:37:13 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 07:39:05 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d203150
7
8 games-board/gnome-hearts: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735360
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 games-board/gnome-hearts/Manifest | 1 -
14 .../files/gnome-hearts-0.3.1-drop-libgnomeui.patch | 64 ----------------------
15 .../gnome-hearts/gnome-hearts-0.3.1-r2.ebuild | 45 ---------------
16 games-board/gnome-hearts/metadata.xml | 12 ----
17 profiles/package.mask | 1 -
18 5 files changed, 123 deletions(-)
19
20 diff --git a/games-board/gnome-hearts/Manifest b/games-board/gnome-hearts/Manifest
21 deleted file mode 100644
22 index 6bbb4fce33b..00000000000
23 --- a/games-board/gnome-hearts/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST gnome-hearts-0.3.1.tar.gz 637916 BLAKE2B 6aa4a0c1d0d91316a896cd144e23b9a46066cd2d2c2a69d1fa1eb34094b5742810c5484c5950322a9c5b066ae72c974f9c4f0642baa7986df637654717669114 SHA512 5528c92bba80cc97ce1f51e3b2652b5d6b30c0e90e7a8f023dcdf5c3420b2d1fbab29fc3d974884d8cb351a44b8b97c05242f26b70d5e1d02d593a17452ad19f
27
28 diff --git a/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch b/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch
29 deleted file mode 100644
30 index 21c4e7b0896..00000000000
31 --- a/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch
32 +++ /dev/null
33 @@ -1,64 +0,0 @@
34 -diff -Naur gnome-hearts-0.3.1.orig/configure.in gnome-hearts-0.3.1/configure.in
35 ---- gnome-hearts-0.3.1.orig/configure.in 2013-06-09 15:05:11.000000000 +0200
36 -+++ gnome-hearts-0.3.1/configure.in 2017-01-20 23:20:35.677689797 +0100
37 -@@ -23,7 +23,7 @@
38 - fi
39 -
40 - # Check for libraries. gmodule is required to make sure --export-dynamic is used and glade works
41 --PKG_CHECK_MODULES(GNOME_HEARTS, [libgnomeui-2.0 gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
42 -+PKG_CHECK_MODULES(GNOME_HEARTS, [gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
43 - AC_SUBST(GNOME_HEARTS_CFLAGS)
44 - AC_SUBST(GNOME_HEARTS_LIBS)
45 -
46 -diff -Naur gnome-hearts-0.3.1.orig/src/events.c gnome-hearts-0.3.1/src/events.c
47 ---- gnome-hearts-0.3.1.orig/src/events.c 2013-06-09 15:01:08.000000000 +0200
48 -+++ gnome-hearts-0.3.1/src/events.c 2017-01-20 23:35:17.428651148 +0100
49 -@@ -71,13 +71,13 @@
50 - /* Open the help file */
51 - void on_help(GtkWidget *widget, gpointer data)
52 - {
53 -- gnome_help_display("gnome-hearts.xml", NULL, NULL);
54 -+ gtk_show_uri(NULL, "ghelp:gnome-hearts", GDK_CURRENT_TIME, NULL);
55 - }
56 -
57 - /* Open the preferences help file */
58 - void on_preferences_help(GtkWidget *widget, gpointer data)
59 - {
60 -- gnome_help_display("gnome-hearts.xml", "hearts-prefs", NULL);
61 -+ gtk_show_uri(NULL, "ghelp:gnome-hearts?hearts-prefs", GDK_CURRENT_TIME, NULL);
62 - }
63 -
64 - /* About menu item */
65 -diff -Naur gnome-hearts-0.3.1.orig/src/hearts.c gnome-hearts-0.3.1/src/hearts.c
66 ---- gnome-hearts-0.3.1.orig/src/hearts.c 2013-06-09 15:01:08.000000000 +0200
67 -+++ gnome-hearts-0.3.1/src/hearts.c 2017-01-20 23:20:21.447210208 +0100
68 -@@ -534,15 +534,11 @@
69 - setlocale(LC_ALL, "");
70 - #endif
71 -
72 -- /* Initialize GNOME */
73 -+ /* Initialize GTK+ */
74 - GOptionContext *option_context = g_option_context_new(_("- Play a game of hearts"));
75 - g_option_context_add_main_entries(option_context, option_entries, GETTEXT_PACKAGE);
76 -
77 -- gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
78 -- argc, argv,
79 -- GNOME_PARAM_GOPTION_CONTEXT, option_context,
80 -- GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
81 -- GNOME_PARAM_NONE);
82 -+ gtk_init(&argc, &argv);
83 -
84 - /* init the game's global variables */
85 - game_score_labels = NULL;
86 -diff -Naur gnome-hearts-0.3.1.orig/src/hearts.h gnome-hearts-0.3.1/src/hearts.h
87 ---- gnome-hearts-0.3.1.orig/src/hearts.h 2013-06-09 15:01:08.000000000 +0200
88 -+++ gnome-hearts-0.3.1/src/hearts.h 2017-01-20 23:22:33.691604109 +0100
89 -@@ -26,7 +26,7 @@
90 - /* headers */
91 - #include <glib/gi18n.h>
92 - #include <dirent.h>
93 --#include <gnome.h>
94 -+#include <gtk/gtk.h>
95 - #include <glade/glade.h>
96 - #include "cards.h"
97 - #include "cfg.h"
98
99 diff --git a/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild b/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
100 deleted file mode 100644
101 index 3152898e365..00000000000
102 --- a/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
103 +++ /dev/null
104 @@ -1,45 +0,0 @@
105 -# Copyright 1999-2020 Gentoo Authors
106 -# Distributed under the terms of the GNU General Public License v2
107 -
108 -EAPI=6
109 -GNOME2_EAUTORECONF="yes"
110 -PYTHON_COMPAT=( python2_7 )
111 -
112 -inherit gnome2 python-single-r1
113 -
114 -DESCRIPTION="A clone of classic hearts card game"
115 -HOMEPAGE="https://www.jejik.com/gnome-hearts/"
116 -SRC_URI="https://www.jejik.com/files/${PN}/${P}.tar.gz"
117 -
118 -LICENSE="GPL-2+ FDL-1.2"
119 -SLOT="0"
120 -KEYWORDS="~amd64 ~x86"
121 -
122 -IUSE=""
123 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
124 -
125 -RDEPEND="${PYTHON_DEPS}
126 - x11-libs/gtk+:2
127 - >=gnome-base/libglade-2
128 -"
129 -DEPEND="${RDEPEND}
130 - app-text/rarian
131 - dev-util/intltool
132 - virtual/pkgconfig
133 -"
134 -
135 -src_prepare() {
136 - # make src_test work
137 - echo gnome-hearts.desktop.in >> po/POTFILES.skip
138 -
139 - sed -i \
140 - -e '/No name/d' \
141 - -e '/^Icon/s/.png//' \
142 - -e '/^Encoding/d' \
143 - gnome-hearts.desktop.in || die
144 -
145 - eapply "${FILESDIR}"/${P}-drop-libgnomeui.patch
146 -
147 - mv configure.in configure.ac || die
148 - gnome2_src_prepare
149 -}
150
151 diff --git a/games-board/gnome-hearts/metadata.xml b/games-board/gnome-hearts/metadata.xml
152 deleted file mode 100644
153 index ea35640ff88..00000000000
154 --- a/games-board/gnome-hearts/metadata.xml
155 +++ /dev/null
156 @@ -1,12 +0,0 @@
157 -<?xml version="1.0" encoding="UTF-8"?>
158 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
159 -<pkgmetadata>
160 -<maintainer type="project">
161 - <email>gnome@g.o</email>
162 - <name>Gentoo GNOME Desktop</name>
163 -</maintainer>
164 -<maintainer type="project">
165 - <email>games@g.o</email>
166 - <name>Gentoo Games Project</name>
167 -</maintainer>
168 -</pkgmetadata>
169
170 diff --git a/profiles/package.mask b/profiles/package.mask
171 index 93aecca0920..7aa3fcaadbe 100644
172 --- a/profiles/package.mask
173 +++ b/profiles/package.mask
174 @@ -239,7 +239,6 @@ net-voip/telepathy-haze
175 # you actually port them to Python 3.
176 # Removal in 30 days. Please find relevant bugs on tracker bug #694800.
177 games-arcade/diameter
178 -games-board/gnome-hearts
179
180 # Michał Górny <mgorny@g.o> (2020-09-25)
181 # PyPy3.7 alpha. Known to break a few packages. Masked until it