Add gtranslator-2.90.7 from the gnome overlay; it's now GPL-3 licensed. Add a patch for gtkspell-3 compatibility. Punt old 2.90.5. Slot gtkspell dependencies.

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

4 files changed, 64 insertions, 11 deletions

diff --git a/app-text/gtranslator/ChangeLog b/app-text/gtranslator/ChangeLog
index 0d22a18a6ce8..b2598ee303a8 100644
--- a/app-text/gtranslator/ChangeLog
+++ b/app-text/gtranslator/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/gtranslator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.45 2011/10/01 16:59:51 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.46 2011/10/27 07:18:26 tetromino Exp $
+
+*gtranslator-2.90.7 (27 Oct 2011)
+
+  27 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtranslator-1.9.13.ebuild, -gtranslator-2.90.5.ebuild,
+  +files/gtranslator-2.90.6-gtkspell3.patch, +gtranslator-2.90.7.ebuild:
+  Add gtranslator-2.90.7 from the gnome overlay; it's now GPL-3 licensed. Add a
+  patch for gtkspell-3 compatibility. Punt old 2.90.5. Slot gtkspell
+  dependencies.
 
 *gtranslator-2.90.5 (01 Oct 2011)
 
diff --git a/app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch b/app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch
new file mode 100644
index 000000000000..d546edf60b59
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch
@@ -0,0 +1,40 @@
+diff -u -r gtranslator-2.90.5-orig/configure.ac gtranslator-2.90.5/configure.ac
+--- gtranslator-2.90.5-orig/configure.ac	2011-08-28 18:59:30.000000000 +0400
++++ gtranslator-2.90.5/configure.ac	2011-08-28 19:02:23.000000000 +0400
+@@ -87,7 +87,7 @@
+ GDA_REQUIRED=4.2.3
+ PEAS_REQUIRED=1.0.0
+ GDICT_OPTIONAL=0.11.0
+-GTKSPELL_OPTIONAL=2.0.16
++GTKSPELL_OPTIONAL=3.0.0
+ JSON_GLIB_OPTIONAL=0.12.0
+ 
+ AC_ARG_WITH(gda,
+@@ -167,7 +167,7 @@
+ fi
+ 
+ dnl -------------------------------------------------------------------
+-dnl Check for gtkspell >= 2.0 and use it if found
++dnl Check for gtkspell >= 3.0 and use it if found
+ dnl -------------------------------------------------------------------
+ have_gtkspell=no
+ AC_ARG_WITH(gtkspell3,
+@@ -177,7 +177,7 @@
+ if test x"$with_gtkspell" != "xno"
+ then
+         PKG_CHECK_MODULES([GTKSPELL], [
+-                gtkspell3-2.0 >= $GTKSPELL_OPTIONAL
++                gtkspell-3.0 >= $GTKSPELL_OPTIONAL
+         ], have_gtkspell=yes, have_gtkspell=no)
+ 
+         if test x"$have_gtkspell" = "xyes"
+@@ -335,7 +335,7 @@
+ 	echo "Building spell support: ................................YES"
+ else
+ 	echo "Building spell support: ................................NO"
+-		echo "        Requires gtkspell >= $GTKSPELL_OPTIONAL"
++		echo "        Requires gtkspell3 >= $GTKSPELL_OPTIONAL"
+ fi
+ 
+ echo "
+Только в gtranslator-2.90.5: configure.ac~
diff --git a/app-text/gtranslator/gtranslator-1.9.13.ebuild b/app-text/gtranslator/gtranslator-1.9.13.ebuild
index 69251556e51f..540d822c46d3 100644
--- a/app-text/gtranslator/gtranslator-1.9.13.ebuild
+++ b/app-text/gtranslator/gtranslator-1.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.8 2011/06/07 20:43:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.9 2011/10/27 07:18:26 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -29,7 +29,7 @@ RDEPEND="
 		gnome-extra/gnome-utils
 		>=gnome-extra/gucharmap-2 )
 	http? ( >=dev-libs/json-glib-0.7.6 )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
+	spell? ( >=app-text/gtkspell-2.0.2:2 )"
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.1.4
 	>=dev-util/intltool-0.40
diff --git a/app-text/gtranslator/gtranslator-2.90.5.ebuild b/app-text/gtranslator/gtranslator-2.90.7.ebuild
index 1db4f8a7b113..cf1030f2b487 100644
--- a/app-text/gtranslator/gtranslator-2.90.5.ebuild
+++ b/app-text/gtranslator/gtranslator-2.90.7.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.5.ebuild,v 1.1 2011/10/01 16:59:51 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.7.ebuild,v 1.1 2011/10/27 07:18:26 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="gnome? 2"
 
-inherit eutils gnome2 multilib python
+inherit autotools eutils gnome2 multilib python
 
 DESCRIPTION="An enhanced gettext po file editor for GNOME"
 HOMEPAGE="http://gtranslator.sourceforge.net/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gnome"
+IUSE="doc gnome spell"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.28.0:2
@@ -32,7 +32,8 @@ COMMON_DEPEND="
 
 	gnome? (
 		gnome-extra/gnome-utils
-		x11-libs/gtk+:3[introspection] )"
+		x11-libs/gtk+:3[introspection] )
+	spell? ( app-text/gtkspell:3 )"
 RDEPEND="${COMMON_DEPEND}
 	gnome? (
 		>=dev-libs/libpeas-1.0.0[gtk,python]
@@ -49,15 +50,18 @@ DEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
-	# gtkspell hasn't been ported to gtk+3 yet
 	G2CONF="${G2CONF}
 		--disable-static
-		--without-gtkspell
 		$(use_with gnome dictionary)
-		$(use_enable gnome introspection)"
+		$(use_enable gnome introspection)
+		$(use_with spell gtkspell3)"
 }
 
 src_prepare() {
+	# Fix gtkspell detection, https://bugzilla.gnome.org/show_bug.cgi?id=660709
+	epatch "${FILESDIR}/${PN}-2.90.6-gtkspell3.patch"
+	eautoreconf
+
 	gnome2_src_prepare
 
 	# disable pyc compiling