[gentoo-commits] proj/gnome:pending-eva commit in: x11-libs/gtksourceview/

[gentoo-commits] proj/gnome:pending-eva commit in: x11-libs/gtksourceview/

[Gilles Dartiguelongue]

commit:     427a151e373b5781914df0412499f4d245b219d7
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 22:30:56 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May  9 23:10:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=427a151e

x11-libs/gtksourceview: 3.14.4 → 3.16.1

 ...iew-9999.ebuild => gtksourceview-3.16.1.ebuild} | 25 ++++++----------------
 x11-libs/gtksourceview/gtksourceview-9999.ebuild   | 12 +++++------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/x11-libs/gtksourceview/gtksourceview-9999.ebuild b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
similarity index 67%
copy from x11-libs/gtksourceview/gtksourceview-9999.ebuild
copy to x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
index 7f81e14..2f12fd5 100644
--- a/x11-libs/gtksourceview/gtksourceview-9999.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,9 +8,6 @@ VALA_MIN_API_VERSION="0.24"
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 vala virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
 HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
@@ -19,34 +16,24 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 # Note: has native OSX support, prefix teams, attack!
 RDEPEND="
-	>=dev-libs/glib-2.38:2
+	>=dev-libs/glib-2.44:2
 	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/gtk+-3.13.7:3[introspection?]
+	>=x11-libs/gtk+-3.16:3[introspection?]
 	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42 )
 "
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-am-1.18
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
 
-if [[ ${PV} = 9999 ]]; then
-	 DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.11 )"
-fi
-
 src_prepare() {
 	use vala && vala_src_prepare
 	gnome2_src_prepare

diff --git a/x11-libs/gtksourceview/gtksourceview-9999.ebuild b/x11-libs/gtksourceview/gtksourceview-9999.ebuild
index 7f81e14..fc7de7d 100644
--- a/x11-libs/gtksourceview/gtksourceview-9999.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -28,14 +28,14 @@ fi
 
 # Note: has native OSX support, prefix teams, attack!
 RDEPEND="
-	>=dev-libs/glib-2.38:2
+	>=dev-libs/glib-2.44:2
 	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/gtk+-3.13.7:3[introspection?]
+	>=x11-libs/gtk+-3.16:3[introspection?]
 	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42 )
 "
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-am-1.18
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 
 if [[ ${PV} = 9999 ]]; then
 	 DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.11 )"
+		doc? ( >=dev-util/gtk-doc-1.18 )"
 fi
 
 src_prepare() {