Clean up old revision, add GCONF_DEBUG, bug #249372.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 8 insertions, 90 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 8258946b2d4e..dbf10040fb29 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.257 2009/01/22 00:08:51 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.258 2009/02/07 14:56:49 eva Exp $
+
+  07 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org> -gedit-2.24.2.ebuild,
+  gedit-2.24.3.ebuild:
+  Clean up old revision, add GCONF_DEBUG, bug #249372.
 
   22 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org> gedit-2.24.2.ebuild,
   gedit-2.24.3.ebuild:
diff --git a/app-editors/gedit/gedit-2.24.2.ebuild b/app-editors/gedit/gedit-2.24.2.ebuild
deleted file mode 100644
index 77814b491035..000000000000
--- a/app-editors/gedit/gedit-2.24.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.24.2.ebuild,v 1.4 2009/01/22 00:08:51 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 )
-	>=x11-libs/libSM-1.0
-	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.13
-	>=x11-libs/gtksourceview-2.2
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35
-	)
-	python? (
-		>=dev-python/pygobject-2.15.4
-		>=dev-python/pygtk-2.12
-		>=dev-python/pygtksourceview-2.2
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	gnome-base/gnome-common
-	>=dev-util/gtk-doc-am-1
-	doc? ( >=dev-util/gtk-doc-1 )"
-# gnome-common and gtk-doc-am 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
-
-	# fixes failing python test due to libtool 2.2, bug #216110
-	epatch "${FILESDIR}/${PN}-2.22.1-fix-libtool-2.2.patch"
-
-	# disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-
-	# needed to build on a libtool-1 system, bug #248788
-	rm m4/lt* m4/libtool.m4 ltmain.sh
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
-}
diff --git a/app-editors/gedit/gedit-2.24.3.ebuild b/app-editors/gedit/gedit-2.24.3.ebuild
index 3e50fe664bd9..a67e7ded89a6 100644
--- a/app-editors/gedit/gedit-2.24.3.ebuild
+++ b/app-editors/gedit/gedit-2.24.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.24.3.ebuild,v 1.2 2009/01/22 00:08:51 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.24.3.ebuild,v 1.3 2009/02/07 14:56:49 eva Exp $
+
+GCONF_DEBUG="no"
 
 inherit gnome2 python eutils autotools