Fix autotools and fix not starting with newer gtk+

Package-Manager: portage-2.1.4
RepoMan-Options: --force

8 files changed, 86 insertions, 131 deletions

diff --git a/net-p2p/giftui/ChangeLog b/net-p2p/giftui/ChangeLog
index 959440e76c33..32e4a5270e94 100644
--- a/net-p2p/giftui/ChangeLog
+++ b/net-p2p/giftui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/giftui
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/ChangeLog,v 1.21 2007/02/21 20:15:27 armin76 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/ChangeLog,v 1.22 2008/01/15 19:05:19 armin76 Exp $
+
+*giftui-0.4.1-r1 (15 Jan 2008)
+
+  15 Jan 2008; Raúl Porcel <armin76@gentoo.org> -files/0.4.1-gentoo.patch,
+  +files/0.4.1-gentoo-r1.patch, -giftui-0.3.1.ebuild, -giftui-0.4.1.ebuild,
+  +giftui-0.4.1-r1.ebuild:
+  Fix autotools and fix not starting with newer gtk+
 
   21 Feb 2007; Raúl Porcel <armin76@gentoo.org> files/digest-giftui-0.4.1,
   Manifest:
diff --git a/net-p2p/giftui/Manifest b/net-p2p/giftui/Manifest
index bb6571a5def6..9f4a3ac2a08e 100644
--- a/net-p2p/giftui/Manifest
+++ b/net-p2p/giftui/Manifest
@@ -1,32 +1,24 @@
-AUX 0.4.1-gentoo.patch 1769 RMD160 7ebaf76f2a0ee6deb2a7ab74173de1cfef8cf6ee SHA1 9c73cd12118259be02c8932cd485cad4fa32540f SHA256 cf84661732140212ec3145c74acd201ee88a4aa20954c62c36b8c86c9111c562
-MD5 37bc65e41fc80a329a7ace5b3718d2ad files/0.4.1-gentoo.patch 1769
-RMD160 7ebaf76f2a0ee6deb2a7ab74173de1cfef8cf6ee files/0.4.1-gentoo.patch 1769
-SHA256 cf84661732140212ec3145c74acd201ee88a4aa20954c62c36b8c86c9111c562 files/0.4.1-gentoo.patch 1769
+AUX 0.4.1-gentoo-r1.patch 1280 RMD160 dd8d35412aaa88d9cc6ea8fdc4c327a0046ff6bd SHA1 a0b7cf405a18e097e2dedef68e7660a8a03e0bd2 SHA256 57dd65172d538358d391ae679a1747b8c018ed84486dcec0271ab0936307620b
+MD5 15f9b2f4cda9456b80dae915e4f15416 files/0.4.1-gentoo-r1.patch 1280
+RMD160 dd8d35412aaa88d9cc6ea8fdc4c327a0046ff6bd files/0.4.1-gentoo-r1.patch 1280
+SHA256 57dd65172d538358d391ae679a1747b8c018ed84486dcec0271ab0936307620b files/0.4.1-gentoo-r1.patch 1280
 AUX main.c.diff 503 RMD160 9f2f6f818a1a702d038c4182bb57d6a320a9b091 SHA1 454ee417d128d5b52d254bbc1eb828944b3cfd29 SHA256 4fbd6ee1d8eb2575332edc938bb14fa22d312c982d11a2a9e97e43202c8c60ae
 MD5 36442a789cd241e3147198c3a1076c08 files/main.c.diff 503
 RMD160 9f2f6f818a1a702d038c4182bb57d6a320a9b091 files/main.c.diff 503
 SHA256 4fbd6ee1d8eb2575332edc938bb14fa22d312c982d11a2a9e97e43202c8c60ae files/main.c.diff 503
-DIST giftui-0.3.1.tar.bz2 263631 RMD160 1e23026c3d63245a994c1798f91c841fa90d72f0 SHA1 ca4b399d72ec28381190cadec93167a0e0241415 SHA256 57916909ca07f6c384dfc0adfbec358125a5b46257083a2bec55649a349b1006
 DIST giftui-0.4.1.tar.bz2 220208 RMD160 35f33c9580bc89664748b82a73a2173b4d72844c SHA1 50d30b0073d557a7008fe0d7d5dbcd4ed785a7e1 SHA256 1a28bb483ba6f02853280dc2520b28e6c1ca34b2935e8f4e3b5ecd069699f583
-EBUILD giftui-0.3.1.ebuild 558 RMD160 662d795ca19fad2fe492fcd2edec65e9cedd7a07 SHA1 f34458eda8951b6d7c0f19384a7600dfa07deeb5 SHA256 a2828a0dce9f6852cbe657d18f1cfb1e893c6d7c26773c36f3a4533b6bfb702f
-MD5 32def028f46f23843446ecc82371da92 giftui-0.3.1.ebuild 558
-RMD160 662d795ca19fad2fe492fcd2edec65e9cedd7a07 giftui-0.3.1.ebuild 558
-SHA256 a2828a0dce9f6852cbe657d18f1cfb1e893c6d7c26773c36f3a4533b6bfb702f giftui-0.3.1.ebuild 558
-EBUILD giftui-0.4.1.ebuild 992 RMD160 4efd1602e5343f7ab8bc5769f7dd1dd26a912bdd SHA1 280a3c0e061568b57f9e72fed21c98366a999d44 SHA256 0cb2c8386f02d67c30e46acac35671b24c4c9d668619387d3548e952aca541f3
-MD5 5170fc4edde3dbe4bc4dcdfc0c19865d giftui-0.4.1.ebuild 992
-RMD160 4efd1602e5343f7ab8bc5769f7dd1dd26a912bdd giftui-0.4.1.ebuild 992
-SHA256 0cb2c8386f02d67c30e46acac35671b24c4c9d668619387d3548e952aca541f3 giftui-0.4.1.ebuild 992
-MISC ChangeLog 2604 RMD160 4fe00d30b0b529310f4f531b784bc093fb7cbc84 SHA1 809d5a4020b246d6379209c0fa57e49433d7ef69 SHA256 4908baa15d11827ea15a57d324057bd20a039380e5c90e12b99bb35d6a32aeaf
-MD5 b291983ccbce14d16fa0c2bd998ce99a ChangeLog 2604
-RMD160 4fe00d30b0b529310f4f531b784bc093fb7cbc84 ChangeLog 2604
-SHA256 4908baa15d11827ea15a57d324057bd20a039380e5c90e12b99bb35d6a32aeaf ChangeLog 2604
+EBUILD giftui-0.4.1-r1.ebuild 834 RMD160 0f377b8d95f1705a7ee0373c0dd73e67c165a4a9 SHA1 580f2e3fb171adc5a2e6b440b75f869b004e942a SHA256 c8acc85ab10314478e07ea280cb9e5e6d944311b5a62e7cce065580b130e4bf7
+MD5 5cca9d19cd9d7c0fbaa45766a9f6e7df giftui-0.4.1-r1.ebuild 834
+RMD160 0f377b8d95f1705a7ee0373c0dd73e67c165a4a9 giftui-0.4.1-r1.ebuild 834
+SHA256 c8acc85ab10314478e07ea280cb9e5e6d944311b5a62e7cce065580b130e4bf7 giftui-0.4.1-r1.ebuild 834
+MISC ChangeLog 2869 RMD160 cfec94fa5684bfc1f4f4c82da631d5d3225f0a17 SHA1 3199919049b85840b788a209083a0083da1f4c07 SHA256 05238e7ef10fcfd4e6db00f1d2ca298fa5d9b54c8d919a3bc23b4d190912e00e
+MD5 ea8e99ee848cce520467fc13e451f865 ChangeLog 2869
+RMD160 cfec94fa5684bfc1f4f4c82da631d5d3225f0a17 ChangeLog 2869
+SHA256 05238e7ef10fcfd4e6db00f1d2ca298fa5d9b54c8d919a3bc23b4d190912e00e ChangeLog 2869
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
-MD5 28204bbb42f0aff54a13e2801049ff4c files/digest-giftui-0.3.1 241
-RMD160 aab99af359ae88e6287788e06f320abd1196de2d files/digest-giftui-0.3.1 241
-SHA256 c3cde4b29afbdee117201918f010ceb9a0aff6a894eca46418b66fe1b82e9a4e files/digest-giftui-0.3.1 241
-MD5 d42117768c179c00b0c5d4c787a27d5c files/digest-giftui-0.4.1 241
-RMD160 63e96690c5228101c8719b5e700b8c784a453877 files/digest-giftui-0.4.1 241
-SHA256 a37cf970517cb2b8cabcc14682ac5f13ff8cc86dddd36897366d1fe80a3a3092 files/digest-giftui-0.4.1 241
+MD5 d42117768c179c00b0c5d4c787a27d5c files/digest-giftui-0.4.1-r1 241
+RMD160 63e96690c5228101c8719b5e700b8c784a453877 files/digest-giftui-0.4.1-r1 241
+SHA256 a37cf970517cb2b8cabcc14682ac5f13ff8cc86dddd36897366d1fe80a3a3092 files/digest-giftui-0.4.1-r1 241
diff --git a/net-p2p/giftui/files/0.4.1-gentoo-r1.patch b/net-p2p/giftui/files/0.4.1-gentoo-r1.patch
new file mode 100644
index 000000000000..531812165391
--- /dev/null
+++ b/net-p2p/giftui/files/0.4.1-gentoo-r1.patch
@@ -0,0 +1,55 @@
+--- giftui-0.4.1.orig/src/ui_transfer_cb.c
++++ giftui-0.4.1/src/ui_transfer_cb.c
+@@ -18,12 +18,12 @@
+  */
+ 
+ #include "main.h"
++#include "gtkcellrendererprogress.h"
+ 
+ #include <string.h>
+ #include <libgift/libgift.h>
+ #include <gtk/gtk.h>
+ 
+-#include "gtkcellrendererprogress.h"
+ 
+ #include "io.h"
+ #include "event.h"
+--- giftui-0.4.1.orig/src/ui_transfer.c
++++ giftui-0.4.1/src/ui_transfer.c
+@@ -18,13 +18,13 @@
+  */
+ 
+ #include "main.h"
++#include "gtkcellrendererprogress.h"
+ 
+ #include <string.h>
+ #include <libgift/libgift.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
+-#include "gtkcellrendererprogress.h"
+ 
+ #include "io.h"
+ #include "event.h"
+--- giftui-0.4.1.orig/src/main.c
++++ giftui-0.4.1/src/main.c
+@@ -197,6 +197,8 @@
+ 	bindtextdomain (PACKAGE, LOCALEDIR);
+ 	textdomain (PACKAGE);
+ #endif	
++	/* init GObject system */
++	g_type_init();
+ 	
+ 	/* configuration init & load */
+ 	giftui_config_init ();
+--- giftui-0.4.1.orig/src/ui_about.c
++++ giftui-0.4.1/src/ui_about.c
+@@ -153,7 +153,7 @@
+ 	gtk_container_add (GTK_CONTAINER (scrolled), about->list);
+ 	
+ 	/* create columns */
+-	for (i = 0; i < ABOUT_ICON ; i++)
++	for (i = 0; i < ABOUT_VERSION ; i++)
+ 	{
+ 		column = gtk_tree_view_column_new ();
+ 		gtk_tree_view_column_set_title (column, column_headers[i]);
diff --git a/net-p2p/giftui/files/0.4.1-gentoo.patch b/net-p2p/giftui/files/0.4.1-gentoo.patch
deleted file mode 100644
index afda790f3266..000000000000
--- a/net-p2p/giftui/files/0.4.1-gentoo.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur giftui-0.4.1/src/main.c giftui-0.4.1.new/src/main.c
---- giftui-0.4.1/src/main.c	2004-05-06 01:55:02.000000000 -0500
-+++ giftui-0.4.1.new/src/main.c	2004-08-18 22:30:08.600960640 -0500
-@@ -197,6 +197,12 @@
- 	bindtextdomain (PACKAGE, LOCALEDIR);
- 	textdomain (PACKAGE);
- #endif	
-+
-+	/* init GObject system */
-+	g_type_init ();
-+	
-+	/* GTK+ init */
-+	gtk_init (&argc, &argv);
- 	
- 	/* configuration init & load */
- 	giftui_config_init ();
-@@ -214,10 +220,6 @@
- 		
- 		return EXIT_FAILURE;
- 	}
--		
--	
--	/* GTK+ init */
--	gtk_init (&argc, &argv);
- 	
- 	return EXIT_SUCCESS;
- }
---- giftui-0.4.1/src/ui_transfer_cb.old	2004-05-06 08:54:58.000000000 +0200
-+++ giftui-0.4.1/src/ui_transfer_cb.c	2005-03-06 17:06:12.000000000 +0100
-@@ -23,8 +23,6 @@
- #include <libgift/libgift.h>
- #include <gtk/gtk.h>
- 
--#include "gtkcellrendererprogress.h"
--
- #include "io.h"
- #include "event.h"
- #include "configure.h"
---- giftui-0.4.1/src/ui_transfer.c.old	2004-05-13 19:46:11.000000000 +0200
-+++ giftui-0.4.1/src/ui_transfer.c	2005-03-06 17:05:18.000000000 +0100
-@@ -24,8 +24,6 @@
- #include <gdk/gdkkeysyms.h>
- #include <gtk/gtk.h>
- 
--#include "gtkcellrendererprogress.h"
--
- #include "io.h"
- #include "event.h"
- #include "configure.h"
---- giftui-0.4.1/src/ui_transfer.h.old	2004-05-06 08:55:01.000000000 +0200
-+++ giftui-0.4.1/src/ui_transfer.h	2005-03-06 17:05:52.000000000 +0100
-@@ -38,6 +38,14 @@
- 
- #define GIFTUI_TRANSFERFILE(arg) ((GiftuiTransferFile_t *) (arg))
- 
-+typedef enum
-+{
-+	GTK_CELL_RENDERER_PROGRESS_ACTIVE,
-+	GTK_CELL_RENDERER_PROGRESS_COMPLETED,
-+	GTK_CELL_RENDERER_PROGRESS_PAUSED,
-+	GTK_CELL_RENDERER_PROGRESS_CANCELED
-+} GtkCellRendererProgressColor;
-+
- typedef struct _GiftuiTransfer GiftuiTransfer;
- typedef struct _GiftuiTransferClass GiftuiTransferClass;
- 
diff --git a/net-p2p/giftui/files/digest-giftui-0.3.1 b/net-p2p/giftui/files/digest-giftui-0.3.1
deleted file mode 100644
index 97bf8f34ea7d..000000000000
--- a/net-p2p/giftui/files/digest-giftui-0.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5c689e94e74feda449615ed41de2c802 giftui-0.3.1.tar.bz2 263631
-RMD160 1e23026c3d63245a994c1798f91c841fa90d72f0 giftui-0.3.1.tar.bz2 263631
-SHA256 57916909ca07f6c384dfc0adfbec358125a5b46257083a2bec55649a349b1006 giftui-0.3.1.tar.bz2 263631
diff --git a/net-p2p/giftui/files/digest-giftui-0.4.1 b/net-p2p/giftui/files/digest-giftui-0.4.1-r1
index 3fe59d9319a0..3fe59d9319a0 100644
--- a/net-p2p/giftui/files/digest-giftui-0.4.1
+++ b/net-p2p/giftui/files/digest-giftui-0.4.1-r1
diff --git a/net-p2p/giftui/giftui-0.3.1.ebuild b/net-p2p/giftui/giftui-0.3.1.ebuild
deleted file mode 100644
index fb318914e82c..000000000000
--- a/net-p2p/giftui/giftui-0.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/giftui-0.3.1.ebuild,v 1.10 2007/01/10 14:00:49 armin76 Exp $
-
-IUSE=""
-DESCRIPTION="A GTK+2 giFT frontend"
-HOMEPAGE="http://giftui.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~amd64"
-
-DEPEND=">=x11-libs/gtk+-2.0.3
-	net-p2p/gift
-	dev-util/pkgconfig"
-
-src_install() {
-	make DESTDIR=${D} giftuidocdir=/usr/share/doc/${PF} install
-	prepalldocs
-}
diff --git a/net-p2p/giftui/giftui-0.4.1.ebuild b/net-p2p/giftui/giftui-0.4.1-r1.ebuild
index 078459d6f442..69080a07edd8 100644
--- a/net-p2p/giftui/giftui-0.4.1.ebuild
+++ b/net-p2p/giftui/giftui-0.4.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/giftui-0.4.1.ebuild,v 1.11 2007/01/10 14:00:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/giftui/giftui-0.4.1-r1.ebuild,v 1.1 2008/01/15 19:05:19 armin76 Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils autotools
 
 DESCRIPTION="A GTK+2 giFT frontend"
 HOMEPAGE="http://giftui.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/giftui/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4.3
@@ -18,24 +18,15 @@ RDEPEND=">=x11-libs/gtk+-2.4.3
 	>=gnome-base/gconf-2.6.0
 	dev-util/pkgconfig"
 DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7.8
-	>=sys-devel/autoconf-2.58
 	sys-apps/sed"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo.patch
+	cd "${S}"
+	epatch ${FILESDIR}/${PV}-gentoo-r1.patch
 	sed -i -e 's:/doc/giftui:/share/doc/${P}:g' Makefile*
-	export WANT_AUTOMAKE=1.7
-	export WANT_AUTOCONF=2.5
-	autoconf || die
-	automake || die
-}
 
-src_compile() {
-	econf || die
-	emake || die
+	eautoreconf
 }
 
 src_install() {