Version bump. Fix missing deps for eautoreconf (bug #405663, thanks to Piotr Szymaniak for reporting).

(Portage version: 2.2.0_alpha88/cvs/Linux x86_64)

3 files changed, 117 insertions, 7 deletions

diff --git a/app-text/gtranslator/ChangeLog b/app-text/gtranslator/ChangeLog
index e0a7edda19f6..54d0b7e0b119 100644
--- a/app-text/gtranslator/ChangeLog
+++ b/app-text/gtranslator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/gtranslator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.48 2012/01/01 00:20:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.49 2012/02/24 23:57:57 tetromino Exp $
+
+*gtranslator-2.90.8 (24 Feb 2012)
+
+  24 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtranslator-2.90.7.ebuild, +gtranslator-2.90.8.ebuild:
+  Version bump. Fix missing deps for eautoreconf (bug #405663, thanks to Piotr
+  Szymaniak for reporting).
 
   01 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gtranslator-2.90.7.ebuild:
diff --git a/app-text/gtranslator/gtranslator-2.90.7.ebuild b/app-text/gtranslator/gtranslator-2.90.7.ebuild
index 00a61cc7c1f0..2e980b6a57e1 100644
--- a/app-text/gtranslator/gtranslator-2.90.7.ebuild
+++ b/app-text/gtranslator/gtranslator-2.90.7.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.7.ebuild,v 1.2 2012/01/01 00:20:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.7.ebuild,v 1.3 2012/02/24 23:57:57 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="gnome? 2"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit autotools eutils gnome2 multilib python
 
 DESCRIPTION="An enhanced gettext po file editor for GNOME"
 HOMEPAGE="http://gtranslator.sourceforge.net/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2" # for eautoreconf
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -46,7 +48,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	app-text/gnome-doc-utils
 	app-text/docbook-xml-dtd:4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
+	doc? ( >=dev-util/gtk-doc-1 )
+
+	gnome-base/gnome-common"
+# eautoreconf requires gnome-base/gnome-common
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
@@ -55,18 +60,27 @@ pkg_setup() {
 		$(use_with gnome dictionary)
 		$(use_enable gnome introspection)
 		$(use_with spell gtkspell3)"
+
+	if use gnome; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }
 
 src_prepare() {
 	# Fix gtkspell detection, https://bugzilla.gnome.org/show_bug.cgi?id=660709
 	epatch "${FILESDIR}/${PN}-2.90.6-gtkspell3.patch"
+
+	# introspection.m4 needed for eautoreconf
+	mv "${WORKDIR}/introspection.m4" "${S}/m4/" || die
+
 	eautoreconf
 
 	gnome2_src_prepare
 
-	# disable pyc compiling
-	echo '#!/bin/sh' > py-compile
-	if ! use gnome; then
+	if use gnome; then
+		python_clean_py-compile_files
+	else
 		# don't install charmap plugin, it requires gnome-extra/gucharmap
 		sed -e 's:\scharmap\s: :g' -i plugins/Makefile.* ||
 			die "sed plugins/Makefile.* failed"
diff --git a/app-text/gtranslator/gtranslator-2.90.8.ebuild b/app-text/gtranslator/gtranslator-2.90.8.ebuild
new file mode 100644
index 000000000000..66740de76278
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-2.90.8.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.8.ebuild,v 1.1 2012/02/24 23:57:57 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="gnome? 2"
+
+inherit gnome2 multilib python
+
+DESCRIPTION="An enhanced gettext po file editor for GNOME"
+HOMEPAGE="http://gtranslator.sourceforge.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gnome spell"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.0.3:3
+	>=x11-libs/gtksourceview-3.0.0:3.0
+	>=dev-libs/gdl-2.91.91:3
+	>=dev-libs/libxml2-2.4.12:2
+	>=dev-libs/json-glib-0.12.0
+	>=dev-libs/libpeas-1.0.0[gtk]
+	gnome-extra/libgda:5
+	>=app-text/iso-codes-0.35
+
+	gnome-base/gsettings-desktop-schemas
+
+	gnome? (
+		gnome-extra/gnome-utils
+		x11-libs/gtk+:3[introspection] )
+	spell? ( app-text/gtkspell:3 )"
+RDEPEND="${COMMON_DEPEND}
+	gnome? (
+		>=dev-libs/libpeas-1.0.0[gtk,python]
+		|| ( dev-python/pygobject:2[introspection] dev-python/pygobject:3 )
+		gnome-extra/gucharmap:2.90[introspection] )"
+DEPEND="${COMMON_DEPEND}
+	>=app-text/scrollkeeper-0.1.4
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	dev-util/pkgconfig
+	app-text/gnome-doc-utils
+	app-text/docbook-xml-dtd:4.1.2
+	doc? ( >=dev-util/gtk-doc-1 )"
+# eautoreconf requires gnome-base/gnome-common
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_with gnome dictionary)
+		$(use_enable gnome introspection)
+		$(use_with spell gtkspell3)"
+
+	if use gnome; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	if use gnome; then
+		python_clean_py-compile_files
+	else
+		# don't install charmap plugin, it requires gnome-extra/gucharmap
+		sed -e 's:\scharmap\s: :g' -i plugins/Makefile.* ||
+			die "sed plugins/Makefile.* failed"
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use gnome; then
+		python_need_rebuild
+		python_mod_optimize /usr/$(get_libdir)/gtranslator/plugins
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use gnome && python_mod_cleanup /usr/$(get_libdir)/gtranslator/plugins
+}