gentoo resync : 25.08.2018

3 files changed, 13 insertions, 25 deletions

diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 5e0d13996738..c454f7ad6268 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -2,7 +2,7 @@ AUX stardict-4.0.0_pre20160518-tabfile.patch 1144 BLAKE2B 0a846a6ce002c53adbb170
 DIST QQWry.Dat.bz2 4114875 BLAKE2B 3fb1a3b223b799645fcc7adc3d8158c80551bd1d35689a44d4e24978ef3535def3c8c45c37f066ea3969d141aef0c34c6040dcdaf6b3f337b178bbffaf52d86f SHA512 46fd677359a2144429eb9d16131ca6b19db1c086fa93e275aa3d702d3024a65d54064df931d1ed2ba5b0c1f7d9595a284f2a8995d9cd5aac96a45216422dc9ae
 DIST WyabdcRealPeopleTTS.tar.bz2 84329208 BLAKE2B 1dd9c00e4e914b0d747876aa566db59a4b973b3ec61fa1ed7a55f885d7f415f573f2f8783eca46c565bc52df4ba3576b3a0f4e863b4f7ba688007f6d6b375209 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0
 DIST stardict-3.0.6.tar.bz2 9341740 BLAKE2B df0ccfbd485dfb514bdcf4edaf92b2faf3c11016b025ca09596adcc12738027395a049d9d27420427acdf5c46923cb43ba521d334f875070f5451b7ff147e36f SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
-DIST stardict-4.0.0_pre20160518.tar.xz 3605324 BLAKE2B bd160edddef547c72f3002e8a6c290a1538ea25335c8eb66b77d0bc261fe7666019b6e746b1a7d47d3098d5b35fdd091f47132a511cfa118dc3c44dea8361dbe SHA512 5fb04d7870019f17038e0750a2250a0dca44c427f427cd987542eea2bdfab91223e2c01bae844c43f7d8991d51c0420bd4d77ad6d3f7d86cf6f9c50dae7ca50e
-EBUILD stardict-3.0.6-r3.ebuild 6048 BLAKE2B e890c61ceb6b5fd7c16ce93e9dba30de59fe5ffc8599b725cd14d03c2d3395d07b4317ef8c14af496d5c10a2cad441197e88e9d8c836e4221ed7c50c7fe91e60 SHA512 6ceb6977ddd47a167d2d037c987171cdcb9b4fe21fc89f11b2b0df421c1f9960f442b108723976f1417f3d02f8d08c09079a05bc709e79afa055298c287accb8
-EBUILD stardict-4.0.0_pre20160518-r1.ebuild 6779 BLAKE2B b67b33a26266101c5c58233bbf596d1fe3ce693b98b72717a8057c2e049afe09008e9458d1bf0e4d0f8023b13b213ded3c3174939760c8f120b61647a6442c72 SHA512 b7b0b93bffb2200aa97076ea8de54395a6db668c79d5b489d91759399b645c0941372480607819fe3c80162940f244a279c8db6b5ffc6a89a8cd75e41fad8021
+DIST stardict-4.0.0_pre20170304.tar.xz 3603012 BLAKE2B c9ac41f1e27c013e9c20e5b5477889cb4933ebaf35629311362ec48e820b10a7492d464ac7eddded697ca49f56f65032a1af36088e8e731643e83532e0586e48 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a
+EBUILD stardict-3.0.6-r3.ebuild 6059 BLAKE2B e9747091de8ef6676d5e1b4fc50b38ebfa43bba4cf849a984572b926973be8e22e7ec36bc67414e7f638320357d14c84c4e30573f33802db207fcc0b5efe2ba2 SHA512 43cecc331dadbe8ed67f854bff4262b313af27edc8b8008bf2210e5388103325c26d1ccf3f87cf49c1801393517ac6e73cd653b0ec860a8b574625037ce41a53
+EBUILD stardict-4.0.0_pre20170304.ebuild 6472 BLAKE2B 6d153bf778298984d60780f5302f6ae66609532d6ccc6a1b71fcd9f0ecff9475ddd0af032691fba5e4c1e04cf5659c3f8ae5a2b0994354c96ef089270229e7ed SHA512 5ecf1e60594a9ae809567063d8341f188e930186b0d14fbc91dbe9cf226a9e4cd8c8dd2ce274f798494aca2d170d6e3452d241267e1727c6756fffc343c60a3f
 MISC metadata.xml 2668 BLAKE2B f5d9f4b43187c2140f84addb9bf1c2d209d7ef0de7a5081fae594c27b439ef77686ac9fd8b555bc95b76bdef041dab75fbdbe1bf5451bd754b4cfd1dd5d7771d SHA512 caae150f5dd42c45ee5f17659df5700b52ed38c9005c37316df9c4828dcfbbeed1dd585c8c9b44acfe16f1f68f745354ac40e4dc5695df183cbf5c64e82826d7
diff --git a/app-text/stardict/stardict-3.0.6-r3.ebuild b/app-text/stardict/stardict-3.0.6-r3.ebuild
index 677af8811503..6d913303f558 100644
--- a/app-text/stardict/stardict-3.0.6-r3.ebuild
+++ b/app-text/stardict/stardict-3.0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,9 +38,9 @@ COMMON_DEPEND="
 	gucharmap? ( gnome-extra/gucharmap:0= )
 	spell? ( >=app-text/enchant-1.2 )
 	tools? (
+		dev-db/mysql-connector-c
 		dev-libs/libpcre:=
 		dev-libs/libxml2:=
-		virtual/mysql
 		python? ( ${PYTHON_DEPS} )
 	)
 "
diff --git a/app-text/stardict/stardict-4.0.0_pre20160518-r1.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
index 554d2eb7bce3..7ef439a91b49 100644
--- a/app-text/stardict/stardict-4.0.0_pre20160518-r1.ebuild
+++ b/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ LICENSE="CPL-1.0 GPL-3 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="advertisement cal debug dictdotcn espeak examples flite
-fortune gnome gucharmap +htmlparse info man perl +powerwordparse
+fortune gucharmap +htmlparse info man perl +powerwordparse
 pronounce python qqwry spell tools updateinfo +wikiparse +wordnet
 +xdxfparse youdaodict"
 
@@ -40,19 +40,13 @@ COMMON_DEPEND="
 	x11-libs/pango
 	espeak? ( >=app-accessibility/espeak-1.29 )
 	flite? ( app-accessibility/flite )
-	gnome? (
-		gnome-base/gconf:2
-		gnome-base/libbonobo
-		gnome-base/libgnome
-		gnome-base/orbit:2
-	)
-	gucharmap? ( gnome-extra/gucharmap:0= )
+	gucharmap? ( gnome-extra/gucharmap:2.90= )
 	spell? ( >=app-text/enchant-1.2 )
 	tools? (
+		dev-db/mysql-connector-c
 		dev-libs/expat
 		dev-libs/libpcre:=
 		dev-libs/libxml2:=
-		virtual/mysql
 		python? ( ${PYTHON_DEPS} )
 	)
 "
@@ -74,7 +68,7 @@ REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
 # docs are messy, installed manually below
 DOCS=""
 
-PATCHES=( "${FILESDIR}/${P}-tabfile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20160518-tabfile.patch" )
 
 src_prepare() {
 	# From Fedora
@@ -98,9 +92,7 @@ src_prepare() {
 	fi
 
 	# bug 604318
-	if ! use gnome; then
-		sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac || die
-	fi
+	sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac || die
 
 	eapply_user
 	eautoreconf
@@ -108,15 +100,12 @@ src_prepare() {
 }
 
 src_configure() {
-	# Hint: EXTRA_ECONF="--enable-gnome-support" and manual install of
-	# libbonobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 will
-	# give you GNOME 2.x support, that is otherwise considered deprecated
-	# because of the deep GNOME 2.x core library dependencies
-
 	# Festival plugin crashes, bug 188684. Disable for now.
+	# Gnome2 support is disabled due to deprecation request, bug 644346
 	gnome2_src_configure \
 		--disable-darwin-support \
 		--disable-festival \
+		--disable-gnome-support \
 		--disable-gpe-support \
 		--disable-maemo-support \
 		--disable-schemas-install \
@@ -128,7 +117,6 @@ src_configure() {
 		$(use_enable espeak) \
 		$(use_enable flite) \
 		$(use_enable fortune) \
-		$(use_enable gnome gnome-support) \
 		$(use_enable gucharmap) \
 		$(use_enable htmlparse) \
 		$(use_enable info) \