gentoo resync : 02.06.2019

3 files changed, 71 insertions, 6 deletions

diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 0bc7f0c6b7d2..58ebaf234785 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,6 @@
+AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
 DIST gedit-3.30.2.tar.xz 3155628 BLAKE2B 96736adbce987af89b37a712448f42b2a2eeed72d52aa16377d961c9e929fa4e75205eac5987bfc067cc2fecb35aec720d85483c4e2e824a6e8248cc652d2fbe SHA512 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f
-DIST gedit-3.32.0.tar.xz 14793216 BLAKE2B b1d9af7882063a622fe27f8e5aa322e2a1724410c4419d538712fdda2cab10aa59014a82cc1a41b35966dceb1b75ce2613d9c5c98400743b31df76b0114e84e8 SHA512 f25ed05f5d3b7ab7711be32c6516479c8b515d6d5983e3bc3a00407740fb8ec42b1e9a3005473671fc144f4437b9e98355a3669210eefb5bf8288f171188f387
+DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
 EBUILD gedit-3.30.2.ebuild 2323 BLAKE2B 4fa5600d7163ce9fb6670a89d9151343cc7c256cbb0219f3150f94acdb2ff4b53e85dc116eec708ebf12b0fd5926325fdcd1d725c956b8c7001db89c643ceddc SHA512 a0c3b76b6f6454678d50a6f60bb8dae830023dabc22de5581848bf42932a25db9fa8c32b753e6747c486badcaa7c3f679b58a0874c26f99f69f1c7a2049a217e
-EBUILD gedit-3.32.0-r1.ebuild 1922 BLAKE2B 6dd9b4ad92a3190dd099f9fbd32b72bae48165e1aeb00d10bbf7b573177ed449dbb162cf06e324c85220576cfc7f995324935b41754e7f63d2e8abbe5bfb0eb1 SHA512 6492ed41a81a5ea20b8437e0206e1ea1db9e62787eac906e01131b317768457be0878f9f9b9e0b3cf40f4cbe733e32e7c06222c1ecff3ed483fcc3d55c97c44c
+EBUILD gedit-3.32.2.ebuild 2163 BLAKE2B abf16e09a414b271844be8d0edb6104f89cd31b10ad08d3e1fc1c559454f20695c1e9eef1bd6d6042e89087fffa057ad6a518cd0f2b027e4acaa4bf08904f626 SHA512 25581461a2c949e99e0dfb1eb2a06c998307d5db542c8407239cfcbf01c0ec9bce00210db2085efeabc7eb92203c3aba3379f42a13dc3c47a6b8e8ae4dc9f058
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/files/3.32.2-make-spell-optional.patch b/app-editors/gedit/files/3.32.2-make-spell-optional.patch
new file mode 100644
index 000000000000..1d772590f605
--- /dev/null
+++ b/app-editors/gedit/files/3.32.2-make-spell-optional.patch
@@ -0,0 +1,61 @@
+From 72efa486222cde6094c217efc6085f49af1cca85 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhan@gentoo.org>
+Date: Sun, 26 May 2019 14:19:17 -0400
+Subject: [PATCH] make spell optional
+
+---
+ meson.build         | 4 +++-
+ meson_options.txt   | 4 ++++
+ plugins/meson.build | 4 +++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 2f4d7e5..f67e320 100644
+--- a/meson.build
++++ b/meson.build
+@@ -86,7 +86,8 @@ libxml_dep = dependency('libxml-2.0', version: libxml_req)
+ libgd_dep = libgd_sp.get_variable('libgd_dep')
+ 
+ libsoup_dep = dependency('libsoup-2.4', version: libsoup_req, required: true)
+-gspell_dep = dependency('gspell-1', version: gspell_req, required: true)
++with_gspell = get_option('spell')
++gspell_dep = dependency('gspell-1', version: gspell_req, required: false)
+ x11_dep = dependency('x11', required: false)
+ 
+ introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req, required: false)
+@@ -189,6 +190,7 @@ summary = [
+   '  Introspection: @0@'.format(generate_gir),
+   '        Plugins: @0@'.format(build_plugins),
+   '       Vala API: @0@'.format(generate_vapi),
++  '          Spell: @0@'.format(with_gspell),
+   '  Gvfs metadata: @0@'.format(enable_gvfs_metadata),
+   '',
+   'Directories:',
+diff --git a/meson_options.txt b/meson_options.txt
+index 90803fa..e1f7349 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -16,3 +16,7 @@ option('documentation',
+ option('enable-gvfs-metadata',
+         type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
+         description: 'Enable using gvfs to store metadata')
++
++option('spell',
++	type:'boolean', value: true,
++	description: 'Build spell support')
+diff --git a/plugins/meson.build b/plugins/meson.build
+index af94ab7..abeeac5 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -21,5 +21,7 @@ subdir('quickhighlight')
+ subdir('quickopen')
+ subdir('snippets')
+ subdir('sort')
+-subdir('spell')
++if with_gspell
++  subdir('spell')
++endif
+ subdir('time')
+-- 
+2.21.0
+
diff --git a/app-editors/gedit/gedit-3.32.0-r1.ebuild b/app-editors/gedit/gedit-3.32.2.ebuild
index 02db350e3688..1efe7a9a4ebb 100644
--- a/app-editors/gedit/gedit-3.32.0-r1.ebuild
+++ b/app-editors/gedit/gedit-3.32.2.ebuild
@@ -15,10 +15,10 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="+introspection +python gtk-doc vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+IUSE="+introspection +python gtk-doc spell vala"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
 
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 COMMON_DEPEND="
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
 		dev-libs/libpeas[python,${PYTHON_USEDEP}] )
-	>=app-text/gspell-0.2.5:0=
+	spell? ( >=app-text/gspell-0.2.5:0= )
 "
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/adwaita-icon-theme
@@ -54,6 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.18
 	virtual/pkgconfig
 "
+PATCHES=( "${FILESDIR}/${PV}-make-spell-optional.patch" )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -69,7 +70,9 @@ src_configure() {
 		$(meson_use gtk-doc documentation)
 		$(meson_use introspection)
 		$(meson_use python plugins)
+		$(meson_use spell)
 		$(meson_use vala vapi)
+		-Denable-gvfs-metadata=yes
 	)
 	meson_src_configure
 }