Version bump with assorted bugfixes and UI improvements.

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

4 files changed, 42 insertions, 32 deletions

diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 9a44c2053e43..c0fb4964d2e2 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gedit-plugins-2.30.0-background-color.patch 1357 RMD160 76b29218301225311295e30c6ccefcf6f922d592 SHA1 796785b3b9240154ffd72398db7bd8f96a556af2 SHA256 e4ec1d87f37311aa5fd95f30e19a7bc21ca23bf94d458f28906fc8d99758a7a8
 AUX gedit-plugins-2.30.0-commander-menu.patch 3083 RMD160 ba1292f57108328a17d9f5f25133379a0487f812 SHA1 12eec192e43c9791d27cc940f5d2f97aa2716b69 SHA256 4686d1a1d7601fbb8ef0605afa1e0d26a9378b59714b3fbb40bbe4256505dc11
@@ -10,14 +10,20 @@ AUX gedit-plugins-2.30.0-keybinding-toggle.patch 2266 RMD160 17d0ab876ffebf85e43
 AUX gedit-plugins-2.30.0-replace-all.patch 1305 RMD160 97e01de393390f8642398c8c6a05712ac0e37149 SHA1 c642f47694241efcbf9389d316524af550e20c73 SHA256 1bfef4341f0fe8dd8b9f89ee3e99a4522338458a1d3b6ca34480a062160b8b81
 DIST gedit-plugins-2.32.0.tar.bz2 616927 RMD160 a7540bfd57bdc15546eea802c68719ac71f85c10 SHA1 78339867bcc159cc14ef45effc35fa52c3854ce4 SHA256 2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107
 DIST gedit-plugins-3.2.1.tar.xz 1434840 RMD160 a248bd2529bf8be93d3d9b980c4323331392b0d7 SHA1 759295aa00e8e15f4e3ee44330ca5e890d8a4b20 SHA256 45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841
+DIST gedit-plugins-3.4.0.tar.xz 1454320 RMD160 e90495733442a7b741424d6266226ad79e5409ba SHA1 21897d31de59489f9fe869fa4bba4b895bea4767 SHA256 a66138b43e1a77f39258f04936be35163b4c6bfd49643791ca445cb3c3d60e0a
 EBUILD gedit-plugins-2.32.0.ebuild 2255 RMD160 49f7be73274b479cacf8616e79426e73c60b549b SHA1 118eae17146236f7d0f110857ab88b555eb2d274 SHA256 82076452a6bdf38eb0a18af5c653a51747613dedf6dcb80c4f862acb4a1738f9
 EBUILD gedit-plugins-3.2.1-r1.ebuild 2636 RMD160 95b3c5a77afc1a6d09ffbbeb27ed4332658458b9 SHA1 735cb6ce9980cd0950473136f001e5723dabbbfa SHA256 fc41b4bb4d79c58d2370d14febba9da4fd62bf7117d94f478debd85b6b95c2ce
-MISC ChangeLog 4701 RMD160 8d881a771b264376c8b97b2befe9459cac2b18bc SHA1 f76677ee5d4bbfaecb1fcd2e9137ace87230c88d SHA256 151f899f5578c422c6abb43fa223b7dcc3c99bad89778ce04952948c8433a34b
+EBUILD gedit-plugins-3.4.0.ebuild 2492 RMD160 ac3ed4b73bc384c441c9edae370b2f98545e16f5 SHA1 5ff07ecce64f749d5d9cc706f487b5bdc8de6969 SHA256 8fbfa77b71df1ad24ebcb247da571d2760f98d429ab4fd2fd8ccf845cf519bc5
+MISC ChangeLog 5005 RMD160 e35348a9bfc922648f55f0c212e37e5d24a0e2ca SHA1 7f5529895455c334438058b45a40e67cdad21d53 SHA256 24ac5857796d6ca38319a92bb98ca6368748fd4f6e334f4f8cf48eb2fafcaee9
 MISC metadata.xml 482 RMD160 a9ccc9935bca24dbcb82df8cd39104186a19888d SHA1 3bc0ea8b11853ea59eec7d57716e8486709aff95 SHA256 f842b0e12beea9918cdef5f9d9aa5dd70a5bff42790692e1b873fd0b3899b7fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk8QbMEACgkQdjK8w9WeBnA84wEApjlIQTrxKjPbZmJJCwv0yHtS
-pNjfI4p5DKmR8Sfa1foA/iXozkY00NrZyKIk7amywNWXVg289NN/d6OJ4ble4nLe
-=Zwjy
+iQEcBAEBAgAGBQJPlJRyAAoJEJ0WA1zPCt1hsgkIALh6hXnhGH+4x0VJ0bL3W/1w
+1F8smg175qB5GB4ArTz6z1TQhnZC0PPhEj7ViPttWR2uLtDcgskEmoZYaG1/bEvk
+4G4J34nE1b4tVgHgcAjBXejd6Ki6ZW95lvTqooN/2gpVNZENUCrxjJhvs9czt8tQ
+GxUQuP1BsyaS++MpQ9tnTNt1QAjk2LKTSncQK8iebEfpmmyVsOH3k/N0zVE094oo
+Gcy57ZarBKRV9STADJf1WEVUN01KJTapoHRtLNU9RQb/2gh8gWULxzmuhWb2qbcj
+8pGK46ycM86OTehTKO7h1iaYefh2pF5LgAGOyiwfso+Z1ee4+OnVauOr2eG4U7A=
+=BC/a
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 6f6dfe300f65..f61c6f495a48 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.336 2012/02/07 20:55:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.337 2012/04/22 23:29:43 tetromino Exp $
+
+*gedit-3.4.1 (22 Apr 2012)
+
+  22 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -gedit-3.2.5.ebuild,
+  +gedit-3.4.1.ebuild:
+  Version bump with assorted bugfixes and UI improvements.
 
   07 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gedit-2.30.4.ebuild,
   gedit-3.2.5.ebuild, gedit-3.2.6.ebuild:
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 4f5e86da7453..f18d42c72b0d 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gedit-2.30.2-tests-skip.patch 1402 RMD160 ba1984f9207a57254be2f6904789f8403fc619c5 SHA1 42424dbb1472d55d3b2ba0a383154bd4c2935955 SHA256 faf11f3817052dd76aa9d34af938c4cd8136a71b7b7f4dc5a42e38abd90402e9
 DIST gedit-2.30.4.tar.bz2 4705692 RMD160 b2659b8847ef02c66a70acd2f4a492555e1e4d21 SHA1 ff7f4088d0b89224b84406557a7d9970323fdcc3 SHA256 a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c
-DIST gedit-3.2.5.tar.xz 2895420 RMD160 4521dcd81ac8141d30cf7f2ce835330cb91484f6 SHA1 a95b9ae7e859c64b621961999462f37b6fc7c596 SHA256 0cec1916b4ba878531d32163767a8d39b72eea8d6893103238c82d3a27127c81
 DIST gedit-3.2.6.tar.xz 2887264 RMD160 54f9ba105480371d4eb568d8ba43d1a3bc061a36 SHA1 15bca4c0754be9e5c251347ce2bfb1edf2b9dd5f SHA256 92b5c44203dbc222c79cb35ba43d32de115e2ef89b7bb80451239d0c3fa02f7f
+DIST gedit-3.4.1.tar.xz 2900712 RMD160 46f04725fed8c7e799d0f2f8e00596ed4dce7b9b SHA1 db25c643a7c7fa6cdd65c1ec23be9c6e9fd6ff90 SHA256 9b1f0164d6c6bc08e391efde7e6a2aa9290a65bda543fe3a7adc6ef73b722a64
 EBUILD gedit-2.30.4.ebuild 2174 RMD160 cdaabe1df127200aeed167ce36f3e350f33c2fe4 SHA1 925b8078bb974be43fa2587391493194b6877ca8 SHA256 0ad2b9e20410ba743df20cac278b4f16fd9326e8b14276dbec1afdc7b5907b1a
-EBUILD gedit-3.2.5.ebuild 2810 RMD160 3fa0803ba06f8b8b58d2ed517975d97643558d15 SHA1 971bb5daf3e68f034a31ccc3c80b028406f66478 SHA256 ac0bacac2402ac412838dd9901f86f6bf47b3fbf442e5ba1f93de18f8bc85d36
 EBUILD gedit-3.2.6.ebuild 2794 RMD160 d108be149b051342cda49da31ec49b5436552ddb SHA1 edf85acb0acf65354dac876fb1f3bcf8332aa52f SHA256 36d6bf3514b9e0439f740a2645b0fc8ba30bf06e67f417d5887b01e0e40f3c39
-MISC ChangeLog 42437 RMD160 2c211d02a4ec1b0b68952020bd137e8a9943dda5 SHA1 a4f9c01892309512bd1c16d531703059c8f45ed5 SHA256 e41088c0b63ba97cc9236e2b00df5ab0998213569a1a6c0aae02865f98a4b938
+EBUILD gedit-3.4.1.ebuild 2682 RMD160 220520d9fd24de511c19ecc02b17ee43066d5c05 SHA1 3f60b032ddd73bde4ff17e6c8563d1d2c737215f SHA256 60050418f9c54eea5f57eb0995d4e55a3bbb525ad9aaf81c778df992d0c9dfc2
+MISC ChangeLog 42628 RMD160 72811fc3df873c621933d2553851c17f62de17e8 SHA1 5e049bb6714149560bef1f7c477d1874ba00dfa4 SHA256 374d1ed2b23e1af8c5ceb0986802ac3f9da4bf955a4417930a3e49b6f0e9466c
 MISC metadata.xml 379 RMD160 9a7dbcc663e731b38a6f7583657eaa7d347a1e4d SHA1 db520429f05eecce84bc28c8afb458edec06d569 SHA256 fed8959702c79b50a96b2f35e500772f85cfd950bac7f1c6435121995140dc48
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk8xj7oACgkQdjK8w9WeBnD5WQD+PbTVFm3Y2T0CosKUA5zjHtsy
-mGbWxihH+POwap4cXBMBALRAUaBDJlf01j/r8TjTlD5eydB2eq8H4gqLrSTF2HSh
-=aTWQ
+iQEcBAEBAgAGBQJPlJRsAAoJEJ0WA1zPCt1hlbAH/RcqPGwiVkev0D+IT+lz/P8c
+jI8Bb6RaVh0BVHG2D0M/uuD7MzdNyclhmLUPwBomgOcAx67kkinqiazw5ZfYN1jB
+yASPtvsUd4RjeEFHB5H6XKb2PTzyzfXTtgCP2zcYf+v6bxlz5t7YxiMvIo1W51TP
+wtUb5rOtP0gcnCl/q6AcbBlaMqhUFg4e7Tqc934i3tH44QDfuRKX+oygoL4alN06
+eSv/NwaHD8hYIvpA5KbeptksJPgUVgi1ATtdtxsOf+jApXJueClENUMcs3JxdSKc
+Egj9x1Y1HCeANT88PnDzSxqusdyokkhhtm1NF9LsJdGXN/cmEOrDx174L2WNPPM=
+=dMf0
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/gedit-3.2.5.ebuild b/app-editors/gedit/gedit-3.4.1.ebuild
index 1ac914862a2b..b826cad47010 100644
--- a/app-editors/gedit/gedit-3.2.5.ebuild
+++ b/app-editors/gedit/gedit-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.2.5.ebuild,v 1.3 2012/02/07 20:55:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.4.1.ebuild,v 1.1 2012/04/22 23:29:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc +introspection +python spell"
+IUSE="doc +introspection +python spell zeitgeist"
 KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=x11-libs/libSM-1.0
 	>=dev-libs/libxml2-2.5.0:2
 	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.1.6:3[introspection?]
+	>=x11-libs/gtk+-3.3.15:3[introspection?]
 	>=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
 	>=dev-libs/libpeas-1.1.0[gtk]
 
@@ -44,35 +44,34 @@ COMMON_DEPEND="
 		>=dev-python/pygobject-3.0.0:3[cairo] )
 	spell? (
 		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35
-	)"
+		>=app-text/iso-codes-0.35 )
+	zeitgeist? ( dev-libs/libzeitgeist )"
 
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic"
 
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
+	dev-libs/libxml2
 	>=dev-util/intltool-0.40
+	dev-util/itstool
 	>=dev-util/pkgconfig-0.9
 	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.9.0
 	~app-text/docbook-xml-dtd-4.1.2
 	doc? ( >=dev-util/gtk-doc-1 )"
-# gnome-common and gtk-doc-am needed to eautoreconf
+# yelp-tools, gnome-common and gtk-doc-am needed to eautoreconf
 
 pkg_setup() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	# TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?)
 	G2CONF="${G2CONF}
-		--disable-zeitgeist
 		--disable-deprecations
 		--disable-schemas-compile
-		--disable-scrollkeeper
 		--enable-updater
 		--enable-gvfs-metadata
 		$(use_enable introspection)
 		$(use_enable python)
-		$(use_enable spell)"
+		$(use_enable spell)
+		$(use_enable zeitgeist)"
 
 	python_set_active_version 2
 	python_pkg_setup
@@ -81,11 +80,7 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# disable pyc compiling
-	echo > py-compile
-
-	# Fix missing file in POTFILES.in
-	echo "plugins/quickopen/quickopen/__init__.py" >> po/POTFILES.in
+	use python && python_clean_py-compile_files
 }
 
 src_test() {
@@ -102,7 +97,6 @@ pkg_postinst() {
 		python_mod_optimize /usr/$(get_libdir)/gedit/plugins
 		# FIXME: take care of gi.overrides with USE=introspection
 	fi
-
 }
 
 pkg_postrm() {