Punt optional GNOME 2.x integration libbobecause of thenobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 dependency chain. Use subslot deps where appropiate.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 146 insertions, 15 deletions

diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index deb4c5909f01..d4935b1eb4ad 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/stardict
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.38 2014/08/02 18:12:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.39 2014/08/03 15:41:27 ssuominen Exp $
+
+*stardict-3.0.4-r1 (03 Aug 2014)
+
+  03 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> +stardict-3.0.4-r1.ebuild:
+  Punt optional GNOME 2.x integration libbobecause of thenobo-2, libgnome-2,
+  libgnomeui-2, gconf-2 and orbit-2 dependency chain. Use subslot deps where
+  appropiate.
 
   02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> stardict-3.0.4.ebuild:
   Stable for ppc64, wrt bug #510900
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 315c202e01a7..f6fd9f9f19e5 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -12,23 +12,18 @@ DIST WyabdcRealPeopleTTS.tar.bz2 84329208 SHA256 96a398eaef3e84f6f23e61683e64399
 DIST stardict-3.0.3.tar.bz2 9147947 SHA256 9ba10a5b3dcdd02b81c7a138dac15903a6bc2355856f60338f3775e371472b73 SHA512 de0f283659646fb1615e8de0e0b8f1ad431ee8d4f80778cab07436e7b8c981766e13c48e65d88715300fe2a6fcad0f344e6a832f65f94f197121796d8cf192b3 WHIRLPOOL 46d879b2699a8e35242947829901151a74acb5012c1f00144e8dac1b936f476fe1b667fd51e47e885ba7459c946ffd5b7e129f0af6e8f417dca0e3e7d08c6bc8
 DIST stardict-3.0.4.tar.bz2 8961622 SHA256 c38b9d953fe0b2380a8aed4c98cb121ad83aff91a32af3c665198d8268b1dce8 SHA512 a1cbf58202b5430b0869955bfb7df961debab12abf55022f7c07537246c81dc182c3be50fa66273c13c289471c15afba74d15933cb202ae292f4388aa2fb6fd5 WHIRLPOOL b0476e5f38862e4c2a747206a8f1d8c55dc889d1138961390aa9f415ec310cabce242e7a4f484a4c260a004e3a8a152726cf936f0ec030586ddcd91979912aa0
 EBUILD stardict-3.0.3-r2.ebuild 3978 SHA256 c7995cd0ac6a367ea559ab1566195e7216e90387740fe2b9a5e7ab9962b4ff82 SHA512 90030eb35894d6860d7737943a9d1cf1550512203b8877ccd4cf98eb39e4bb13c5b93502859e334946bd2f59eb82d0d7f0895d2bdfbd184786fab12f68e24529 WHIRLPOOL 980b72c0ca77429dd9eeef74583017828b6469c8fa4a5bcabe4da99966c3b5c3e01e308acc985e9c402232155adb5b257e8d8b06de9245388cf2f0bcf5052dea
+EBUILD stardict-3.0.4-r1.ebuild 4079 SHA256 1432886a7994aa8b679dc3fa329033fc0a5b63d9b84f1903471999df0023c3f2 SHA512 593417d1786dc48b01e6a84a230598902d9e71396b9951298c955034ce3c17974899ed512667e70c3f95fe8aba1acb048231d9ef608d3f868f14df4ef9cd1010 WHIRLPOOL b23331b054a7f567fd6308397fdb457a445b298c6036702f6863345dbf771009ed4dadbe8e880c3bc9afc8f6902afb6e6fef2b3f2298d2e872237f8b1d25d08c
 EBUILD stardict-3.0.4.ebuild 3948 SHA256 a653401b70d90e3302d778d1926f2ec8c843312766471656a711a2d940804edb SHA512 adb4013ce4faac83320466b419f9600ca64c18853c026df86e7129e7e8887aec5242e4db9126b4539e57e35deb8b109c93da85f51264ec37a5bb52488fcc1ac6 WHIRLPOOL cc444eef852e8b454ebcfdf1bd175e20462310fa950870d70ccb140e7e0199c3d7b3742733700143d8141d6ccde385ca36f5d166ddfe68f83c14a1b120e97003
-MISC ChangeLog 15485 SHA256 d8a79c4f170cac1967ce246b066cf31a6611d03049c6caec01f989f1e7f4c93f SHA512 a24c1584ee358675c7bfa13d0a26bcfa31cc2ce6009eaf8c348d552309b9519b2b69be306ce55196d48623c6baf3992b0e9b800b89a03e258f405e9101193b7e WHIRLPOOL e783594de8293c7c4262f9ad950e522833c1d794beda58ca3763786d1cf49305b33c5bc09f9a56fa2fc8df6bd445ea68cfa9bbbd37299427feeed2b073ef2475
+MISC ChangeLog 15775 SHA256 65e6a80a493fb8da3a1fc6e8ef83013fcf8bd28bd219e388b777ff2a0fece999 SHA512 ea50c88ab7720625bd5f22d6c36c8d7bf5524f2353fea89b1e6ad1f5ab8bf45e6423b42efb1fb11ed40ecbbfa9fb293ce10d0bba3546ec3a7606fa997c3d2f70 WHIRLPOOL a4b5338a5085916b1acd16c0f5180faba6c4bbd1b880b102524bd6e9af8e66873e5211e981680078f6cdacaa842ebd7a6ac29588458a97f843c24dec61324e63
 MISC metadata.xml 1067 SHA256 1aec5c10f21c4ae03950a76dad888de6a173b65f13b0b3e7a596ea6ca1f3b9c0 SHA512 33168bec81b1eebcef6dca1b585e278fb7006c2d715cc8c6c107fc66b9a31a9fbaa760a5838a7d403f2e1c2bcad91b595b646e1a147e8fcabd6ac83214b3e3db WHIRLPOOL a5527a99b7f100e98924e1b4b8392b6f369e6502344f5be36a1d709675fa55497bd5c1cc9ec9c2e6167dcaeeb2f9a6119c100af4800f0b319430b88643878855
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT3Sn6AAoJELp701BxlEWfZSYP+QEycVOrrDwrzKobTZofW0Bn
-R+rPgyXFdJrMUeUrY3QQfiWpSxGmUjCcL/m34sgWOAzQzSVwmk3w5bdiR7TKvrXx
-O630LQH6xz9b6mbVUY4ivb7rV1TRKIIs3HF8INYiCBqA6LTAa4QOOTegFt5KKNnL
-CfHRuxE1kXiAW5qXHF0R9Grd95V7CBUaqoDNoPtCxBGSiiythoos8w3F0d2tS/+h
-ImAIc5MV4XPdImz5nTjUhSSo0EizsQHWKd9MK20Gc3JqdudnZV/bJoryMj7dS/mD
-giAkMTm7gkepG4ljpR4dZr+TLzHCVU3kmdteh7BodfTLYZ3dm8WZvmWs0R10zaXR
-gUkJ2T23hwiQQ1qleS0d2ekt52BlUiyc7t5npGJfaxGz1AQHDySbMRZGsV4UrqNg
-USx4f687the/11upNptFNuDDZh6Lgp5qQV08VjrcdS4eRSYiG++t88VCPWU7VhCs
-bnKXZDsQlJ9lWfu0WfdGudbpG7crbe7n34gHWIeIpQZOtUQWWa7j/sHjjfGe9rn+
-Z1YurW+1r2Qgqe7DiNIUup9rjmrDk7xbLTH99qr5NjOPON8G6th/eEBkFdS0mfGY
-PI6I7GPpnw6qbkzSAGlaHIOwYOf49E0zpdQbTryRfHks8XQl2oDVdOgF6YbGP12x
-BzSa4Yw6BrUv2SIUHeZC
-=CRs6
+iQEcBAEBCAAGBQJT3lgSAAoJEEdUh39IaPFNQmkIAJOOvteTPOC1jN2JsSTYVwa5
+tgaTmdk9Py3GFeT0iAOPjvg/rdYc2KWUU1UDx/36PEFVJIw7L2R3MtXxo9VTplqb
+Er+KE4/JCYH/lY7kfkFMJZSG05OKkUyeM9Tn1fdxyRUSvkS7a4E4B4g+sKc86GpZ
+S4aHT0BBBCTThkQAf96WPAaXex/MFwXCZ1wgKBsCBWELk0PshKmtg88a1yj2AQK8
+RCyVsTCQqzxzrNSGfAUeHLUsIrpAkVy7xBXjaJyfcWmN7+Z2WIzA+qZRUllvHm0U
+8eDmCJYTChyo5A2lFnuCV8zBCrmXl8BAqxvKUut0/rBCy7MQAoF8cTlWyupQjMA=
+=l5HT
 -----END PGP SIGNATURE-----
diff --git a/app-text/stardict/stardict-3.0.4-r1.ebuild b/app-text/stardict/stardict-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..b22f1062b850
--- /dev/null
+++ b/app-text/stardict/stardict-3.0.4-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.4-r1.ebuild,v 1.1 2014/08/03 15:41:27 ssuominen Exp $
+
+EAPI=5
+
+# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
+#       their indexes seem to be in a different format. So we'll keep them
+#       seperate for now.
+
+# NOTE: Festival plugin crashes, bug 188684. Disable for now.
+
+GNOME2_LA_PUNT=yes
+GCONF_DEBUG=no
+
+inherit eutils gnome2
+
+DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
+HOMEPAGE="http://code.google.com/p/stardict-3/"
+SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.bz2
+	pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
+	qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
+
+LICENSE="CPL-1.0 GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="espeak gucharmap qqwry pronounce spell tools"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16:2=
+	dev-libs/libsigc++:2=
+	sys-libs/zlib:=
+	>=x11-libs/gtk+-2.20:2=
+	gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
+	spell? ( >=app-text/enchant-1.2 )
+	tools? (
+		dev-libs/libpcre:=
+		dev-libs/libxml2:=
+		virtual/mysql
+		)"
+RDEPEND="${COMMON_DEPEND}
+	espeak? ( >=app-accessibility/espeak-1.29 )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/gnome-doc-utils
+	dev-libs/libxslt
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# These 2 fixes have been upstreamized for upcoming 3.0.5 differently, so drop 'em:
+	epatch "${FILESDIR}"/${PN}-3.0.3-zlib-1.2.5.2.patch
+	sed -i -e '/DEP_MODULES/s:glib-2.0:gmodule-2.0 &:' dict/configure || die
+
+	gnome2_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
+	gnome2_src_configure \
+		$(use_enable tools) \
+		--disable-scrollkeeper \
+		$(use_enable spell) \
+		$(use_enable gucharmap) \
+		--disable-festival \
+		$(use_enable espeak) \
+		$(use_enable qqwry) \
+		--disable-updateinfo \
+		--disable-gnome-support \
+		--disable-gpe-support \
+		--disable-schemas-install
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
+
+	if use qqwry; then
+		insinto /usr/share/${PN}/data
+		doins ../QQWry.Dat
+	fi
+
+	if use pronounce; then
+		docinto WyabdcRealPeopleTTS
+		dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
+		rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
+		insinto /usr/share
+		doins -r ../WyabdcRealPeopleTTS
+	fi
+
+	# noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
+	if use tools; then
+		local app
+		local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic
+			dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
+			xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist
+			tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf
+			jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon
+			${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki
+			ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
+			xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
+			resdatabase2dir dir2resdatabase ${PN}-index ${PN}-text2bin
+			${PN}-bin2text ${PN}-repair"
+
+		for app in ${apps}; do
+			newbin tools/src/${app} ${PN}_${app}
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
+	elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
+	elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
+	elog '"echo %s | festival --tts"'
+	elog
+	elog "You will now need to install ${PN} dictionary files. If"
+	elog "you have not, execute the below to get a list of dictionaries:"
+	elog
+	elog "  emerge -s ${PN}-"
+
+	gnome2_pkg_postinst
+}