Version bump, drop old

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

2 files changed, 40 insertions, 20 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index ede777d8a98b..9893fe916bbb 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.379 2015/01/02 22:20:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.380 2015/02/06 12:34:37 pacho Exp $
+
+*gedit-3.14.3 (06 Feb 2015)
+
+  06 Feb 2015; Pacho Ramos <pacho@gentoo.org> +gedit-3.14.3.ebuild,
+  -gedit-3.12.2.ebuild:
+  Version bump, drop old
 
   02 Jan 2015; Michał Górny <mgorny@gentoo.org> gedit-3.12.2-r1.ebuild,
   gedit-3.14.2.ebuild:
diff --git a/app-editors/gedit/gedit-3.12.2.ebuild b/app-editors/gedit/gedit-3.14.3.ebuild
index 243023e32d99..4d9f9f5b0d85 100644
--- a/app-editors/gedit/gedit-3.12.2.ebuild
+++ b/app-editors/gedit/gedit-3.14.3.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.ebuild,v 1.3 2014/07/23 15:13:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.14.3.ebuild,v 1.1 2015/02/06 12:34:37 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{2,3} )
+PYTHON_COMPAT=( python3_{3,4} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
 
-inherit eutils gnome2 multilib python-r1 virtualx
+inherit eutils gnome2 multilib python-r1 vala virtualx
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
@@ -15,17 +17,19 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="+introspection +python spell zeitgeist"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+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 '*') ) )"
 
-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"
+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/glib-2.40:2[dbus]
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/gtksourceview-3.14.3:3.0[introspection?]
 	>=dev-libs/libpeas-1.7.0[gtk]
 
 	gnome-base/gsettings-desktop-schemas
@@ -40,18 +44,18 @@ COMMON_DEPEND="
 		${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-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}
+	${vala_depend}
 	app-text/docbook-xml-dtd:4.1.2
 	>=app-text/scrollkeeper-0.3.11
 	dev-libs/libxml2:2
@@ -62,24 +66,26 @@ DEPEND="${COMMON_DEPEND}
 "
 # yelp-tools, gnome-common needed to eautoreconf
 
-src_prepare() {
-	# FIXME: Not able to set some metadata
-	sed -e '/g_test_add_func/d' \
-		-i tests/document-loader.c || die
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
 
+src_prepare() {
+	vala_src_prepare
 	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 python) \
 		$(use_enable spell) \
-		$(use_enable zeitgeist) \
+		$(use_enable python) \
+		$(use_enable vala) \
 		ITSTOOL=$(type -P true)
 }
 
@@ -90,3 +96,11 @@ src_test() {
 	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[@]}"
+}