depend on >=dev-util/intltool-0.40 and drop unneeded gettext patch , bug #252255

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28 i686

4 files changed, 16 insertions, 28 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 7838388daf67..8110c21bee79 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gtkam
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.60 2008/12/21 10:44:23 maekke Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.61 2009/01/17 12:39:44 maekke Exp $
+
+  17 Jan 2009; Markus Meier <maekke@gentoo.org>
+  -files/gtkam-0.1.16.1-gettext.patch, gtkam-0.1.16.1.ebuild:
+  depend on >=dev-util/intltool-0.40 and drop unneeded gettext patch , bug
+  #252255
 
 *gtkam-0.1.16.1 (21 Dec 2008)
 
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index c9f39cba1e89..93b47998e82c 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -2,20 +2,19 @@
 Hash: SHA1
 
 AUX gtkam-0.1.14-as-needed.patch 734 RMD160 d7bd7b5a861b07633c4412df35052043e3ff977e SHA1 30a806715c12259cdd51f12be0fb3e0919da8c63 SHA256 7a16215767eee50244c781c402d00a011d046dd23e177636fd897995edfeeb7e
-AUX gtkam-0.1.16.1-gettext.patch 797 RMD160 805985b85d5ea0ab1a42a1757eb6f08c5b20245a SHA1 16fc87138733ca60cde9ede5320ff8922ba46ffa SHA256 0121e2ce3ddd34c631203da31654cde78eb23c200b78fc7f8c8a99ce4574031b
 AUX gtkam.png 4418 RMD160 57fafbbb197c03fa9aaa204eeb655a102a7248bf SHA1 caa74f564157977c6ff7f95f2c0dd0097209744a SHA256 a9b0dac766916d79b10cf26bc9cf6ef06ee4a7c337d33ea219b18c28359ae678
 DIST gtkam-0.1.14.tar.gz 1301806 RMD160 7cab97cf3da2a87b23d854e615ac9be9d5d47ae6 SHA1 7a46ee2cc9d88ed31d6ee46b15bc51ac296488ba SHA256 58316e0f1c8d179480384cb81098bfdcfb62cc00f21fe6a446c50261fef1c383
 DIST gtkam-0.1.15.tar.gz 1032151 RMD160 54d587b62720bbee5fdaf53ff8b26a93f005fcb8 SHA1 232c132662c5624e22d79c3fe25fbef48649b906 SHA256 8ee5823f63f0810e04add567017995e5a9d3a749766bedf77915ee50784a5528
 DIST gtkam-0.1.16.1.tar.gz 1392585 RMD160 8f944086186ed69312ee84de93c2dd21f4166d10 SHA1 dd8b55009373e93de720c0494e4366513e991f60 SHA256 d3220a386faf1d7d03381e85fd5d19b7e9d607af8e5a67e4ee1ce4c0707f490f
 EBUILD gtkam-0.1.14.ebuild 1352 RMD160 fc363bc9763f12273f4b8a62e2a500bca484bcbc SHA1 d863c651f10815af50f3f7209d4830d1ca5c7a27 SHA256 5395621b0cc934b03b663a071158bec533c48e3e9083b6e997b3520e45226213
 EBUILD gtkam-0.1.15.ebuild 1241 RMD160 1496f2c3eb233715293187d8ac35d05876fecf29 SHA1 8dfb4b2167a1b238d557c0a6284a027e5b3e357a SHA256 24b81c981c66bc83e6cd6e8fa7088b6fc6b952d49f6ba40c3d104ee9c30819b6
-EBUILD gtkam-0.1.16.1.ebuild 1352 RMD160 af42e3e277bc500c96bcb44c9e14dae09cef1712 SHA1 ba97e4d0f556a2918c466b8adc30831304fa26b0 SHA256 1159815b62c8d206c149728f1b93ace1c82ca8a4515429f5b932f99d72ea2026
-MISC ChangeLog 8639 RMD160 5cfdc49a8de74d7a7dc6b921b9c7b34b5e2eec46 SHA1 278de1f1949e5e5f580a903a8a349dd7361fcb39 SHA256 0ccf407c7aaa16b9a6c8c910c7ce0c5fbbfe4f08fc31c66999090c3e053dc810
+EBUILD gtkam-0.1.16.1.ebuild 1335 RMD160 e19ca6a3b1c54fd9ce501ed3f7df6f14cf637efb SHA1 2bf46ba8d6389f5964e41283153043e43a42be4e SHA256 8a612bbc1a5362f88c240df88a3b73208d433b9ecc21f6880b172e99d4146f28
+MISC ChangeLog 8835 RMD160 b346144f36183c10b0a990d77609e10070516bf5 SHA1 079df8ff4b90d3d66f0603b15c1b668448818cc9 SHA256 e0ea4385f2c4666be803c8d3ca9502535714d20de292c2798df15a28b1663a22
 MISC metadata.xml 180 RMD160 d96ed4f5fb92b0ee31c21e511229ad6964a1a304 SHA1 32a1398914ca5567f35112c01cbe529936ad6eb6 SHA256 666b6a2461df60cd8ed0afce78c3d4aac623567d3c9f51b35972f057ccc97789
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklOHksACgkQkKaRLQcq0GKuBgCaA+IubeWp/ZYrc2bl+U4ri5u8
-3LUAoJALUWy0XH/SNnmLOWbFUA9Nq/uO
-=8dFP
+iEYEARECAAYFAklx0dcACgkQkKaRLQcq0GJuOgCgoGcwQBA434dj3nozuEE8LPqU
+PhsAnjr6N2Ovwi7Jpuvs0d4fwaAo2RoD
+=m7zM
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gtkam/files/gtkam-0.1.16.1-gettext.patch b/media-gfx/gtkam/files/gtkam-0.1.16.1-gettext.patch
deleted file mode 100644
index 4944033d9ef9..000000000000
--- a/media-gfx/gtkam/files/gtkam-0.1.16.1-gettext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru gtkam-0.1.16.1.orig/configure.ac gtkam-0.1.16.1/configure.ac
---- gtkam-0.1.16.1.orig/configure.ac	2008-12-21 11:19:14.000000000 +0100
-+++ gtkam-0.1.16.1/configure.ac	2008-12-21 11:19:28.000000000 +0100
-@@ -61,12 +61,7 @@
- dnl ---------------------------------------------------------------------------
- dnl i18n support
- dnl ---------------------------------------------------------------------------
--GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}])
- ALL_LINGUAS="be cs da de es fr hu it ja nb nl pa pl pt_BR pt ru sk sl sv uk vi zh_CN"
--AM_GNU_GETTEXT_VERSION([0.14.1])
--AM_GNU_GETTEXT([external])
--AM_ICONV()
--GP_GETTEXT_FLAGS()
- 
- dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as
- dnl we require make to do insert the proper $(datadir) value
diff --git a/media-gfx/gtkam/gtkam-0.1.16.1.ebuild b/media-gfx/gtkam/gtkam-0.1.16.1.ebuild
index 841540443465..5f58fe038c6c 100644
--- a/media-gfx/gtkam/gtkam-0.1.16.1.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.16.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.16.1.ebuild,v 1.1 2008/12/21 10:44:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.16.1.ebuild,v 1.2 2009/01/17 12:39:44 maekke Exp $
 
 inherit autotools eutils gnome2
 
@@ -24,6 +24,7 @@ RDEPEND=">=x11-libs/gtk+-2.0
 		>=gnome-base/libbonobo-2
 		>=gnome-base/libgnomeui-2 )"
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	app-text/scrollkeeper
 	nls? ( >=sys-devel/gettext-0.14.1 )"
@@ -45,10 +46,9 @@ src_unpack() {
 
 	# Fix --as-needed, bug #169661
 	epatch "${FILESDIR}/${PN}-0.1.14-as-needed.patch"
-	epatch "${FILESDIR}/${P}-gettext.patch"
 
 	intltoolize --automake --force --copy || die "intltoolize failed"
-	eautoreconf
+	eautomake
 }
 
 src_install() {