From: Michał Górny Date: Fri, 21 Feb 2020 20:24:11 +0000 (+0100) Subject: games-strategy/gwp: Remove last-rited pkg X-Git-Url: http://git.tremily.us/?p=gentoo.git;a=commitdiff_plain;h=3a12f3deba4dca914be10dda07d28e69317bc4ef games-strategy/gwp: Remove last-rited pkg Signed-off-by: Michał Górny --- diff --git a/games-strategy/gwp/Manifest b/games-strategy/gwp/Manifest deleted file mode 100644 index cb89feb852e8..000000000000 --- a/games-strategy/gwp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gwp-0.4.0.tar.gz 2294453 BLAKE2B 75a688a00b3411c577e6eaae500d15963efb1c96edd82a50863239225fba2d653b52becda8ae71dbe5b88910382d1c64456fc13899e559d3aefefb6bed1e7da5 SHA512 dcb23bb49929bc01129ab5f02b56edb7f775feb0c37bd7613277af8aa0f4b47667f95413725f74a2b83b60159555a50fcabdc8736094aad0684b03cd150b4957 diff --git a/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch b/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch deleted file mode 100644 index 1458b7ba1dfd..000000000000 --- a/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- src/starchart.c -+++ src/starchart.c -@@ -3187,10 +3187,16 @@ - /** - * Initializes starchart constellations. - */ -+static GSList *planets; -+ -+static void add_item (gpointer key, gpointer value, gpointer user_data) { -+ /* GSList *p_list = (GSList *)user_data; */ -+ planets = g_slist_append (planets, value); -+} -+ - static void - init_starchart_constellations (void) - { -- GSList *planets = NULL; - GSList *ppq[TOTAL_QUADS]; - GSList *list_nearby = NULL; - GwpPlanet *planet_a, *planet_b; -@@ -3199,10 +3205,6 @@ - gdouble wx, wy; - gdouble ax, ay, bx, by, zoom; - -- static void add_item (gpointer key, gpointer value, gpointer user_data) { -- /* GSList *p_list = (GSList *)user_data; */ -- planets = g_slist_append (planets, value); -- } - - g_hash_table_foreach (planet_list, (GHFunc)add_item, NULL); - ---- src/vcr.c -+++ src/vcr.c -@@ -2687,12 +2687,29 @@ - return( retval ); - } - -+static gchar *name; -+ -+static void foreach_func( gpointer key, gpointer value, gpointer user_data ) -+{ -+ GwpShip *ship = GWP_SHIP( value ); -+ GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) ); -+ gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist"); -+ gint curr = idlist[0]; -+ -+ if( gwp_ship_is_mine( ship ) ) -+ { -+ curr++; -+ idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) ); -+ idlist[0]++; -+ g_sprintf( name, "%03d: ", idlist[curr] ); -+ strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 ); -+ gtk_combo_box_append_text( box, name ); -+ } -+} - - void vcr_populate_ship_a_list( GtkWidget *widget, gpointer user_data ) - { -- gchar *name; - gint *idlist; -- static void foreach_func( gpointer key, gpointer value, gpointer user_data ); - - /* test if list is already populated */ - idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist"); -@@ -2708,23 +2725,7 @@ - GtkWidget *combox = lookup_widget("vcr_comboboxentry_sel_ext_shp_a"); - g_object_set_data(G_OBJECT(combox), "shipidlist", idlist ); - -- void foreach_func( gpointer key, gpointer value, gpointer user_data ) -- { -- GwpShip *ship = GWP_SHIP( value ); -- GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) ); -- gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist"); -- gint curr = idlist[0]; - -- if( gwp_ship_is_mine( ship ) ) -- { -- curr++; -- idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) ); -- idlist[0]++; -- g_sprintf( name, "%03d: ", idlist[curr] ); -- strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 ); -- gtk_combo_box_append_text( box, name ); -- } -- } - - g_hash_table_foreach( ship_list, (GHFunc) foreach_func, user_data ); - diff --git a/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch b/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch deleted file mode 100644 index fa7ee5c5443c..000000000000 --- a/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- src/gwp-game-state.c.old 2006-03-05 00:56:48.000000000 +0900 -+++ src/gwp-game-state.c 2006-03-05 00:57:38.000000000 +0900 -@@ -749,7 +749,7 @@ - /* Connect to interesting signals */ - /**********************************/ - /* Selected planets */ -- static void planet_conn (gpointer key, gpointer value, gpointer self) { -+ void planet_conn (gpointer key, gpointer value, gpointer self) { - g_signal_connect (GWP_PLANET(value), - "selected", - G_CALLBACK(selected_planet_notification), -@@ -757,7 +757,7 @@ - } - g_hash_table_foreach (planet_list, (GHFunc) planet_conn, self); - /* Selected ships */ -- static void ship_conn (gpointer key, gpointer value, gpointer self) { -+ void ship_conn (gpointer key, gpointer value, gpointer self) { - g_signal_connect (GWP_SHIP(value), - "selected", - G_CALLBACK(selected_ship_notification), ---- src/starchart.c.old 2006-03-05 01:13:39.000000000 +0900 -+++ src/starchart.c 2006-03-05 01:18:04.000000000 +0900 -@@ -2111,7 +2111,7 @@ - /*******************/ - /* Planets signals */ - /*******************/ -- static void planet_conn (gpointer key, gpointer value, gpointer data) { -+ void planet_conn (gpointer key, gpointer value, gpointer data) { - g_signal_connect (GWP_PLANET(value), - "property-changed", - G_CALLBACK(update_planet_notification), ---- src/vp_utils.c.old 2006-03-05 01:18:14.000000000 +0900 -+++ src/vp_utils.c 2006-03-05 01:18:52.000000000 +0900 -@@ -2590,7 +2590,7 @@ - gwp_planet_set_colonists (planet, atoi(p_clans)); - - /* Compare func */ -- static gint compare_race (gconstpointer race, gconstpointer adj) { -+ gint compare_race (gconstpointer race, gconstpointer adj) { - gchar *race_str = gwp_race_get_adjective(GWP_RACE(race)); - if (strncmp(race_str, adj, strlen(adj)) == 0) - return 0; -@@ -2639,7 +2639,7 @@ - /* Assign known planet values */ - gwp_planet_set_is_known (planet, TRUE); - /* Compare func */ -- static gint compare_race (gconstpointer race, gconstpointer adj) { -+ gint compare_race (gconstpointer race, gconstpointer adj) { - gchar *race_str = gwp_race_get_adjective(GWP_RACE(race)); - if (strncmp(race_str, adj, strlen(adj)) == 0) - return 0; ---- src/gwp-py-mappings.c.old 2006-03-05 01:28:39.000000000 +0900 -+++ src/gwp-py-mappings.c 2006-03-05 01:29:30.000000000 +0900 -@@ -8657,7 +8657,7 @@ - { - PyObject *ret = PyDict_New(); - -- static void add_ship (gpointer key, gpointer value, gpointer user_data) { -+ void add_ship (gpointer key, gpointer value, gpointer user_data) { - PyObject *dict = (PyObject *)user_data; - GwpShip *ship = GWP_SHIP(value); - -@@ -8679,7 +8679,7 @@ - { - PyObject *ret = PyDict_New(); - -- static void add_planet (gpointer key, gpointer value, gpointer user_data) { -+ void add_planet (gpointer key, gpointer value, gpointer user_data) { - PyObject *dict = (PyObject *)user_data; - GwpPlanet *planet = GWP_PLANET(value); - -@@ -8701,7 +8701,7 @@ - { - PyObject *ret = PyDict_New(); - -- static void add_hullspec (gpointer value, gpointer user_data) { -+ void add_hullspec (gpointer value, gpointer user_data) { - PyObject *dict = (PyObject *)user_data; - GwpHullSpec *hullspec = GWP_HULLSPEC(value); - -@@ -8723,7 +8723,7 @@ - { - PyObject *ret = PyDict_New(); - -- static void add_engspec (gpointer value, gpointer user_data) { -+ void add_engspec (gpointer value, gpointer user_data) { - PyObject *dict = (PyObject *)user_data; - GwpEngSpec *engspec = GWP_ENGSPEC(value); - -@@ -8745,7 +8745,7 @@ - { - PyObject *ret = PyDict_New(); - -- static void add_beamspec (gpointer value, gpointer user_data) { -+ void add_beamspec (gpointer value, gpointer user_data) { - PyObject *dict = (PyObject *)user_data; - GwpBeamSpec *beamspec = GWP_BEAMSPEC(value); - -@@ -8767,7 +8767,7 @@ - { - PyObject *ret = PyDict_New(); - -- static void add_torpspec (gpointer value, gpointer user_data) { -+ void add_torpspec (gpointer value, gpointer user_data) { - PyObject *dict = (PyObject *)user_data; - GwpTorpSpec *torpspec = GWP_TORPSPEC(value); - diff --git a/games-strategy/gwp/gwp-0.4.0-r4.ebuild b/games-strategy/gwp/gwp-0.4.0-r4.ebuild deleted file mode 100644 index 86e8f30a76bb..000000000000 --- a/games-strategy/gwp/gwp-0.4.0-r4.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils flag-o-matic gnome2 python-single-r1 - -DESCRIPTION="GNOME client for the classic PBEM strategy game VGA Planets 3" -HOMEPAGE="http://gwp.lunix.com.ar/" -SRC_URI="http://gwp.lunix.com.ar/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls opengl python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="x11-libs/gtk+:2 - gnome-base/libgnomeui - gnome-base/libglade - app-text/rarian - dev-libs/libpcre - nls? ( virtual/libintl ) - opengl? ( x11-libs/gtkglext ) - python? ( ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygtk[${PYTHON_MULTI_USEDEP}] - ') - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - append-libs -lm - epatch \ - "${FILESDIR}"/${P}-gcc41.patch \ - "${FILESDIR}"/${P}-exec-stack.patch - sed -i \ - -e '/ -O1/d' \ - -e '/ -g$/d' \ - src/Makefile.in || die - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_enable nls) \ - $(use_enable opengl gtkglext) \ - $(use_enable python) -} - -src_install() { - DOCS="AUTHORS ChangeLog CHANGES README TODO" \ - gnome2_src_install - rm -rf "${D}"/usr/share/doc/gwp -} diff --git a/games-strategy/gwp/metadata.xml b/games-strategy/gwp/metadata.xml deleted file mode 100644 index 78274e0fa550..000000000000 --- a/games-strategy/gwp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - diff --git a/profiles/package.mask b/profiles/package.mask index 49a292517d9e..915a5a88f1d4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -568,12 +568,6 @@ media-sound/adplay =dev-lang/lua-5.2.4-r2 =dev-lang/lua-5.3.5-r2 -# David Seifert (2020-01-21) -# Upstream disappeared, no other distro still carries this, -# blocks removal of EOL gtkglext, no revdeps. -# Removal in 30 days. -games-strategy/gwp - # David Seifert (2020-01-21) # All released versions depend on EOL gtkglext, no revdeps. # Bug #644334, #694834. Removal of releases in 30 days.