Revision bump to fix broken intltool and missing translations

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 14 insertions, 45 deletions

diff --git a/media-gfx/geeqie/ChangeLog b/media-gfx/geeqie/ChangeLog
index 46bf294f0a70..1e419291666e 100644
--- a/media-gfx/geeqie/ChangeLog
+++ b/media-gfx/geeqie/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/geeqie
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.2 2009/07/02 19:03:28 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.3 2009/07/06 19:42:22 voyageur Exp $
+
+*geeqie-1.0_beta2-r1 (06 Jul 2009)
+
+  06 Jul 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -geeqie-1.0_beta1.ebuild, -geeqie-1.0_beta2.ebuild,
+  +geeqie-1.0_beta2-r1.ebuild:
+  Revision bump to fix broken intltool and missing translations
 
 *geeqie-1.0_beta2 (02 Jul 2009)
 
diff --git a/media-gfx/geeqie/geeqie-1.0_beta1.ebuild b/media-gfx/geeqie/geeqie-1.0_beta2-r1.ebuild
index 3237a4dcdb58..b766df6a88b3 100644
--- a/media-gfx/geeqie/geeqie-1.0_beta1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.0_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0_beta1.ebuild,v 1.1 2009/05/25 15:46:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0_beta2-r1.ebuild,v 1.1 2009/07/06 19:42:22 voyageur Exp $
 
 EAPI=2
 
@@ -28,6 +28,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
+src_prepare() {
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i "${S}/po/Makefile.in.in" || die "sed failed"
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
diff --git a/media-gfx/geeqie/geeqie-1.0_beta2.ebuild b/media-gfx/geeqie/geeqie-1.0_beta2.ebuild
deleted file mode 100644
index dbd403988430..000000000000
--- a/media-gfx/geeqie/geeqie-1.0_beta2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0_beta2.ebuild,v 1.1 2009/07/02 19:03:28 voyageur Exp $
-
-EAPI=2
-
-MY_P="${P/_/}"
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://geeqie.sourceforge.net/"
-SRC_URI="mirror://sourceforge/geeqie/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif lcms lirc xmp"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=x11-libs/gtk+-2.4.0
-	xmp? ( >=media-gfx/exiv2-0.17[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
-	lcms? ( media-libs/lcms )
-	lirc? ( app-misc/lirc )
-	virtual/libintl"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable exif exiv2) \
-		$(use_enable lcms) \
-		$(use_enable lirc) \
-		|| die "econf faild"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -f "${D}/usr/share/doc/${MY_P}/COPYING"
-}