summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2009-01-17 12:39:44 +0000
committerMarkus Meier <maekke@gentoo.org>2009-01-17 12:39:44 +0000
commitc23fd4944fcaed6f2df6f593103506ec1fc2dc91 (patch)
tree2700e924ad70a2706bacc4ba5bd25cb4ccfb4ad1 /media-gfx/gtkam
parentFix errors when test phase is executed by root. (diff)
downloadgentoo-2-c23fd4944fcaed6f2df6f593103506ec1fc2dc91.tar.gz
gentoo-2-c23fd4944fcaed6f2df6f593103506ec1fc2dc91.tar.bz2
gentoo-2-c23fd4944fcaed6f2df6f593103506ec1fc2dc91.zip
depend on >=dev-util/intltool-0.40 and drop unneeded gettext patch , bug #252255
(Portage version: 2.2_rc22/cvs/Linux 2.6.28 i686)
Diffstat (limited to 'media-gfx/gtkam')
-rw-r--r--media-gfx/gtkam/ChangeLog9
-rw-r--r--media-gfx/gtkam/files/gtkam-0.1.16.1-gettext.patch16
-rw-r--r--media-gfx/gtkam/gtkam-0.1.16.1.ebuild8
3 files changed, 11 insertions, 22 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/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() {