Clean up old revision. Add missing PYTHON_USEDEP on cairo.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 7 insertions, 92 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 134525fa8809..085356e67da5 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.357 2013/08/27 22:21:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.358 2013/08/30 21:19:17 eva Exp $
+
+  30 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org> -gedit-3.6.2-r1.ebuild,
+  gedit-3.8.3.ebuild:
+  Clean up old revision. Add missing PYTHON_USEDEP on cairo.
 
   27 Aug 2013; Alexis Ballier <aballier@gentoo.org> gedit-3.8.3.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-editors/gedit/gedit-3.6.2-r1.ebuild b/app-editors/gedit/gedit-3.6.2-r1.ebuild
deleted file mode 100644
index fd348255d871..000000000000
--- a/app-editors/gedit/gedit-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.6.2-r1.ebuild,v 1.9 2013/02/07 21:35:46 ulm Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit gnome2 multilib python-single-r1 eutils virtualx
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="+introspection +python spell zeitgeist"
-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)
-COMMON_DEPEND="
-	>=x11-libs/libSM-1.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.6.0:3[introspection?]
-	>=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
-	>=dev-libs/libpeas-1.1.0[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? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-0.9.3
-		>=x11-libs/gtk+-3:3[introspection]
-		>=x11-libs/gtksourceview-3.6:3.0[introspection]
-		dev-python/pycairo
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
-	spell? (
-		>=app-text/enchant-1.2:=
-		>=app-text/iso-codes-0.35 )
-	zeitgeist? ( dev-libs/libzeitgeist )"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/scrollkeeper-0.3.11
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-# yelp-tools, gnome-common needed to eautoreconf
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-deprecations
-		--disable-schemas-compile
-		--enable-updater
-		--enable-gvfs-metadata
-		$(use_enable introspection)
-		$(use_enable python)
-		$(use_enable spell)
-		$(use_enable zeitgeist)
-		ITSTOOL=$(type -P true)"
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/gedit/gedit-3.8.3.ebuild b/app-editors/gedit/gedit-3.8.3.ebuild
index 626198e4957d..bd91c97eb89a 100644
--- a/app-editors/gedit/gedit-3.8.3.ebuild
+++ b/app-editors/gedit/gedit-3.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.8.3.ebuild,v 1.4 2013/08/27 22:21:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.8.3.ebuild,v 1.5 2013/08/30 21:19:17 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 		>=dev-libs/gobject-introspection-0.9.3
 		>=x11-libs/gtk+-3:3[introspection]
 		>=x11-libs/gtksourceview-3.6:3.0[introspection]
-		dev-python/pycairo
+		dev-python/pycairo[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
 	spell? (
 		>=app-text/enchant-1.2:=