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.

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

5 files changed, 74 insertions, 30 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/Manifest b/app-text/gtranslator/Manifest
index 020856948133..d65b1fdd0d6b 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gtranslator-1.9.13-desktop-database.patch 1375 RMD160 043e1a45cf81482fd43fd8bef8642a07126ce715 SHA1 5f87d5f426ca26f4f1d5382fcd963ef08c8ecb04 SHA256 703c1308d8afc1d79c10039c33705b5b241ca5ae377f88e9331f4f9f38d65cc3
+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.5.tar.bz2 4623962 RMD160 737f970ca2a9fa9cf3c2b35e9eddb5c8708c5417 SHA1 122efb451bd216fff512fdf4d9a2084aff2b40c6 SHA256 26425b2687f00658dd34eb5cc598d456f9e13bcc432991f455258cb0770b0505
-EBUILD gtranslator-1.9.13.ebuild 1835 RMD160 44e669c57bbe9100d7a961fe44d4b9c8b5c2b62b SHA1 302a914792b8995760f50b606cbfd439a47af67b SHA256 a941e4bac2c3a07e3a77710653a2cf6ce40ac5ecd2efcbecfe88eca82dd8eca1
-EBUILD gtranslator-2.90.5.ebuild 2107 RMD160 708c9e1e64e6c8e8cf4cca58fe204a3282c332e9 SHA1 6c29e63dcb472b7a587a55a6e2509169e45ec8ea SHA256 1e1565620beff2c384cce125ce3b531046d4a1d2a9ac208c5bfb40e95d6deb59
-MISC ChangeLog 6022 RMD160 845749db2531a601f25cba924ac2db7a855ac47a SHA1 b65c4a2f8d7a9a0ea7b07e4f10af9111d41b9eca SHA256 cff44b1caec6d40acc924326c7bcc4bbbf997e71c95496caab84897bc767bc62
+DIST gtranslator-2.90.7.tar.bz2 5194082 RMD160 92a3a09d2c907374b61597911b2fec3f1b55642d SHA1 0981ae52bb83ad02039857b6fa938230cbb7e65a SHA256 55845ad665f5e55265dd017d1c96e41a72c4c5691eb218ba9db6985b66afa556
+EBUILD gtranslator-1.9.13.ebuild 1843 RMD160 dd9178fe3b053b41a0e8d702b15a5e6bc085ccf1 SHA1 1acf2f451953f4aff4282813e5dd9121e3bb146a SHA256 67ca3a23414dd06f41f76394092382b5a791770483ab2fe0a071fa66e93aec61
+EBUILD gtranslator-2.90.7.ebuild 2263 RMD160 203edc71e258dd1393759669e63b09c1ee35dbf5 SHA1 ae4f848e1ca3286a7ec2f9ed57517c4ba337405b SHA256 0a7ac45969f5e0a66847242befec8d51b40db2df3483a2208cb5684249a1b671
+MISC ChangeLog 6413 RMD160 83f15dc471111a452e92e682cc06e9f1ce54eb4d SHA1 23c7f97f768e841f40841abfb7217edc3e98eb64 SHA256 9b99c01c488091a15379b03e184223ebf47bee86ea39815a4ea6e09d17e14d32
 MISC metadata.xml 276 RMD160 23ac7cf8852c854a0b77e4395bf7474372ea2b32 SHA1 721905200eb3702b3c7f029a626f5fd37c2212f4 SHA256 ca0f4d21839ee08ead7762f87786e0862800abc51eb3de256d2b265d355f2661
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOh0cLAAoJEO/kOhxWD91kz1QP+gIgzSMzW8MJBtgTNJHG9VPT
-mq/DZE7kwEzHeUAHrGKVKmkHDeiowoVFmk2mXTKD5xHc8dmS1CluFyRsuGSKdi72
-/QosrEUUXwoNZztVyagP86Hz1d3j7+cXPd1pDoz/qYdBo5HvGYcQuAMCORWfOOGD
-M5GxO+jWpJWbWmdw4n/JjYgJrovpwipzpHN8GOHd6wNJxaV14NUN62PAU5Rkx4Qa
-zSvvKT0DPzo0zmoHjNM8QVQppNv+otC5gZ2qDKDTrhU4yQJHVPY3aznhcCYBYEov
-J029GAcmRiNA81iSh/1vFctARI4zqLxYaXqt9BTEiwTnJ5FPi4zzhN1k5UF2ZjMF
-qe81mRFXJLmRI3GJZHBKTRj2VUBZ3TXZR/sjFzCmF9k6v/7jVItBs9YATkUHlRow
-QWd4b04Orxoj9FCS0BPaIfzv/NfS+hx/EppDJH2dmDFiscQF+X8WlYIbyZqeME1t
-kVDoGrwxcDbNWo0vdnFpb4kLRoqDMhxOZ+X0INDsepYluV5BolxllByxleI0E4rq
-gdo6gA4dmYtu9IEnxK6GHR3IDOoMB4x7F7tQtggopxFce3vr+ytFtJIFj6F9nre0
-dsl/bGBid3wxdwnuBek0nA9MH9P/1PoK2ugxR90FzwdPnTeOrxYq9X0BlLaVrUe4
-c7quFEtLout5DitnfgHU
-=0Wwg
+iF4EAREIAAYFAk6pBcgACgkQdjK8w9WeBnDV4gD/b+Rip8H7msMTkH8fmNkzVg4B
+rk5DrKZT3X9NZrP9aukBAKp1rAvgwJ5ScaCEBi9tXJeWoqiCuBnTeN21TRUiG3j/
+=2uI3
 -----END PGP SIGNATURE-----
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