Bump to 3.0.6, from gnome overlay for GNOME 3

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

4 files changed, 138 insertions, 7 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 7fa7a63081b2..0a41ea564b5a 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.328 2011/04/08 12:12:35 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.329 2011/08/16 20:58:56 nirbheek Exp $
+
+*gedit-3.0.6 (16 Aug 2011)
+
+  16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +gedit-3.0.6.ebuild,
+  metadata.xml:
+  Bump to 3.0.6, from gnome overlay for GNOME 3
 
   08 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> -gedit-2.30.3.ebuild:
   Clean up old revision.
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 3bcf37701e65..964baba5a25c 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -3,13 +3,25 @@ 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.0.6.tar.xz 2850640 RMD160 1748c289f1575bfe84f165166f9eb314e66b7b47 SHA1 53bde37406ba83378c87d58b69206c54925d00db SHA256 ac5957fe52991f58570d25828130f60a8e4e3f0cb00abe358f25e7d2b9fed252
 EBUILD gedit-2.30.4.ebuild 2162 RMD160 a8755808fa4a89d05b4135928c0cb0a2fbba3134 SHA1 df5f15ad6377cae2c8f3d510ffa27661098296be SHA256 7cca178576a8dd373e1be89fc8c0ced344106069722e7b812fd41bd348a2c367
-MISC ChangeLog 40959 RMD160 96e30c8bdd0c84e56b9920383cb7e1421861ebac SHA1 7154cc3ea946b34945b1d0c3a517b544a39e261e SHA256 2640e364ab108fb3db97d9869208b9ce1d1c34b361631629a64ef73f38d665ec
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+EBUILD gedit-3.0.6.ebuild 2794 RMD160 92c0945fe703e909cf197a0da03b76d67ff2cf42 SHA1 55fe6083a5a0038592112b79ddb9efb21ec9a476 SHA256 a55acf5605ec952bf1107e1bd5c4ac255cf2b5c597d2f26d3efb86e2c490ab80
+MISC ChangeLog 41132 RMD160 7e514dc67f0d41b8b3bc04c3eef3c7019600c9ba SHA1 48638b94441a5b2551dca7cd5d56ec5eca555a07 SHA256 3d9cd84f91e6a6f4b673dda9943dd0f66b4339bbc5b7dcec7c599de1b0c6d830
+MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2e+7kACgkQ1fmVwcYIWAa/ugCZAaCo8/I7wIk/LABwLmbipc2g
-ByMAoKOYHUhqU+DA6vQ9j7tqzbtEio6f
-=GZcl
+iQIcBAEBAgAGBQJOStoVAAoJEO/kOhxWD91kX1QP/RTtDBcOW8DkbR/QWcUNAeQj
+tiaUotJzsWlUZGHadAPePWt/XkGuylQioilWdUpeh6rjASal5E9WA46+MDxNhIo6
+gN0X7128/GCBe1q11ItRIAVvPlTuEc2zyWUTWhaaB266POaBGyzfVwcu6gwlH+/v
+WUg7hkfArwIHnql6m1sirAYlWWqb9+lT/IbXpvJy1Wxz3tH3zT4GpXcelkoT6IhJ
+vzdafLxkElxsv0pg2Q7/MUzRvL6U8oq4PQn5Kr267LkKDT9LuQLdV/3Jm1mSlig5
+ug5vdqlXKsd/f2QPX2n2bBbuN/+aKs+LmPYGOwcbRKmdTNq0+xxoyGNJ7dFDQy07
+MdLENKqP6xKDyI8tSEsajV3omOSoNtuSy+1uxIly8QHVp8Zf++MUqSK8t9+GBRg2
+eIHSjKOde7UabCjDVRbk0z+m13eKUO12LpSNrUx3WZepsI/Yrv20mcGu8IEnHaRM
+q6P7Grmso4nOqTFhjTZZKePnhfYPysst89KPoNCXA+KGIiEBzpTCb54sPVRjK155
+LuLPG6pRiDu3BLDES22G/pLBJ27Lq01YlP0p8qi4hk29tm2nlG2RZms0+XFeKkJ/
+k1oQQJ6Ic6XFTt1EHevmdwV6K3b1bUsc2KoNzfeqML0zLSMNOZIpfDmt1kqw+Ii2
+mtcd1tr2EFBtfeMnMWuB
+=LNpA
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/gedit-3.0.6.ebuild b/app-editors/gedit/gedit-3.0.6.ebuild
new file mode 100644
index 000000000000..f64d905d4d07
--- /dev/null
+++ b/app-editors/gedit/gedit-3.0.6.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.0.6.ebuild,v 1.1 2011/08/16 20:58:56 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="xz"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_DEPEND="2"
+
+inherit gnome2 python eutils virtualx
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +introspection python spell"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+RDEPEND="
+	>=x11-libs/libSM-1.0
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.0:3[introspection?]
+	>=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
+	>=dev-libs/libpeas-0.7.3[gtk]
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+
+	net-libs/libsoup:2.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	python? (
+		>=dev-libs/gobject-introspection-0.9.3
+		>=x11-libs/gtk+-3.0:3[introspection]
+		>=x11-libs/gtksourceview-2.91.9:3.0[introspection]
+		>=dev-libs/libpeas-0.7.4[gtk]
+		>=dev-python/pygobject-2.28.0[introspection] )
+	spell? (
+		>=app-text/enchant-1.2
+		>=app-text/iso-codes-0.35
+	)"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.17
+	>=dev-util/intltool-0.40
+	>=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
+
+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-maintainer-mode
+		--disable-schemas-compile
+		--disable-scrollkeeper
+		--enable-updater
+		--enable-gvfs-metadata
+		$(use_enable introspection)
+		$(use_enable spell)"
+
+	if use python || use introspection; then
+		python_set_active_version 2
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check || die "make check failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_mod_optimize /usr/$(get_libdir)/gedit/plugins
+		# FIXME: take care of gi.overrides with USE=introspection
+	fi
+
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	if use python; then
+		python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
+	fi
+}
diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
index da6fd63d0085..44825d13c084 100644
--- a/app-editors/gedit/metadata.xml
+++ b/app-editors/gedit/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
+	</use>
 </pkgmetadata>