commit: 2bbdc87833bc663fe32436fc505c08797909ecc7
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 23:13:59 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri May 8 23:35:34 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bbdc878
app-editors/gedit: 3.14.3 → 3.16.1
.../{gedit-9999.ebuild => gedit-3.16.1.ebuild} | 33 +++++++---------------
app-editors/gedit/gedit-9999.ebuild | 16 +++++------
2 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/app-editors/gedit/gedit-9999.ebuild
b/app-editors/gedit/gedit-3.16.1.ebuild
similarity index 75%
copy from app-editors/gedit/gedit-9999.ebuild
copy to app-editors/gedit/gedit-3.16.1.ebuild
index de14a5a..d774162 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-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: $
@@ -10,9 +10,6 @@ VALA_MIN_API_VERSION="0.26"
VALA_USE_DEPEND="vapigen"
inherit eutils gnome2 multilib python-r1 vala virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="A text editor for the GNOME desktop"
HOMEPAGE="https://wiki.gnome.org/Apps/Gedit";
@@ -23,20 +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 '*') ) )"
-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 ~ia64-linux
~x86-linux"
-fi
+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
@@ -49,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}] )
@@ -74,12 +67,6 @@ DEPEND="${COMMON_DEPEND}
"
# yelp-tools, gnome-common needed to eautoreconf
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1 )
- app-text/yelp-tools"
-fi
-
pkg_setup() {
use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
}
diff --git a/app-editors/gedit/gedit-9999.ebuild
b/app-editors/gedit/gedit-9999.ebuild
index de14a5a..e99cdfa 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-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: $
@@ -23,7 +23,10 @@ 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 '*') ) )
+"
if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""
@@ -34,9 +37,9 @@ fi
# 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
@@ -49,9 +52,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}] )
