remove gnome-vfs and fix ebuild issues

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 97 insertions, 11 deletions

diff --git a/games-misc/lucidlife/ChangeLog b/games-misc/lucidlife/ChangeLog
index 32122aefedf0..f26c0a4b8963 100644
--- a/games-misc/lucidlife/ChangeLog
+++ b/games-misc/lucidlife/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-misc/lucidlife
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/lucidlife/ChangeLog,v 1.1 2010/11/08 01:32:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/lucidlife/ChangeLog,v 1.2 2010/11/08 04:04:24 xmw Exp $
+
+  08 Nov 2010; Michael Weber <xmw@gentoo.org> lucidlife-0.9.2.ebuild,
+  +files/lucidlife-0.9.2-gnome-vfs.patch, metadata.xml:
+  Removing gnome-base/gnome-vfs dependency and fix ebuild/metadata/.desktop
+  issues, thanks Mr_Bones_ and ssuominen.
 
 *lucidlife-0.9.2 (08 Nov 2010)
 
diff --git a/games-misc/lucidlife/Manifest b/games-misc/lucidlife/Manifest
index 1db3dcdcb0d2..cff914bacf58 100644
--- a/games-misc/lucidlife/Manifest
+++ b/games-misc/lucidlife/Manifest
@@ -1,4 +1,5 @@
+AUX lucidlife-0.9.2-gnome-vfs.patch 1549 RMD160 3eb895f9ad16e06929697e25793b777445050062 SHA1 6f005e5a463e8df53a710bb547d9f2b2de1b7bdb SHA256 0c936b3543fd6d31c2eb8907fb9f89c2966150d04130d92913b1905c5b1581ef
 DIST lucidlife-0.9.2.tar.gz 1506448 RMD160 1ed4d7ae3bb71c22d35e5f70c1408f81099cb68f SHA1 2a6b941f39283fa652eeec81f66bd39de392fc0b SHA256 7ef3e3a71e771642e2749ccff2adf1c88c9f1798444d6a34665ce528aef58048
-EBUILD lucidlife-0.9.2.ebuild 794 RMD160 82f3935afb2685c772a876d83565ed990ed500ff SHA1 25e4b56671c412d5103aa5a14727c5b4d27e9fc7 SHA256 852d107c2575229dea4e63967089980ef3af84aeec9ea0e0296e97625abef15c
-MISC ChangeLog 455 RMD160 9928814bf3dd382f082ca7056593aa947ba378a6 SHA1 24560cdd384feb8c63e662e20be0b69961faf9b3 SHA256 b53dca61bdfcd8a87df205dceee5328206540d47a44894fb81bc010c2e3424d2
-MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
+EBUILD lucidlife-0.9.2.ebuild 970 RMD160 4290943dec9e1af0650c61cbeb8cf5e70305a4cf SHA1 a0d3dc4c8b9e278700916b8f0d30f4b5ce6dfbd8 SHA256 264d8a125beb193c70318ad219236e7db9b39d76366745ab9592606475ce6f3a
+MISC ChangeLog 700 RMD160 ce5869b662ae9c5e93ba7a244b876dd2cb9098af SHA1 751ea307a363648026367f95c667a75325078d2f SHA256 6608dd55b26533c637301f264afa7a75827d64a6fc5d9539d41d3f25b8fd5356
+MISC metadata.xml 243 RMD160 61a73b3edc5d56dfe9ee302cc4c70f56a96eed78 SHA1 00fc0791a913c7c2a57718c9019f6ec0cf582326 SHA256 89106787a5945407ba66d216c4d1ade48c419f09c5f13933be3bb92657dad8b0
diff --git a/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch b/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
new file mode 100644
index 000000000000..49918b62146a
--- /dev/null
+++ b/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
@@ -0,0 +1,70 @@
+--- lucidlife-0.9.2/configure.ac
++++ lucidlife-0.9.2/configure.ac
+@@ -23,7 +23,7 @@
+ AC_SUBST(CFLAGS)
+ AC_SUBST(LDFLAGS)
+ 
+-GNOME_MODULES="[gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 >= 2.0.0]"
++GNOME_MODULES="[gtk+-2.0 >= 2.6.0]"
+ PKG_CHECK_MODULES(GNOME, $GNOME_MODULES)
+ AC_SUBST(GNOME_CFLAGS)
+ AC_SUBST(GNOME_LIBS)
+--- lucidlife-0.9.2/src/lucidlife.c
++++ lucidlife-0.9.2/src/lucidlife.c
+@@ -35,8 +35,6 @@
+ 
+ #include <gtk/gtk.h>
+ #include <glib.h>
+-#include <libgnomevfs/gnome-vfs-init.h>
+-#include <libgnomevfs/gnome-vfs-utils.h>
+ 
+ #include <libintl.h>
+ #define _(String) gettext (String)
+@@ -418,7 +416,6 @@
+ 	state_from_config();
+ 	load_recent_files_list();
+ 
+-	gnome_vfs_init();
+ 	gtk_init(&argc, &argv);
+ 	init_gui();
+ 
+@@ -445,8 +442,6 @@
+ 
+ 	main_loop();
+ 
+-	gnome_vfs_shutdown();
+-
+ 	return 0;
+ }
+ 
+@@ -1635,7 +1630,7 @@
+ 
+ void activate_url(GtkAboutDialog *about, const gchar *url, gpointer data)
+ {
+-	gnome_vfs_url_show (url);
++	gtk_show_uri (NULL, url, GDK_CURRENT_TIME, NULL );
+ }
+ 
+ /*** Bound Function Helpers ***/
+@@ -1859,7 +1856,7 @@
+ 	char*  url;
+ 
+ 	url = dsprintf("file://%s/%s", DOCDIR, filename);
+-	gnome_vfs_url_show(url);
++	gtk_show_uri (NULL, url, GDK_CURRENT_TIME, NULL );
+ 	free(url);
+ }
+ 
+--- lucidlife-0.9.2/lucidlife.desktop.in
++++ lucidlife-0.9.2/lucidlife.desktop.in
+@@ -2,8 +2,7 @@
+ Name=LucidLife
+ Comment=A user-friendly version of Conway's game of life
+ Exec=lucidlife
+-Icon=lucidlife.png
++Icon=lucidlife
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Game;
+-Encoding=UTF-8
++Categories=GNOME;GTK;Game;
diff --git a/games-misc/lucidlife/lucidlife-0.9.2.ebuild b/games-misc/lucidlife/lucidlife-0.9.2.ebuild
index 24756cebd500..e22388ce3238 100644
--- a/games-misc/lucidlife/lucidlife-0.9.2.ebuild
+++ b/games-misc/lucidlife/lucidlife-0.9.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/lucidlife/lucidlife-0.9.2.ebuild,v 1.1 2010/11/08 01:32:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/lucidlife/lucidlife-0.9.2.ebuild,v 1.2 2010/11/08 04:04:24 xmw Exp $
 
 EAPI=2
 
-inherit games
+inherit autotools eutils games
 
 DESCRIPTION="A Conway's Life simulator written in GTK+2 - fork from Gtklife"
 HOMEPAGE="http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/Simulation/LucidLife-26633.shtml"
@@ -15,15 +15,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="gnome-base/gnome-vfs
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${DEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gnome-vfs.patch
+	eautoreconf
+	intltoolize --force --copy --automake || die
+}
 
 src_install() {
 	emake install \
 		desktopdir=/usr/share/applications \
 		pixmapdir=/usr/share/pixmaps \
 		DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
+
 	prepgamesdirs
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
 }
diff --git a/games-misc/lucidlife/metadata.xml b/games-misc/lucidlife/metadata.xml
index 02b909e46b7e..a562c4775bb2 100644
--- a/games-misc/lucidlife/metadata.xml
+++ b/games-misc/lucidlife/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>games</herd>
 <maintainer>
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>