[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/

["Gilles Dartiguelongue" <eva@gentoo.org>]

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
 }