public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/
@ 2011-02-19 10:54 Priit Laes
  0 siblings, 0 replies; 4+ messages in thread
From: Priit Laes @ 2011-02-19 10:54 UTC (permalink / raw
  To: gentoo-commits

commit:     19553913a05dee15e7fcea96de80e624cf211857
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Feb 19 10:38:07 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Feb 19 10:50:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=19553913

app-editors/gedit: Update for latest libpeas API changes

---
 app-editors/gedit/files/gedit-libpeas-compat.patch |   49 ++++++++++++++++++++
 ...{gedit-2.91.6.ebuild => gedit-2.91.6-r1.ebuild} |    6 ++-
 app-editors/gedit/gedit-9999.ebuild                |    6 ++-
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/app-editors/gedit/files/gedit-libpeas-compat.patch b/app-editors/gedit/files/gedit-libpeas-compat.patch
new file mode 100644
index 0000000..755859c
--- /dev/null
+++ b/app-editors/gedit/files/gedit-libpeas-compat.patch
@@ -0,0 +1,49 @@
+From 9201fe7bfe6ab36830cb0660be449b0a90d6c55e Mon Sep 17 00:00:00 2001
+From: Garrett Regier <alias301@gmail.com>
+Date: Mon, 14 Feb 2011 13:23:11 +0000
+Subject: Update to latest libpeas API changes
+
+---
+diff --git a/configure.ac b/configure.ac
+index e7d6563..9e42175 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -307,8 +307,8 @@ PKG_CHECK_MODULES(GEDIT, [
+ 	gio-2.0 >= 2.25.11
+ 	gtk+-3.0 >= 2.99.0
+ 	gtksourceview-3.0 >= 2.91.1
+-	libpeas-1.0 >= 0.7.0
+-	libpeas-gtk-1.0 >= 0.7.0
++	libpeas-1.0 >= 0.7.2
++	libpeas-gtk-1.0 >= 0.7.2
+ 	gsettings-desktop-schemas
+ ])
+ 
+diff --git a/gedit/dialogs/gedit-preferences-dialog.c b/gedit/dialogs/gedit-preferences-dialog.c
+index 816f73d..ec1e3f7 100644
+--- a/gedit/dialogs/gedit-preferences-dialog.c
++++ b/gedit/dialogs/gedit-preferences-dialog.c
+@@ -904,7 +904,7 @@ setup_plugins_page (GeditPreferencesDialog *dlg)
+ 
+ 	gedit_debug (DEBUG_PREFS);
+ 
+-	page_content = peas_gtk_plugin_manager_new ();
++	page_content = peas_gtk_plugin_manager_new (NULL);
+ 	g_return_if_fail (page_content != NULL);
+ 
+ 	gtk_box_pack_start (GTK_BOX (dlg->priv->plugin_manager_place_holder),
+diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c
+index 807bbc2..93596f4 100644
+--- a/gedit/gedit-plugins-engine.c
++++ b/gedit/gedit-plugins-engine.c
+@@ -66,6 +66,8 @@ gedit_plugins_engine_init (GeditPluginsEngine *engine)
+ 	                                            GEDIT_TYPE_PLUGINS_ENGINE,
+ 	                                            GeditPluginsEnginePrivate);
+ 
++  peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
++
+ 	engine->priv->plugin_settings = g_settings_new ("org.gnome.gedit.plugins");
+ 	
+ 	/* Require gedit's typelib. */
+--
+cgit v0.8.3.4

diff --git a/app-editors/gedit/gedit-2.91.6.ebuild b/app-editors/gedit/gedit-2.91.6-r1.ebuild
similarity index 95%
rename from app-editors/gedit/gedit-2.91.6.ebuild
rename to app-editors/gedit/gedit-2.91.6-r1.ebuild
index dcb1d87..80c4ee5 100644
--- a/app-editors/gedit/gedit-2.91.6.ebuild
+++ b/app-editors/gedit/gedit-2.91.6-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND=">=x11-libs/libSM-1.0
 	>=dev-libs/glib-2.27.92
 	>=x11-libs/gtk+-2.99.0:3[introspection?]
 	>=x11-libs/gtksourceview-2.91.1:3.0[introspection?]
-	>=dev-libs/libpeas-0.7.0[gtk]
+	>=dev-libs/libpeas-0.7.2[gtk]
 
 	dev-python/pygobject[introspection]
 	gnome-base/gsettings-desktop-schemas
@@ -78,3 +78,7 @@ pkg_postrm() {
 	gnome2_pkg_postrm
 	python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
 }
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
+}

diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild
index dcb1d87..80c4ee5 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND=">=x11-libs/libSM-1.0
 	>=dev-libs/glib-2.27.92
 	>=x11-libs/gtk+-2.99.0:3[introspection?]
 	>=x11-libs/gtksourceview-2.91.1:3.0[introspection?]
-	>=dev-libs/libpeas-0.7.0[gtk]
+	>=dev-libs/libpeas-0.7.2[gtk]
 
 	dev-python/pygobject[introspection]
 	gnome-base/gsettings-desktop-schemas
@@ -78,3 +78,7 @@ pkg_postrm() {
 	gnome2_pkg_postrm
 	python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
 }
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
+}



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/
@ 2011-02-21 12:28 Nirbheek Chauhan
  0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2011-02-21 12:28 UTC (permalink / raw
  To: gentoo-commits

commit:     e0602fdc648a4ec652df26ddeeeac44f6c700f90
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 12:11:57 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 12:11:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e0602fdc

app-editors/gedit: 2.91.6 -> 2.91.7

---
 app-editors/gedit/files/gedit-libpeas-compat.patch |   49 --------------------
 ...{gedit-2.91.6-r1.ebuild => gedit-2.91.7.ebuild} |   10 ++--
 app-editors/gedit/gedit-9999.ebuild                |   10 ++--
 3 files changed, 8 insertions(+), 61 deletions(-)

diff --git a/app-editors/gedit/files/gedit-libpeas-compat.patch b/app-editors/gedit/files/gedit-libpeas-compat.patch
deleted file mode 100644
index 755859c..0000000
--- a/app-editors/gedit/files/gedit-libpeas-compat.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9201fe7bfe6ab36830cb0660be449b0a90d6c55e Mon Sep 17 00:00:00 2001
-From: Garrett Regier <alias301@gmail.com>
-Date: Mon, 14 Feb 2011 13:23:11 +0000
-Subject: Update to latest libpeas API changes
-
----
-diff --git a/configure.ac b/configure.ac
-index e7d6563..9e42175 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -307,8 +307,8 @@ PKG_CHECK_MODULES(GEDIT, [
- 	gio-2.0 >= 2.25.11
- 	gtk+-3.0 >= 2.99.0
- 	gtksourceview-3.0 >= 2.91.1
--	libpeas-1.0 >= 0.7.0
--	libpeas-gtk-1.0 >= 0.7.0
-+	libpeas-1.0 >= 0.7.2
-+	libpeas-gtk-1.0 >= 0.7.2
- 	gsettings-desktop-schemas
- ])
- 
-diff --git a/gedit/dialogs/gedit-preferences-dialog.c b/gedit/dialogs/gedit-preferences-dialog.c
-index 816f73d..ec1e3f7 100644
---- a/gedit/dialogs/gedit-preferences-dialog.c
-+++ b/gedit/dialogs/gedit-preferences-dialog.c
-@@ -904,7 +904,7 @@ setup_plugins_page (GeditPreferencesDialog *dlg)
- 
- 	gedit_debug (DEBUG_PREFS);
- 
--	page_content = peas_gtk_plugin_manager_new ();
-+	page_content = peas_gtk_plugin_manager_new (NULL);
- 	g_return_if_fail (page_content != NULL);
- 
- 	gtk_box_pack_start (GTK_BOX (dlg->priv->plugin_manager_place_holder),
-diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c
-index 807bbc2..93596f4 100644
---- a/gedit/gedit-plugins-engine.c
-+++ b/gedit/gedit-plugins-engine.c
-@@ -66,6 +66,8 @@ gedit_plugins_engine_init (GeditPluginsEngine *engine)
- 	                                            GEDIT_TYPE_PLUGINS_ENGINE,
- 	                                            GeditPluginsEnginePrivate);
- 
-+  peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
-+
- 	engine->priv->plugin_settings = g_settings_new ("org.gnome.gedit.plugins");
- 	
- 	/* Require gedit's typelib. */
---
-cgit v0.8.3.4

diff --git a/app-editors/gedit/gedit-2.91.6-r1.ebuild b/app-editors/gedit/gedit-2.91.7.ebuild
similarity index 93%
rename from app-editors/gedit/gedit-2.91.6-r1.ebuild
rename to app-editors/gedit/gedit-2.91.7.ebuild
index 80c4ee5..522d324 100644
--- a/app-editors/gedit/gedit-2.91.6-r1.ebuild
+++ b/app-editors/gedit/gedit-2.91.7.ebuild
@@ -27,8 +27,8 @@ fi
 # X libs are not needed for OSX (aqua)
 RDEPEND=">=x11-libs/libSM-1.0
 	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.27.92
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
+	>=dev-libs/glib-2.26
+	>=x11-libs/gtk+-3.0:3[introspection?]
 	>=x11-libs/gtksourceview-2.91.1:3.0[introspection?]
 	>=dev-libs/libpeas-0.7.2[gtk]
 
@@ -58,7 +58,9 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
 pkg_setup() {
+	# TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?)
 	G2CONF="${G2CONF}
+		--disable-indicator
 		--disable-deprecations
 		--disable-maintainer-mode
 		--disable-schemas-compile
@@ -78,7 +80,3 @@ pkg_postrm() {
 	gnome2_pkg_postrm
 	python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
 }
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
-}

diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild
index 80c4ee5..522d324 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-9999.ebuild
@@ -27,8 +27,8 @@ fi
 # X libs are not needed for OSX (aqua)
 RDEPEND=">=x11-libs/libSM-1.0
 	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.27.92
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
+	>=dev-libs/glib-2.26
+	>=x11-libs/gtk+-3.0:3[introspection?]
 	>=x11-libs/gtksourceview-2.91.1:3.0[introspection?]
 	>=dev-libs/libpeas-0.7.2[gtk]
 
@@ -58,7 +58,9 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
 pkg_setup() {
+	# TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?)
 	G2CONF="${G2CONF}
+		--disable-indicator
 		--disable-deprecations
 		--disable-maintainer-mode
 		--disable-schemas-compile
@@ -78,7 +80,3 @@ pkg_postrm() {
 	gnome2_pkg_postrm
 	python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
 }
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
-}



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/
@ 2014-10-12 23:19 Gilles Dartiguelongue
  0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-12 23:19 UTC (permalink / raw
  To: gentoo-commits

commit:     174bbae71fa8d0b307ef750defdf88074442c995
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 12 21:36:06 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 23:19:04 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=174bbae7

app-editors/gedit: fix out-of-source install

---
 .../gedit/files/gedit-3.14.0-fix-install.patch     | 23 ++++++++++++++++++++++
 app-editors/gedit/gedit-3.14.0.ebuild              |  7 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app-editors/gedit/files/gedit-3.14.0-fix-install.patch b/app-editors/gedit/files/gedit-3.14.0-fix-install.patch
new file mode 100644
index 0000000..e2627ba
--- /dev/null
+++ b/app-editors/gedit/files/gedit-3.14.0-fix-install.patch
@@ -0,0 +1,23 @@
+From 634726ba5be7caa947a676fbe7b8091311b41b62 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 12 Oct 2014 23:20:35 +0200
+Subject: [PATCH] Force creation of directory with out-of-source build
+
+---
+ plugins/externaltools/data/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am
+index e3a4707..3a8de2e 100644
+--- a/plugins/externaltools/data/Makefile.am
++++ b/plugins/externaltools/data/Makefile.am
+@@ -59,5 +59,6 @@ CLEANFILES +=					\
+ # generating the .desktop files.
+ # If the following bug is fixed, this hack can normally be removed:
+ # https://bugs.launchpad.net/intltool/+bug/605826
++BUILT_SOURCES = $(externaltools_all_desktop_files) $(externaltools_tools_SCRIPTS)
+ $(externaltools_all_desktop_files):
+ 	$(AM_V_GEN) $(MKDIR_P) $(top_builddir)/plugins/externaltools/data/
+-- 
+2.1.2
+

diff --git a/app-editors/gedit/gedit-3.14.0.ebuild b/app-editors/gedit/gedit-3.14.0.ebuild
index 73acad4..a8a2570 100644
--- a/app-editors/gedit/gedit-3.14.0.ebuild
+++ b/app-editors/gedit/gedit-3.14.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{2,3} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
-inherit eutils gnome2 multilib python-r1 vala virtualx
+inherit autotools eutils gnome2 multilib python-r1 vala virtualx
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
@@ -70,6 +70,11 @@ src_prepare() {
 	#sed -e '/g_test_add_func/d' \
 	#	-i tests/document-loader.c || die
 
+	# Fix out-of-source build
+	epatch "${FILESDIR}"/${PN}-3.14.0-fix-install.patch
+
+	eautoreconf
+
 	vala_src_prepare
 	gnome2_src_prepare
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/
@ 2014-10-12 23:19 Gilles Dartiguelongue
  0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-12 23:19 UTC (permalink / raw
  To: gentoo-commits

commit:     bd595ad300bd52366175fba9f2f21a245d82c614
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 12 22:25:25 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 23:19:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bd595ad3

app-editors/gedit: switch to copy sources

Some perl script is driving me crazy not working with out-of-source
builds.

---
 .../gedit/files/gedit-3.14.0-fix-install.patch     | 23 --------
 app-editors/gedit/gedit-3.14.0.ebuild              | 61 +++++++++-------------
 app-editors/gedit/gedit-9999.ebuild                | 52 ++++++++----------
 3 files changed, 47 insertions(+), 89 deletions(-)

diff --git a/app-editors/gedit/files/gedit-3.14.0-fix-install.patch b/app-editors/gedit/files/gedit-3.14.0-fix-install.patch
deleted file mode 100644
index e2627ba..0000000
--- a/app-editors/gedit/files/gedit-3.14.0-fix-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 634726ba5be7caa947a676fbe7b8091311b41b62 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 12 Oct 2014 23:20:35 +0200
-Subject: [PATCH] Force creation of directory with out-of-source build
-
----
- plugins/externaltools/data/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am
-index e3a4707..3a8de2e 100644
---- a/plugins/externaltools/data/Makefile.am
-+++ b/plugins/externaltools/data/Makefile.am
-@@ -59,5 +59,6 @@ CLEANFILES +=					\
- # generating the .desktop files.
- # If the following bug is fixed, this hack can normally be removed:
- # https://bugs.launchpad.net/intltool/+bug/605826
-+BUILT_SOURCES = $(externaltools_all_desktop_files) $(externaltools_tools_SCRIPTS)
- $(externaltools_all_desktop_files):
- 	$(AM_V_GEN) $(MKDIR_P) $(top_builddir)/plugins/externaltools/data/
--- 
-2.1.2
-

diff --git a/app-editors/gedit/gedit-3.14.0.ebuild b/app-editors/gedit/gedit-3.14.0.ebuild
index a8a2570..339c6ce 100644
--- a/app-editors/gedit/gedit-3.14.0.ebuild
+++ b/app-editors/gedit/gedit-3.14.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{2,3} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils gnome2 multilib python-r1 vala virtualx
+inherit eutils gnome2 multilib python-r1 vala virtualx
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
@@ -70,39 +70,32 @@ src_prepare() {
 	#sed -e '/g_test_add_func/d' \
 	#	-i tests/document-loader.c || die
 
-	# Fix out-of-source build
-	epatch "${FILESDIR}"/${PN}-3.14.0-fix-install.patch
-
-	eautoreconf
-
 	vala_src_prepare
 	gnome2_src_prepare
+
+	python_copy_sources
 }
 
 src_configure() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
-	gedit_configure() {
-		ECONF_SOURCE=${S} \
-		gnome2_src_configure \
-			--disable-deprecations \
-			--enable-updater \
-			--enable-gvfs-metadata \
-			$(use_enable introspection) \
-			$(use_enable spell) \
-			$(use_enable vala) \
-			ITSTOOL=$(type -P true) \
-			"$@"
-	}
-
-	gedit_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir gedit_configure --enable-python
-	}
-
-	# run gedit_py_configure first to avoid out-of-source build for C code
-	use python && python_parallel_foreach_impl gedit_py_configure
-	gedit_configure --disable-python
+	local myconf
+	myconf="
+		--disable-deprecations
+		--enable-updater
+		--enable-gvfs-metadata
+		$(use_enable introspection)
+		$(use_enable spell)
+		$(use_enable vala)
+		$(use_enable python)
+		ITSTOOL=$(type -P true)
+	"
+
+	if use python ; then
+		python_parallel_foreach_impl gnome2_src_configure ${myconf}
+	else
+		gnome2_src_configure ${myconf}
+	fi
 }
 
 src_test() {
@@ -114,13 +107,9 @@ src_test() {
 }
 
 src_install() {
-	gedit_py_install() {
-		pushd "${BUILD_DIR}" > /dev/null || die
-		# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-		emake DESTDIR="${D}" top_builddir="${S}" pyoverridesdir="$(python_get_sitedir)/gi/overrides" install
-		popd > /dev/null
-	}
-
-	gnome2_src_install
-	use python && python_foreach_impl gedit_py_install
+	if use python ; then
+		python_foreach_impl gnome2_src_install
+	else
+		gnome2_src_install
+	fi
 }

diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild
index 3d76df0..7d06b78 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-9999.ebuild
@@ -88,27 +88,23 @@ src_configure() {
 	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
-	gedit_configure() {
-		ECONF_SOURCE=${S} \
-		gnome2_src_configure \
-			--disable-deprecations \
-			--enable-updater \
-			--enable-gvfs-metadata \
-			$(use_enable introspection) \
-			$(use_enable spell) \
-			$(use_enable vala) \
-			${myconf} \
-			"$@"
-	}
-
-	gedit_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir gedit_configure --enable-python
-	}
-
-	# run gedit_py_configure first to avoid out-of-source build for C code
-	use python && python_parallel_foreach_impl gedit_py_configure
-	gedit_configure --disable-python
+	local myconf
+	myconf="
+		--disable-deprecations
+		--enable-updater
+		--enable-gvfs-metadata
+		$(use_enable introspection)
+		$(use_enable spell)
+		$(use_enable vala)
+		$(use_enable python)
+		ITSTOOL=$(type -P true)
+	"
+
+	if use python ; then
+		python_parallel_foreach_impl gnome2_src_configure ${myconf}
+	else
+		gnome2_src_configure ${myconf}
+	fi
 }
 
 src_test() {
@@ -120,13 +116,9 @@ src_test() {
 }
 
 src_install() {
-	gedit_py_install() {
-		pushd "${BUILD_DIR}" > /dev/null || die
-		# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-		emake DESTDIR="${D}" top_builddir="${S}" pyoverridesdir="$(python_get_sitedir)/gi/overrides" install
-		popd > /dev/null
-	}
-
-	gnome2_src_install
-	use python && python_foreach_impl gedit_py_install
+	if use python ; then
+		python_foreach_impl gnome2_src_install
+	else
+		gnome2_src_install
+	fi
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-10-12 23:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-12 23:19 [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2014-10-12 23:19 Gilles Dartiguelongue
2011-02-21 12:28 Nirbheek Chauhan
2011-02-19 10:54 Priit Laes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox