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

Package-Manager: portage-2.2.0_alpha88/cvs/Linux x86_64

4 files changed, 125 insertions, 12 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/Manifest b/app-text/gtranslator/Manifest
index e852cf90222a..906117be9af0 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -5,14 +5,17 @@ AUX gtranslator-1.9.13-desktop-database.patch 1375 RMD160 043e1a45cf81482fd43fd8
 AUX gtranslator-2.90.6-gtkspell3.patch 1372 RMD160 98c18692b8274e5420bb3741d0c07d876da507e3 SHA1 fb22e42b1fde88c44bcf30a59696c858a58e51b2 SHA256 0247b7e0e73066bec2bc084330752fe32cc6fa45c30980a6df31d7e70bc591cb
 DIST gtranslator-1.9.13.tar.bz2 4655865 RMD160 aa98aff79d5f7148310776fa4d699547e1241ab0 SHA1 b8a7927452b8a5c02c491fc1191ea0e7a60a42ce SHA256 c0b371b81630cf2e4efb6968c20f7580c62c34d9161c852a5d008622cd91408e
 DIST gtranslator-2.90.7.tar.bz2 5194082 RMD160 92a3a09d2c907374b61597911b2fec3f1b55642d SHA1 0981ae52bb83ad02039857b6fa938230cbb7e65a SHA256 55845ad665f5e55265dd017d1c96e41a72c4c5691eb218ba9db6985b66afa556
+DIST gtranslator-2.90.8.tar.xz 4559228 RMD160 cb98ea670a0768ba74c99c2154dc041202be3b84 SHA1 93bdf839b83f7d429232c18ab4d4cd1e53641654 SHA256 89f6be55d901d62e09065ed92f471eb569834eaa7babc8a48b2255c26a105037
+DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 EBUILD gtranslator-1.9.13.ebuild 1835 RMD160 e1205fec6e58880a604d680dc453e404a6b86ee4 SHA1 c02aa6bd4b4417ffc293e4b04af3302357f1b8cd SHA256 f70115c812ea48fd6bbb392ebecba5e9b130d9face56ac7ba98fb8f7f6440dc8
-EBUILD gtranslator-2.90.7.ebuild 2258 RMD160 ac14e2629e2808fea3c198806047cdc982736065 SHA1 56667088f4db05d288519b1ec2fd03fe2e0d5671 SHA256 7fbd53b8a48799df88cbc7b0f4fee729091c5debe904b2dffd9c13cc5ac3c5fe
-MISC ChangeLog 6673 RMD160 b7945747015067af110c1673ad4c0b4bc5904536 SHA1 d14c1e86dd807865b865e5eaeab8d9c26f33d1e3 SHA256 227407bb603d804222ab4403b9c0fa3233ab0cac169c324384c92df95c84d4c2
+EBUILD gtranslator-2.90.7.ebuild 2585 RMD160 0f594ec21d5733b45a3f9b8aa3f93f247f3190a2 SHA1 6cffb9c3f29ea89b6d54db248b654e40f6ba9889 SHA256 2ff5af97bcb6f00a9a65653ecc0eb8330925e8cc34d4e86fc8a281a658aa8c23
+EBUILD gtranslator-2.90.8.ebuild 2192 RMD160 99c8ad80d84ea1b26510fe18ad2fe8b383d48028 SHA1 36f20b55e96c24e7ac298ff6c70b039d4dcd60c3 SHA256 8ff056579fb658f5787e3f6c28f3dc7acd182b65a742c27b61f583eda331cdb2
+MISC ChangeLog 6932 RMD160 8457bf97bb0a67ae1ef7744e4762fd3032950869 SHA1 7f0107268e3826d47197f78b59f4fef7eed70483 SHA256 0b80e66e3c72b11e740eaf9ae246a220a5cbcb7d589ce7f6c6171667ee3a1be3
 MISC metadata.xml 276 RMD160 23ac7cf8852c854a0b77e4395bf7474372ea2b32 SHA1 721905200eb3702b3c7f029a626f5fd37c2212f4 SHA256 ca0f4d21839ee08ead7762f87786e0862800abc51eb3de256d2b265d355f2661
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7/prsACgkQdjK8w9WeBnCwMQEAjWn77odPe69e612kBxWn9c/I
-WQEyA8kWQko1lElmIWcBAIK30OCNNQbHT/EoKlhTo338qncYBlUnhGRcyw2uIZGe
-=m9JW
+iF4EAREIAAYFAk9IJAsACgkQdjK8w9WeBnDoTAD/fGIOYID3WHmjUWtj1MC7zDMO
+mA86uCcWYxv2Lin81DABALf7MX1uhNz0XAh1uEDlV1Ad1gOWM5KsvS8GFmdEHdiR
+=ns+H
 -----END PGP SIGNATURE-----
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
+}