bump to 0.1.16.1, bug #250847; intltool problems solved by leio

(Portage version: 2.1.6.1/cvs/Linux 2.6.28-rc9 i686)

3 files changed, 81 insertions, 1 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 3c8eddc32339..7838388daf67 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,12 @@
 # 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.59 2008/06/25 21:54:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.60 2008/12/21 10:44:23 maekke Exp $
+
+*gtkam-0.1.16.1 (21 Dec 2008)
+
+  21 Dec 2008; Markus Meier <maekke@gentoo.org>
+  +files/gtkam-0.1.16.1-gettext.patch, +gtkam-0.1.16.1.ebuild:
+  bump to 0.1.16.1, bug #250847; intltool problems solved by leio
 
   25 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
   -files/gtkam-0.1.10-norpm.patch, -files/gtkam-0.1.12-as-needed.patch,
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
new file mode 100644
index 000000000000..4944033d9ef9
--- /dev/null
+++ b/media-gfx/gtkam/files/gtkam-0.1.16.1-gettext.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..841540443465
--- /dev/null
+++ b/media-gfx/gtkam/gtkam-0.1.16.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 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 $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A frontend for gPhoto 2"
+HOMEPAGE="http://gphoto.org/proj/gtkam"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="gimp gnome nls"
+
+# FIXME: why is exif not optional ?
+
+RDEPEND=">=x11-libs/gtk+-2.0
+	>media-libs/libgphoto2-2.4
+	>=media-libs/libexif-0.3.2
+	media-libs/libexif-gtk
+	gimp? ( >=media-gfx/gimp-2 )
+	gnome? (
+		>=gnome-base/libbonobo-2
+		>=gnome-base/libgnomeui-2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/scrollkeeper
+	nls? ( >=sys-devel/gettext-0.14.1 )"
+
+DOCS="AUTHORS CHANGES NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with gimp)
+		$(use_with gnome)
+		$(use_with gnome bonobo)
+		$(use_enable nls)
+		--disable-scrollkeeper
+		--with-rpmbuild=/bin/false"
+}
+
+src_unpack() {
+	gnome2_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
+}
+
+src_install() {
+	gnome2_src_install
+
+	rm -rf "${D}"/usr/share/doc/gtkam
+}