app-text/stardict: Fix compilation

Signed-off-by: Martin Väth <martin@mvath.de>

5 files changed, 4 insertions, 214 deletions

diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 6eaa470c..fc7d8d3c 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -1,4 +1,3 @@
 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_pre20170304.tar.xz 3603012 BLAKE2B c9ac41f1e27c013e9c20e5b5477889cb4933ebaf35629311362ec48e820b10a7492d464ac7eddded697ca49f56f65032a1af36088e8e731643e83532e0586e48 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a
diff --git a/app-text/stardict/stardict-3.0.6-r4.ebuild b/app-text/stardict/stardict-3.0.6-r4.ebuild
deleted file mode 100644
index 4067932b..00000000
--- a/app-text/stardict/stardict-3.0.6-r4.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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.
-
-GNOME2_LA_PUNT=yes
-
-inherit autotools flag-o-matic gnome2
-
-DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict-4.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
-	pronounce? ( https://${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 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="advertisement debug dictdotcn espeak examples gnome +gucharmap
-+htmlparse man perl +powerwordparse pronounce qqwry spell
-tools updateinfo +wikiparse +wordnet +xdxfparse"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.16:2
-	dev-libs/libsigc++:2=
-	sys-libs/zlib:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	x11-libs/pango
-	gucharmap? ( gnome-extra/gucharmap:0= )
-	spell? ( >=app-text/enchant-1.2:0= )
-	tools? (
-		dev-db/mysql-connector-c
-		dev-libs/libpcre:=
-		dev-libs/libxml2:=
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	espeak? ( >=app-accessibility/espeak-1.29 )
-	perl? ( dev-lang/perl )
-"
-DEPEND="${COMMON_DEPEND}
-	gnome? (
-		app-text/docbook-xml-dtd:4.3
-		app-text/gnome-doc-utils
-		dev-libs/libxslt
-	)
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# docs are messy, installed manually below
-DOCS=""
-
-src_prepare() {
-	# From Fedora
-	# Remove unneeded sigc++ header files to make it sure
-	# that we are using system-wide libsigc++
-	# (and these does not work on gcc43)
-	find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f || die
-
-	# libsigc++ started to require c++11 support
-	append-cxxflags "-std=c++11"
-
-	eapply_user
-	if ! use gnome
-	then	sed -i \
-				-e 's/GNOME_DOC_INIT/GNOME_DOC_INIT([0.32],[:],[:])/' \
-				-e '/AM_GCONF_SOURCE/d' \
-				-e '/help\/Makefile/d' \
-				dict/configure.ac
-			sed -i \
-				-e 's/ help / /' \
-				dict/Makefile.am
-			sed -i \
-				-e 's/\(libstardict_la_LIBADD = \)/\1 -lgmodule-2.0 /' \
-				dict/src/lib/Makefile.am
-			eautoreconf
-	fi
-	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
-
-	# Festival plugin crashes, bug 188684. Disable for now.
-	gnome2_src_configure \
-		--disable-festival \
-		--disable-gnome-support \
-		--disable-gpe-support \
-		--disable-schemas-install \
-		--disable-scrollkeeper \
-		$(use_enable advertisement) \
-		$(use_enable debug) \
-		$(use_enable dictdotcn) \
-		$(use_enable espeak) \
-		$(use_enable gucharmap) \
-		$(use_enable htmlparse) \
-		$(use_enable man) \
-		$(use_enable powerwordparse) \
-		$(use_enable qqwry) \
-		$(use_enable spell) \
-		$(use_enable tools) \
-		$(use_enable updateinfo) \
-		$(use_enable wikiparse) \
-		$(use_enable wordnet) \
-		$(use_enable xdxfparse)
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodoc AUTHORS ChangeLog README
-
-	docinto dict
-	dodoc dict/{AUTHORS,ChangeLog,README,TODO}
-	dodoc dict/doc/{Documentation,FAQ,HowToCreateDictionary,Skins,StarDictFileFormat,TextualDictionaryFileFormat,Translation}
-
-	docinto lib
-	dodoc lib/{AUTHORS,ChangeLog,README}
-
-	if use examples; then
-		docinto dict
-		dodoc dict/doc/stardict-textual-dict*
-		docompress -x /usr/share/doc/${PF}/dict
-	fi
-
-	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
-	# and additional scripts from tools dir
-	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 sd2foldoc ${PN}-text2bin
-			${PN}-bin2text ${PN}-repair"
-
-		use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
-
-		for app in ${apps}; do
-			if [[ "${app}" =~ ^${PN} ]]; then
-				dobin "tools/src/${app}"
-			else
-				newbin "tools/src/${app}" "${PN}_${app}"
-			fi
-		done
-
-		docinto tools
-		dodoc tools/{AUTHORS,ChangeLog,README}
-
-		if use examples; then
-			docinto tools
-			dodoc tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
-			docompress -x /usr/share/doc/${PF}/tools
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog
-	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 "  emerge -s ${PN}-"
-	elog
-	elog "Additionally you may install any stardict dictionary from the net"
-	elog "by unpacking it to:"
-	elog "  /usr/share/stardict/dic"
-	elog
-
-	gnome2_pkg_postinst
-}
diff --git a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
index e1468fc4..ce23950f 100644
--- a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
+++ b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2024 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,6 +28,8 @@ pronounce qqwry spell tools updateinfo +wikiparse +wordnet
 
 RESTRICT="test"
 
+S=${WORKDIR}/${P}
+
 COMMON_DEPEND="
 	>=dev-libs/glib-2.32:2
 	dev-libs/libsigc++:2=
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 689a83b9..320b80f0 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -56,7 +56,7 @@ app-text/ispell 3.4.00-r1: fast screen-oriented spelling checker
 app-text/mbtpdfasm 1.0.28-r1: Tool to assemble/merge, extract information from, and update the metadata in PDF
 app-text/psjoin 0.3: concatenate postscript files. From new PostScript Utilities
 app-text/qtspell 1.0.1: Spell checking for Qt text widgets
-app-text/stardict 3.0.6-r4 4.0.0_pre20170304-r1: A international dictionary supporting fuzzy and glob style matching
+app-text/stardict 4.0.0_pre20170304-r1: A international dictionary supporting fuzzy and glob style matching
 dev-cpp/cpplint 99999999: The google styleguide together with cpplint and an emacs file
 dev-libs/osformat 1.0.7 999999999: C++ library for a typesafe printf/sprintf based on << conversion
 dev-perl/File-lchown 0.20-r2: Use the lchown(2) and lutimes(2) system call from Perl
@@ -76,9 +76,6 @@ games-rpg/aklabeth 1.0-r1: A remake of Richard C. Garriott's Ultima prequel
 games-rpg/dsa-stats 1.1: calculate stat probabalities for the role playing game DSA - Das schwarze Auge
 games-rpg/m5figur-mv 4.2.2: LaTeX2e character sheet layout for the Midgard Role Playing Game (Edition M5)
 gui-apps/wcm 0.8.0: Wayfire Config Manager
-gui-apps/wf-shell 0.8.0: Compiz like 3D wayland compositor
-gui-libs/wf-config 0.8.0: library for managing wayfire configuration files
-gui-wm/wayfire 0.8.0: compiz like 3D wayland compositor
 media-gfx/ipe 7.2.26: Drawing editor for creating figures in PDF or PS formats
 media-gfx/libspiro 20200505-r1: A spline computation library
 media-gfx/pqiv 2.11: powerful GTK based command-line image viewer with a minimal UI
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7a3bd569..d8b95f1c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -106,9 +106,6 @@ games-emulation/xmame:net - Add network support
 games-emulation/xmess:bundled-libs - Use bundled version of dev-libs/expat
 games-emulation/xmess:net - Add network support
 games-rpg/m5figur-mv:examples - Compile example character sheet as PDF
-gui-wm/wayfire:gles - use libglvnd to do animations more efficiently
-gui-wm/wayfire:system-wfconfig - use the system-wide wf-config, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.
-gui-wm/wayfire:system-wlroots - use the system wide wlroots, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.
 media-gfx/pqiv:archive - Enable support for images in archives and cbX comic book files
 media-gfx/pqiv:gtk2 - Use gtk:2 instead of gtk:3
 media-tv/sundtek-tv:ld-preload-env - Install LD_PRELOAD in /etc/env.d/50sundtek-tv