Works with python-3.3 (#475086 by Hristo Venev), drop old.

(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 7 insertions, 87 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 1e4995171a82..fff1b7c43c29 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.354 2013/06/25 17:16:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.355 2013/07/22 20:34:47 pacho Exp $
+
+  22 Jul 2013; Pacho Ramos <pacho@gentoo.org> -gedit-3.8.2.ebuild,
+  gedit-3.8.3.ebuild:
+  Works with python-3.3 (#475086 by Hristo Venev), drop old.
 
 *gedit-3.8.3 (25 Jun 2013)
 
diff --git a/app-editors/gedit/gedit-3.8.2.ebuild b/app-editors/gedit/gedit-3.8.2.ebuild
deleted file mode 100644
index c8f436acd2c2..000000000000
--- a/app-editors/gedit/gedit-3.8.2.ebuild
+++ /dev/null
@@ -1,84 +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.8.2.ebuild,v 1.1 2013/05/13 18:12:35 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_2 )
-
-inherit gnome2 multilib python-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.35.4:2
-	>=x11-libs/gtk+-3.7.10:3[introspection?]
-	>=x11-libs/gtksourceview-3.2.0:3.0[introspection?]
-	>=dev-libs/libpeas-1.7.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? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
-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
-
-src_configure() {
-	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	gnome2_src_configure \
-		--disable-deprecations \
-		--enable-updater \
-		--enable-gvfs-metadata \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_enable spell) \
-		$(use_enable zeitgeist) \
-		ITSTOOL=$(type -P true)
-}
-
-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 bd6a93bd08f6..bc2bf07f5141 100644
--- a/app-editors/gedit/gedit-3.8.3.ebuild
+++ b/app-editors/gedit/gedit-3.8.3.ebuild
@@ -1,11 +1,11 @@
 # 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.1 2013/06/25 17:16:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.8.3.ebuild,v 1.2 2013/07/22 20:34:47 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_2 )
+PYTHON_COMPAT=( python3_{2,3} )
 
 inherit gnome2 multilib python-r1 eutils virtualx