Version bump for Gnome 3.16. Clean up old revisions.

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

3 files changed, 15 insertions, 117 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index fdb105a3553c..20044160ee41 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.382 2015/03/15 13:14:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.383 2015/06/09 10:06:36 eva Exp $
+
+*gedit-3.16.2 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> -gedit-3.12.2-r1.ebuild,
+  -gedit-3.14.2.ebuild, +gedit-3.16.2.ebuild:
+  Version bump for Gnome 3.16. Clean up old revisions.
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> gedit-3.14.3.ebuild:
   x86 stable, bug 534012
diff --git a/app-editors/gedit/gedit-3.12.2-r1.ebuild b/app-editors/gedit/gedit-3.12.2-r1.ebuild
deleted file mode 100644
index 5679e14f4d87..000000000000
--- a/app-editors/gedit/gedit-3.12.2-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v 1.6 2015/01/02 22:20:34 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{3,4} )
-
-inherit eutils gnome2 multilib python-r1 virtualx
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python spell zeitgeist"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-# we need to fix that
-REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.39.5:2
-	>=x11-libs/gtk+-3.11.6:3[introspection?]
-	>=x11-libs/gtksourceview-3.11.2:3.0[introspection?]
-	>=dev-libs/libpeas-1.7.0[gtk]
-
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-
-	x11-libs/libX11
-
-	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[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-		dev-libs/libpeas[${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.50.1
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-# yelp-tools, gnome-common needed to eautoreconf
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	# FIXME: Not able to set some metadata
-	sed -e '/g_test_add_func/d' \
-		-i tests/document-loader.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-	gnome2_src_configure \
-		--disable-deprecations \
-		--enable-updater \
-		--enable-gvfs-metadata \
-		$(use_enable introspection) \
-		$(use_enable spell) \
-		$(use_enable python) \
-		$(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
-}
-
-src_install() {
-	local args=()
-	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
-
-	gnome2_src_install "${args[@]}"
-}
diff --git a/app-editors/gedit/gedit-3.14.2.ebuild b/app-editors/gedit/gedit-3.16.2.ebuild
index 9e2ca105be25..cf08356451e6 100644
--- a/app-editors/gedit/gedit-3.14.2.ebuild
+++ b/app-editors/gedit/gedit-3.16.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.14.2.ebuild,v 1.2 2015/01/02 22:20:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.16.2.ebuild,v 1.1 2015/06/09 10:06:36 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,16 +20,19 @@ SLOT="0"
 IUSE="+introspection +python spell vala"
 # python-single-r1 would request disabling PYTHON_TARGETS on libpeas
 # we need to fix that
-REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
+REQUIRED_USE="
+	python? ( introspection )
+	python? ( ^^ ( $(python_gen_useflags '*') ) )
+"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 COMMON_DEPEND="
 	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/gtksourceview-3.14:3.0[introspection?]
+	>=dev-libs/glib-2.40:2[dbus]
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/gtksourceview-3.16:3.0[introspection?]
 	>=dev-libs/libpeas-1.7.0[gtk]
 
 	gnome-base/gsettings-desktop-schemas
@@ -42,9 +45,6 @@ COMMON_DEPEND="
 	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[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
 		dev-libs/libpeas[${PYTHON_USEDEP}] )