public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
Date: Thu, 14 Nov 2013 22:52:07 +0000 (UTC)	[thread overview]
Message-ID: <1384475951.92251f7b929cb92f7e367fc6366a59b16e6deb42.eva@gentoo> (raw)

commit:     92251f7b929cb92f7e367fc6366a59b16e6deb42
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 10:09:30 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 00:39:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=92251f7b

app-editors/gedit: 3.8.3 → 3.10.0

---
 .../{gedit-9999.ebuild => gedit-3.10.0.ebuild}     | 73 ++++++++--------------
 app-editors/gedit/gedit-9999.ebuild                | 61 +++++++++---------
 2 files changed, 56 insertions(+), 78 deletions(-)

diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-3.10.0.ebuild
similarity index 53%
copy from app-editors/gedit/gedit-9999.ebuild
copy to app-editors/gedit/gedit-3.10.0.ebuild
index 7580adc..6205421 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-3.10.0.ebuild
@@ -1,45 +1,37 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python3_{2,3} )
 
-inherit eutils gnome2 multilib python-single-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit eutils gnome2 multilib python-r1 virtualx
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Gedit"
 
-LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
+LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
+
 IUSE="+introspection +python spell zeitgeist"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-fi
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+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="
-	>=x11-libs/libSM-1.0
 	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.3.15:3[introspection?]
-	>=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
-	>=dev-libs/libpeas-1.1.0[gtk]
+	>=dev-libs/glib-2.37.5:2
+	>=x11-libs/gtk+-3.9.9:3[introspection?]
+	>=x11-libs/gtksourceview-3.9.91: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
 
@@ -49,14 +41,16 @@ COMMON_DEPEND="
 		>=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/pycairo[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
 	spell? (
 		>=app-text/enchant-1.2:=
 		>=app-text/iso-codes-0.35 )
-	zeitgeist? ( dev-libs/libzeitgeist )"
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
 RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic"
+	x11-themes/gnome-icon-theme-symbolic
+"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=app-text/scrollkeeper-0.3.11
@@ -68,30 +62,17 @@ 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() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
+src_configure() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-deprecations
-		--enable-updater
-		--enable-gvfs-metadata
-		$(use_enable introspection)
-		$(use_enable python)
-		$(use_enable spell)
-		$(use_enable zeitgeist)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-
-	gnome2_src_prepare
+	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() {

diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild
index 7580adc..84d8f06 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python3_{2,3} )
 
-inherit eutils gnome2 multilib python-single-r1 virtualx
+inherit eutils gnome2 multilib python-r1 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -15,31 +15,30 @@ fi
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Gedit"
 
-LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
+LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
+
 IUSE="+introspection +python spell zeitgeist"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~mips ~sh ~x86 ~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"
 fi
 
 # 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.28:2
-	>=x11-libs/gtk+-3.3.15:3[introspection?]
-	>=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
-	>=dev-libs/libpeas-1.1.0[gtk]
+	>=dev-libs/glib-2.37.5:2
+	>=x11-libs/gtk+-3.9.9:3[introspection?]
+	>=x11-libs/gtksourceview-3.9.91: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
 
@@ -49,14 +48,16 @@ COMMON_DEPEND="
 		>=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/pycairo[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
 	spell? (
 		>=app-text/enchant-1.2:=
 		>=app-text/iso-codes-0.35 )
-	zeitgeist? ( dev-libs/libzeitgeist )"
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
 RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic"
+	x11-themes/gnome-icon-theme-symbolic
+"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=app-text/scrollkeeper-0.3.11
@@ -74,24 +75,20 @@ if [[ ${PV} = 9999 ]]; then
 		app-text/yelp-tools"
 fi
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
+src_configure() {
+	local myconf=""
+	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-deprecations
-		--enable-updater
-		--enable-gvfs-metadata
-		$(use_enable introspection)
-		$(use_enable python)
-		$(use_enable spell)
-		$(use_enable zeitgeist)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-
-	gnome2_src_prepare
+	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) \
+		${myconf}
 }
 
 src_test() {


             reply	other threads:[~2013-11-14 22:52 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-14 22:52 Gilles Dartiguelongue [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-01-30 20:02 [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/ Mart Raudsepp
2018-12-29 13:59 Sobhan Mohammadpour
2018-08-05 10:11 Mart Raudsepp
2017-09-02  9:31 Gilles Dartiguelongue
2016-03-26 22:54 Ole Reifschneider
2015-06-09 13:48 Gilles Dartiguelongue
2015-05-25 14:05 Gilles Dartiguelongue
2015-05-17 15:39 Gilles Dartiguelongue
2015-01-02 22:20 Michał Górny
2014-12-15 23:28 Gilles Dartiguelongue
2014-12-04 23:03 Remi Cardona
2014-11-28 19:03 Michał Górny
2014-11-28 18:58 Michał Górny
2014-11-28  8:13 Remi Cardona
2014-11-23 19:37 Gilles Dartiguelongue
2014-10-06 23:06 Gilles Dartiguelongue
2014-04-23 22:14 Gilles Dartiguelongue
2014-04-20 22:57 Gilles Dartiguelongue
2013-12-22 22:27 Gilles Dartiguelongue
2013-12-01 18:42 Gilles Dartiguelongue
2012-12-17  8:04 Gilles Dartiguelongue
2012-11-21 22:27 Gilles Dartiguelongue
2012-10-27 22:15 Gilles Dartiguelongue
2012-09-22 18:45 Nirbheek Chauhan
2012-09-08  8:59 Nirbheek Chauhan
2012-04-06 21:50 Stephen Klimaszewski
2012-03-07  0:32 Alexandre Restovtsev
2012-03-03  5:01 Alexandre Restovtsev
2012-02-26 21:53 Alexandre Restovtsev
2012-01-20 19:49 Nirbheek Chauhan
2011-11-03  4:42 Alexandre Restovtsev
2011-10-18  7:37 Alexandre Restovtsev
2011-10-09 21:38 Alexandre Restovtsev
2011-07-01 19:41 Alexandre Restovtsev
2011-06-24 17:35 Alexandre Restovtsev
2011-06-02 14:43 Nirbheek Chauhan
2011-04-29 17:46 Nirbheek Chauhan
2011-04-12 23:50 Nirbheek Chauhan
2011-04-10 18:04 Gilles Dartiguelongue
2011-04-05  0:57 Nirbheek Chauhan
2011-03-26  2:54 Nirbheek Chauhan
2011-03-26  1:58 Nirbheek Chauhan
2011-03-23  5:20 Nirbheek Chauhan
2011-03-14 17:21 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1384475951.92251f7b929cb92f7e367fc6366a59b16e6deb42.eva@gentoo \
    --to=eva@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox