Fixed intltool mess.

(Portage version: 2.1_pre4-r1)

5 files changed, 63 insertions, 54 deletions

diff --git a/x11-misc/gpasman/ChangeLog b/x11-misc/gpasman/ChangeLog
index 0f384998dbde..6e83d7a2957c 100644
--- a/x11-misc/gpasman/ChangeLog
+++ b/x11-misc/gpasman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/gpasman
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gpasman/ChangeLog,v 1.12 2006/02/07 16:46:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gpasman/ChangeLog,v 1.13 2006/02/10 22:23:53 nelchael Exp $
+
+  10 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/gpasman-1.9.3-gentoo.patch, -files/gpasman-1.9.3-gtk.patch,
+  gpasman-1.9.3.ebuild:
+  Fixed intltool mess.
 
 *gpasman-1.9.3 (07 Feb 2006)
 
diff --git a/x11-misc/gpasman/Manifest b/x11-misc/gpasman/Manifest
index 26231a6d9047..085f031aac28 100644
--- a/x11-misc/gpasman/Manifest
+++ b/x11-misc/gpasman/Manifest
@@ -7,15 +7,15 @@ SHA256 da2432d36564ec6bece2545887ce62b61c61bd880401a054a1ef43ee2a30e44b files/di
 MD5 e3d897e2f7af706205c36263afc9e54a files/digest-gpasman-1.9.3 241
 RMD160 94ffd5461b1aba500450048a74cfb5ee4f8560bb files/digest-gpasman-1.9.3 241
 SHA256 cbd487aebe3a6c9f2946273be8f98e0af75d05761d93ff24b2c67e08cb16c45e files/digest-gpasman-1.9.3 241
-MD5 30d0e2a2c5b336c3ff8a3a636bc18f48 files/gpasman-1.9.3-gtk.patch 1487
-RMD160 f3c63866abd92202e4dba72186def7d4d5147241 files/gpasman-1.9.3-gtk.patch 1487
-SHA256 7f93cebdadf7e39a0a482392fd3e8d0a851d768364f6431dd7003bae1898373a files/gpasman-1.9.3-gtk.patch 1487
+MD5 686f4086ed7131095dfe44f4a7f5e29e files/gpasman-1.9.3-gentoo.patch 1144
+RMD160 29b4f1f6fd6a8ad820a7da531e26252384fe2792 files/gpasman-1.9.3-gentoo.patch 1144
+SHA256 86886c9b1e2964c91b80aeb317af9a24fda54330bbf47db583f3a6c4d84bad13 files/gpasman-1.9.3-gentoo.patch 1144
 MD5 b7a1670e2bf0978b11d0598d52b4fba8 gpasman-1.3.1.ebuild 570
 RMD160 5c70500a57a3b8af20c9ea665a5bd57e18d28f65 gpasman-1.3.1.ebuild 570
 SHA256 8cacda8490ba95996d547b533b7fc7cd0b4b5645bacc4e21de5e286a6ec64650 gpasman-1.3.1.ebuild 570
-MD5 e35a715a68fd2c48f16053e4a9c10800 gpasman-1.9.3.ebuild 731
-RMD160 aed7772939b6b0b3d2eb36204945a6a56ef19153 gpasman-1.9.3.ebuild 731
-SHA256 adca3e1533b1fec2cafbadfda03b36c392559dc98d6c44d3d3928844fb0992cf gpasman-1.9.3.ebuild 731
+MD5 5a1e15587c43d0fadf97314185e81b19 gpasman-1.9.3.ebuild 875
+RMD160 f5d779907ebe31c5d54aa7572a72c27757fa66d3 gpasman-1.9.3.ebuild 875
+SHA256 451f7412734ae67892c575b8cfa65e596b695127a00615840538dfb403ca7f54 gpasman-1.9.3.ebuild 875
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata.xml 166
diff --git a/x11-misc/gpasman/files/gpasman-1.9.3-gentoo.patch b/x11-misc/gpasman/files/gpasman-1.9.3-gentoo.patch
new file mode 100644
index 000000000000..d721869f9c5f
--- /dev/null
+++ b/x11-misc/gpasman/files/gpasman-1.9.3-gentoo.patch
@@ -0,0 +1,43 @@
+diff -Nru gpasman-1.9.3.vanilla/configure.in gpasman-1.9.3/configure.in
+--- gpasman-1.9.3.vanilla/configure.in	2006-02-10 22:48:17.000000000 +0100
++++ gpasman-1.9.3/configure.in	2006-02-10 22:55:58.000000000 +0100
+@@ -2,7 +2,6 @@
+ AC_INIT([gpasman], [1.9.3], [http://sourceforge.net/tracker/?atid=545150&group_id=75814&func=browse])
+ AC_PREREQ(2.52)
+ AC_CONFIG_SRCDIR(src/gpasman.c)
+-AC_PROG_INTLTOOL(0.23)
+ 
+ dnl initilize automake
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+@@ -25,23 +24,6 @@
+ AC_SUBST(GTK_LIBS)
+ 
+ GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
+-AC_MSG_CHECKING([for 2.0.0 >= gtk+ < 2.3])
+-case $GTK_VERSION in		
+-	2.0.*)
+-		AC_MSG_RESULT([yes])
+-		GTK_PATCH="-DGTK_PATCH=1"
+-		AC_SUBST(GTK_PATCH)
+-		;;
+-	2.1.*|2.2.*)
+-		AC_MSG_RESULT([yes])
+-		GTK_PATCH="-DGTK_PATCH=0"
+-		AC_SUBST(GTK_PATCH)
+-		;;
+-	*)
+-		AC_MSG_RESULT([no])
+-		AC_MSG_ERROR([gpasman requires at least gtk+ 2.0.0 or higher])
+-		;;
+-esac
+ 		
+ dnl Check for architecture
+ AC_C_BIGENDIAN
+@@ -57,6 +39,7 @@
+ 
+ dnl Localisation
+ ALL_LINGUAS="de nl"
++AC_PROG_INTLTOOL(0.23)
+ GETTEXT_PACKAGE=gpasman
+ AC_SUBST(GETTEXT_PACKAGE)
+ AM_GLIB_GNU_GETTEXT
diff --git a/x11-misc/gpasman/files/gpasman-1.9.3-gtk.patch b/x11-misc/gpasman/files/gpasman-1.9.3-gtk.patch
deleted file mode 100644
index bd5fbc6c232b..000000000000
--- a/x11-misc/gpasman/files/gpasman-1.9.3-gtk.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nru gpasman-1.9.3.vanilla/configure.in gpasman-1.9.3/configure.in
---- gpasman-1.9.3.vanilla/configure.in	2006-02-07 17:20:09.000000000 +0100
-+++ gpasman-1.9.3/configure.in	2006-02-07 17:26:04.000000000 +0100
-@@ -32,7 +32,7 @@
- 		GTK_PATCH="-DGTK_PATCH=1"
- 		AC_SUBST(GTK_PATCH)
- 		;;
--	2.1.*|2.2.*)
-+	2.1.*|2.2.*|2.8.*)
- 		AC_MSG_RESULT([yes])
- 		GTK_PATCH="-DGTK_PATCH=0"
- 		AC_SUBST(GTK_PATCH)
-diff -Nru gpasman-1.9.3.vanilla/src/gtk-patch.c gpasman-1.9.3/src/gtk-patch.c
---- gpasman-1.9.3.vanilla/src/gtk-patch.c	2006-02-07 17:20:09.000000000 +0100
-+++ gpasman-1.9.3/src/gtk-patch.c	2006-02-07 17:27:23.000000000 +0100
-@@ -7,7 +7,7 @@
-  */
- #define VALID_ITER(iter, list_store) (iter!= NULL && iter->user_data != NULL && list_store->stamp == iter->stamp)
- 
--gboolean
-+/* gboolean
- gtk_list_store_iter_is_valid (GtkListStore *list_store,
-                               GtkTreeIter  *iter)
- {
-@@ -29,7 +29,7 @@
-       return TRUE;
- 
-   return FALSE;
--}
-+} */
- 
- #endif /* GTK_PATCH */
- 
-diff -Nru gpasman-1.9.3.vanilla/src/gtk-patch.h gpasman-1.9.3/src/gtk-patch.h
---- gpasman-1.9.3.vanilla/src/gtk-patch.h	2006-02-07 17:20:09.000000000 +0100
-+++ gpasman-1.9.3/src/gtk-patch.h	2006-02-07 17:27:23.000000000 +0100
-@@ -3,7 +3,7 @@
- #ifndef GTK_PATCH_H
- #define GTK_PATCH_H
- 
--gboolean gtk_list_store_iter_is_valid (GtkListStore *list_store, GtkTreeIter  *iter);
-+// gboolean gtk_list_store_iter_is_valid (GtkListStore *list_store, GtkTreeIter  *iter);
- 
- #endif /* GTK_PATCH_H */
- 
diff --git a/x11-misc/gpasman/gpasman-1.9.3.ebuild b/x11-misc/gpasman/gpasman-1.9.3.ebuild
index 6a46a80a9fde..f8124257d14a 100644
--- a/x11-misc/gpasman/gpasman-1.9.3.ebuild
+++ b/x11-misc/gpasman/gpasman-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gpasman/gpasman-1.9.3.ebuild,v 1.1 2006/02/07 16:46:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gpasman/gpasman-1.9.3.ebuild,v 1.2 2006/02/10 22:23:53 nelchael Exp $
 
 inherit eutils autotools
 
@@ -18,16 +18,22 @@ DEPEND="=x11-libs/gtk+-2*"
 src_unpack() {
 
 	unpack "${A}"
-	epatch "${FILESDIR}/${P}-gtk.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 
 	cd "${S}"
 	intltoolize --copy --force
 	eautoreconf
+	intltoolize --copy --force # YES! Twice
+	eaclocal
 
 }
 
 src_install() {
 
+	# Broken Makefile, so fix it:
+	sed -i -e 's/@install_sh@/install/' po/Makefile
+
+	# Install:
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc ChangeLog AUTHORS README NEWS