[gentoo-commits] repo/gentoo:master commit in: games-board/gnome-hearts/files/, games-board/gnome-hearts/

[gentoo-commits] repo/gentoo:master commit in: games-board/gnome-hearts/files/, games-board/gnome-hearts/

[Pacho Ramos]

commit:     0bdcb91fb60887126a57686195c56ccf072c0870
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 12:19:29 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 12:29:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bdcb91f

games-board/gnome-hearts: Drop libgnomeui requirement with the ArchLinux patch

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/gnome-hearts-0.3.1-drop-libgnomeui.patch | 64 ++++++++++++++++++++++
 .../gnome-hearts/gnome-hearts-0.3.1-r2.ebuild      | 46 ++++++++++++++++
 2 files changed, 110 insertions(+)

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
new file mode 100644
index 0000000000..21c4e7b089
--- /dev/null
+++ b/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch
@@ -0,0 +1,64 @@
+diff -Naur gnome-hearts-0.3.1.orig/configure.in gnome-hearts-0.3.1/configure.in
+--- gnome-hearts-0.3.1.orig/configure.in	2013-06-09 15:05:11.000000000 +0200
++++ gnome-hearts-0.3.1/configure.in	2017-01-20 23:20:35.677689797 +0100
+@@ -23,7 +23,7 @@
+ fi
+ 
+ # Check for libraries. gmodule is required to make sure --export-dynamic is used and glade works
+-PKG_CHECK_MODULES(GNOME_HEARTS, [libgnomeui-2.0 gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
++PKG_CHECK_MODULES(GNOME_HEARTS, [gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
+ AC_SUBST(GNOME_HEARTS_CFLAGS)
+ AC_SUBST(GNOME_HEARTS_LIBS)
+ 
+diff -Naur gnome-hearts-0.3.1.orig/src/events.c gnome-hearts-0.3.1/src/events.c
+--- gnome-hearts-0.3.1.orig/src/events.c	2013-06-09 15:01:08.000000000 +0200
++++ gnome-hearts-0.3.1/src/events.c	2017-01-20 23:35:17.428651148 +0100
+@@ -71,13 +71,13 @@
+ /* Open the help file */
+ void on_help(GtkWidget *widget, gpointer data)
+ {
+-	gnome_help_display("gnome-hearts.xml", NULL, NULL);
++	gtk_show_uri(NULL, "ghelp:gnome-hearts", GDK_CURRENT_TIME, NULL);
+ }
+ 
+ /* Open the preferences help file */
+ void on_preferences_help(GtkWidget *widget, gpointer data)
+ {
+-	gnome_help_display("gnome-hearts.xml", "hearts-prefs", NULL);
++	gtk_show_uri(NULL, "ghelp:gnome-hearts?hearts-prefs", GDK_CURRENT_TIME, NULL);
+ }
+ 
+ /* About menu item */
+diff -Naur gnome-hearts-0.3.1.orig/src/hearts.c gnome-hearts-0.3.1/src/hearts.c
+--- gnome-hearts-0.3.1.orig/src/hearts.c	2013-06-09 15:01:08.000000000 +0200
++++ gnome-hearts-0.3.1/src/hearts.c	2017-01-20 23:20:21.447210208 +0100
+@@ -534,15 +534,11 @@
+ 		setlocale(LC_ALL, "");
+ 	#endif
+ 
+-	/* Initialize GNOME */
++	/* Initialize GTK+ */
+ 	GOptionContext *option_context = g_option_context_new(_("- Play a game of hearts"));
+ 	g_option_context_add_main_entries(option_context, option_entries, GETTEXT_PACKAGE);
+ 
+-	gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
+-			argc, argv,
+-			GNOME_PARAM_GOPTION_CONTEXT, option_context,
+-			GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
+-			GNOME_PARAM_NONE);
++	gtk_init(&argc, &argv);
+ 	
+ 	/* init the game's global variables */
+ 	game_score_labels = NULL;
+diff -Naur gnome-hearts-0.3.1.orig/src/hearts.h gnome-hearts-0.3.1/src/hearts.h
+--- gnome-hearts-0.3.1.orig/src/hearts.h	2013-06-09 15:01:08.000000000 +0200
++++ gnome-hearts-0.3.1/src/hearts.h	2017-01-20 23:22:33.691604109 +0100
+@@ -26,7 +26,7 @@
+ /* headers */
+ #include <glib/gi18n.h>
+ #include <dirent.h>
+-#include <gnome.h>
++#include <gtk/gtk.h>
+ #include <glade/glade.h>
+ #include "cards.h"
+ #include "cfg.h"

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
new file mode 100644
index 0000000000..b27c408593
--- /dev/null
+++ b/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="A clone of classic hearts card game"
+HOMEPAGE="http://www.gnome-hearts.org"
+SRC_URI="http://www.jejik.com/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	x11-libs/gtk+:2
+	>=gnome-base/libglade-2
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make src_test work
+	echo gnome-hearts.desktop.in >> po/POTFILES.skip
+
+	sed -i \
+		-e '/No name/d' \
+		-e '/^Icon/s/.png//' \
+		-e '/^Encoding/d' \
+		gnome-hearts.desktop.in || die
+
+	eapply "${FILESDIR}"/${P}-drop-libgnomeui.patch
+
+	mv configure.in configure.ac || die
+	gnome2_src_prepare
+}