bump to 2.22.1. Misc bug fixes and translation updates.

Package-Manager: portage-2.1.5_rc2

3 files changed, 97 insertions, 5 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 1386494849c3..109380ca723d 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.238 2008/03/29 14:34:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.239 2008/04/10 21:29:05 eva Exp $
+
+*gedit-2.22.1 (10 Apr 2008)
+
+  10 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> +gedit-2.22.1.ebuild:
+  bump to 2.22.1. Misc bug fixes and translation updates.
 
   29 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> -gedit-2.20.4.ebuild,
   gedit-2.20.4-r1.ebuild, gedit-2.22.0.ebuild:
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 5ebe2fdb6a61..7ca5888752f3 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -8,15 +8,17 @@ AUX gedit-2.20.4-parallel-install.patch 382 RMD160 bebad6c652b617484b1d67ef9e9c0
 DIST gedit-2.20.3.tar.bz2 3812377 RMD160 e3747bbafca099ae5567005b5bd6af3ba2704c3d SHA1 ccbb9bad00101ed465c39da05b0dcaf8ea881120 SHA256 d8159e6a3442a3bcf8dba5aab5b8d4b79faa5f2d14d9df9b43fa0e9186922df0
 DIST gedit-2.20.4.tar.bz2 3809006 RMD160 8f87871f2ab5c9f5747dd990aaa5eaad2f30215a SHA1 82bf5fe2e119018936fca0b89196c9e86c69ee3f SHA256 695b70582734b3ba04e0d76970bf1dd722a22ef027f8a749ec3fb05e40e83121
 DIST gedit-2.22.0.tar.bz2 3883104 RMD160 57ee94075d0b88eba2b933313e81e26eb05115b8 SHA1 a960a32a5b43a25ad3bfd577835b2cf05a7391fc SHA256 ffad28c732e1a9b250d6d3c5b92a252b6ac87741e4d1fd9daba9940fde399e2e
+DIST gedit-2.22.1.tar.bz2 3883851 RMD160 91ddb86b4c1b6cd04839f3b1f603a19ba862e1a9 SHA1 146e2da6ffa2e7b821a44ec19f3ff074fc50a5ca SHA256 3b44c80e7d18dcda5d2535d9dafb21b2e579f84fa39866b8c60d60cd5c7ac921
 EBUILD gedit-2.20.3.ebuild 1778 RMD160 31e114c3a8913f53a31d1189fc97d3b8837608aa SHA1 d378bcc2fd5316073c447745e21ba4147ecf2b32 SHA256 f370eec52c41281f312d96e07d1c3cce402dc7384c02e8a4a13e4009fc5c528c
 EBUILD gedit-2.20.4-r1.ebuild 2251 RMD160 6e013bc8e029fe02dd897412e13bc6e75a9137ff SHA1 a08efb32e77f28f0603d9fd5b7309be119ea68f8 SHA256 edeb80dbe814cdd08401968702ee59d1ba99680433819bb1b9343bcba5eda94b
 EBUILD gedit-2.22.0.ebuild 2157 RMD160 91b8a0fb82f4425a3bdbda0355cdddba817c5383 SHA1 14b80964c746d089d1dd1b981b815c828880581a SHA256 44ceb7cf8393217198866bfbcdbc90e05485c79f9628ea28a7ca036d4dd56406
-MISC ChangeLog 28646 RMD160 c3b3e7b39d80a487d841763a3db73545ed5ec15c SHA1 9ecbeb3dfa5200ab495274bd88c53ec4db0fc932 SHA256 8bd6f8a18bf30f0661fce1eb7447868cf96f3107df88518d8d534f7748943a8c
+EBUILD gedit-2.22.1.ebuild 2157 RMD160 30b65e5ab7a6c76b1c0e9e3454c7d7b6fc9a205a SHA1 30cfc494b9c0cd42115b2d3230a6924188267fc5 SHA256 84af3c61583279463971e44bfb3d33a9c8a2032d650e1c31a61a8c3be4c732c0
+MISC ChangeLog 28810 RMD160 29f27969eb26c7fdbdaabb0867bfd0d41297e756 SHA1 374a99f00fa5d2a42a3df02033b8fcf59826fa05 SHA256 f4e0e6447032bf4a5ff2d9d3bd46fd7471b2719ab777910645c1a5bededb0dcc
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfuRX4ACgkQ1fmVwcYIWAYF2ACfYwyrK+nehN8DgRxmCIDjPyaA
-oGUAnjjPbU4yQIOQRSi31WR3ejR25Kj0
-=bjtN
+iEYEARECAAYFAkf+hqkACgkQ1fmVwcYIWAaczgCdG1tVkO6Ef9S0HvgjDBgXf2dW
+wgYAn3A4dexXpTLg6Je06RHDDnVRNjnq
+=lf3p
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/gedit-2.22.1.ebuild b/app-editors/gedit/gedit-2.22.1.ebuild
new file mode 100644
index 000000000000..6965a6917d80
--- /dev/null
+++ b/app-editors/gedit/gedit-2.22.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.22.1.ebuild,v 1.1 2008/04/10 21:29:05 eva Exp $
+
+inherit gnome2 python eutils autotools
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc python spell xattr"
+
+RDEPEND=">=gnome-base/gconf-2
+	xattr? ( sys-apps/attr )
+	>=dev-libs/glib-2.14
+	>=x11-libs/gtk+-2.12
+	>=x11-libs/gtksourceview-2.2
+	>=gnome-base/libgnomeui-2.16
+	>=gnome-base/libglade-2.5.1
+	>=gnome-base/gnome-vfs-2.16
+	spell? (
+		>=app-text/enchant-1.2
+		app-text/iso-codes
+	)
+	python? (
+		>=dev-python/pygobject-2.12
+		>=dev-python/pygtk-2.12
+		>=dev-python/pygtksourceview-2.2
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	gnome-base/gnome-common"
+# gnome-common needed to eautoreconf
+
+DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
+if [[ "${ARCH}" == "PPC" ]] ; then
+	# HACK HACK HACK: someone fix this garbage
+	MAKEOPTS="${MAKEOPTS} -j1"
+fi
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		$(use_enable python)
+		$(use_enable spell)
+		$(use_enable xattr attr)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Remove symbols that are not meant to be part of the docs, and
+	# break compilation if USE="doc -python" (bug #158638).
+	if use !python && use doc; then
+		epatch "${FILESDIR}"/${PN}-2.16.2-no_python_module_docs.patch
+	fi
+
+	# chown on fbsd doesn't have --reference.  Bug #183691
+	epatch "${FILESDIR}"/${PN}-2.18.1-fbsd.patch
+
+	# Make libattr optional; bug #191989
+	epatch "${FILESDIR}"/${PN}-2.20.3-libattr.patch
+
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize "${ROOT}usr/$(get_libdir)/gedit-2/plugins"
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
+}