gentoo resync : 19.03.2019

18 files changed, 353 insertions, 253 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index eae0cb0b43f7..2334ce03872c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 49ae4da8bba8..17da3d269675 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST gedit-plugins-3.28.1.tar.xz 1350468 BLAKE2B 4fd50ad7358581f5e27f0c3a7e127d4e2c0e7189c039daee1d8d7ddf7062846e1aebb634b3edd998c9a7c11840c71f56fe4eeca78ea2e91ae18db814e4fd79e5 SHA512 6258c627cd3fa2948375c30e87061375c0d09ce2c70301c2d10a403e6075d1df09e928a2d95b72f6d7950a31a720af645fff2f7f59a281d2999948beb56c1dc9
+DIST gedit-plugins-3.30.1.tar.xz 1354644 BLAKE2B ee42fb2fe47c9219442e0bbdaf21a14a834b8bc38558713ccf0ad384814812fd71f4d318624b4d2c149b26d304203a2b954ef49c3299877f4d067ae181bfe1d5 SHA512 0e777779288b51015d7ab539bf896a00d5226560f2cc2211daf777da87824eed858255318c421524933a540135e4bfdcc294ba7ed89f680a35aa48f7279cbc94
 EBUILD gedit-plugins-3.28.1.ebuild 2291 BLAKE2B 760bdfb31112d8fa8c620022cdaa5d879fb5ee9ec64fade4c5cf91a85d2b22caff4aaa2a86e0cd612bae6de049ce8b0b2de5c4c4b0b3fe6a6a2229e4f2df5951 SHA512 2cb1b9213a8d00ddd96ada96dae546f48856daec2b6811494b9addec47bc5f9279d494da32872f81eb9d68268ebead14c6f175155e7a93da82a81863a1ddbd53
+EBUILD gedit-plugins-3.30.1.ebuild 2345 BLAKE2B a510912fc6a7c3b03ea568a33611081341565fea303e08b69afe3724bbe454dc0dd047843b0e247c1a86a16f1b34ff78ef947e8796dd82bdcf4c92173be44514 SHA512 8fe30e05058fcce8536dadf96a2d0011f8a0e88870f6f6372a4a1e95dedb2d7f91b95c003cdfe28c960d90d049314f04d1dc3a7c9e4f197405be977af3acef79
 MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild
new file mode 100644
index 000000000000..ee5dd1d5d9d2
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="xml"
+VALA_MIN_API_VERSION="0.28"
+
+inherit eutils gnome2 multilib python-single-r1 vala
+
+DESCRIPTION="Official plugins for gedit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE_plugins="charmap git terminal vala"
+IUSE="+python ${IUSE_plugins}"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	terminal? ( python )
+"
+
+RDEPEND="
+	>=app-editors/gedit-3.16
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libpeas-1.7.0[gtk]
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-3.21.3:3.0
+	python? (
+		${PYTHON_DEPS}
+		>=app-editors/gedit-3.16[introspection,python,${PYTHON_USEDEP}]
+		dev-libs/libpeas[python,${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-3.14:3.0[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	git? ( >=dev-libs/libgit2-glib-0.0.6 )
+	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+	vala? ( $(vala_depend) )
+" # vte-0.52+ for feed_child API compatibility
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.2
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# FIXME: crazy !!!
+	if use python; then
+		find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
+		find "${ED}"/usr/share/gedit -type d -empty -delete || die
+	fi
+
+	# FIXME: upstream made this automagic...
+	clean_plugin charmap
+	clean_plugin git
+	clean_plugin terminal
+}
+
+clean_plugin() {
+	if use !${1} ; then
+		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
+		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
+	fi
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index dda5eb4033e4..f847c4f88080 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,3 +1,5 @@
 DIST gedit-3.28.1.tar.xz 3149684 BLAKE2B 6afedcc5de0bd249af3d0fd02339acc2d993aae083dcbfda9212745ab810b81cdb9da655273cb7ccc556644c29d69429d3587fcc9e1faf7aa1c2cee57af09a4b SHA512 f5931ac562cb5005a83eec43048b718ef431e6006b72470fea54ad0e94bd64940ebdec160ee0459ceb5adb235ab111711a2f9fbdc74104d2edd8f287d7474815
-EBUILD gedit-3.28.1.ebuild 2328 BLAKE2B 5ab0617039b6337ef6700fd0af86aedadfee9f03571fbcd1dbaa9c74d9ecff234aaefa5ac2e2bf85d999ffac099f9e725cd896f7d37a253ca082f0e2fcb8e8ae SHA512 86b378ecb0f1831d0c9815953571cb0895dd9fabe905af8d080c542e5188fed1cfaaa5ddd1b36de03a9b1088f74a79e2c5382fb04866b8fcf30ba7e4aac0bf7e
+DIST gedit-3.30.2.tar.xz 3155628 BLAKE2B 96736adbce987af89b37a712448f42b2a2eeed72d52aa16377d961c9e929fa4e75205eac5987bfc067cc2fecb35aec720d85483c4e2e824a6e8248cc652d2fbe SHA512 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f
+EBUILD gedit-3.28.1.ebuild 2325 BLAKE2B d95165b8d5e6744af99595359a22e3070ae327afcd995b211c609cf92c99bc4f6687c3b88ad0f64d4ae8f4caeb519aa6fd1a34e4913c7e18163d2b920e37b2dc SHA512 45a5bc9a8869ab1ee8393796c75664a51b03ffa2e335fdb4645145099440232af1bbbef982c7c8a25d4280eb3a2bac857440014c792731e4b711c9f76ea9581a
+EBUILD gedit-3.30.2.ebuild 2327 BLAKE2B c10617646c5f36329e6d63c63b742e283b05b904f0ebb9ac14f7a414f64d284455dd485fb68963f972e38b483b54a1832e7f84abef9d856ad38a8d5c492da948 SHA512 ce97f674541798350e06d3778b077062481ced91674da6041222e1749cc8b6fc0caba20d3ee97147249c44042b694f4edc956b1649f2ddedf0f5beb97f04a170
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.28.1.ebuild b/app-editors/gedit/gedit-3.28.1.ebuild
index 375e1ea0070b..9e3e55a44a2a 100644
--- a/app-editors/gedit/gedit-3.28.1.ebuild
+++ b/app-editors/gedit/gedit-3.28.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -47,10 +47,10 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	${vala_depend}
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	>=sys-devel/gettext-0.18
 	virtual/pkgconfig
 "
diff --git a/app-editors/gedit/gedit-3.30.2.ebuild b/app-editors/gedit/gedit-3.30.2.ebuild
new file mode 100644
index 000000000000..1296da553dfe
--- /dev/null
+++ b/app-editors/gedit/gedit-3.30.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{4,5,6} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 multilib python-single-r1 vala virtualx
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+introspection +python spell vala"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+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="
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.44:2[dbus]
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	>=x11-libs/gtksourceview-3.22.0:3.0[introspection?]
+	>=dev-libs/libpeas-1.14.1[gtk]
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+		dev-libs/libpeas[python,${PYTHON_USEDEP}] )
+	spell? ( >=app-text/gspell-0.2.5:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	${vala_depend}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+# yelp-tools, gnome-common needed to eautoreconf
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+	gnome2_src_configure \
+		--disable-deprecations \
+		--disable-updater \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable spell) \
+		$(use_enable python) \
+		$(use_enable vala)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+}
+
+src_install() {
+	local args=()
+	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
+	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
+
+	gnome2_src_install "${args[@]}"
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 44a3731a9b05..1e47f2f36ec5 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -12,5 +12,5 @@ EBUILD neovim-0.3.1-r1.ebuild 2007 BLAKE2B d6262beec656c799ce6e4b8288d1eace55300
 EBUILD neovim-0.3.1.ebuild 1972 BLAKE2B 8510f3a3fc8bda84eae188e6b1e8286ccd646703a1f1a85dd7e3ccecd5d0203c35e24221b94cbfebfc4bcbf8eb069a7d22bd581f94b3f179c9952fd54198fbac SHA512 9315a6c2d61b554f8638bbbe5ddc4e4307123965b8b18d3c7de1da07d5cc1baf32855f68bd85db9ce30253da7ee4584dbbe12a1cd3aa4cfd5175548ef27ed169
 EBUILD neovim-0.3.2.ebuild 2007 BLAKE2B dd3749e9464be6acfb02dd3359ce9f1ea5e18c9f0164f6fce135f2ee1d2ed0333ea4434d8a07f01e6779bfc038fb3a4769fa1c2cdb9edfa1b4eb75f4cb09ad0f SHA512 d24a4080f31ce6f61a0cc2120cef02c4ccaed5d8527e9089be1c60899040003a42a479f712153dadbcbc7f5c505f2efa04cd590c8ebb7f3a0edadeb8deb1e1e8
 EBUILD neovim-0.3.3.ebuild 2007 BLAKE2B dd3749e9464be6acfb02dd3359ce9f1ea5e18c9f0164f6fce135f2ee1d2ed0333ea4434d8a07f01e6779bfc038fb3a4769fa1c2cdb9edfa1b4eb75f4cb09ad0f SHA512 d24a4080f31ce6f61a0cc2120cef02c4ccaed5d8527e9089be1c60899040003a42a479f712153dadbcbc7f5c505f2efa04cd590c8ebb7f3a0edadeb8deb1e1e8
-EBUILD neovim-9999.ebuild 2007 BLAKE2B 898fcb3b613bbc6400bcb9be79917e025fb12154c97bd18e98a5f2415e959adf907818109cab9ba9945dfb3e722eb57ee38ae3961a6a16cfe01c90be2d56244a SHA512 1ed5c330f2fedf24ba35a03b3070167a208a812c4b6fb9f74f41132a6c01feee0b14d34cae1ab64686dc508cca2529c889daaf36fdbff5db1e2936a7081618aa
+EBUILD neovim-9999.ebuild 1929 BLAKE2B 2519fff0a0f33e9fb2037869621e7f6cb0fec9ef51fff5acd569588641b4c10522edd85fe118aff355bfa31227e3b93a2a30e697e20a3f3935589e2cef023952 SHA512 4f3ccf8fcbab8fe680c4dcd1721456815eebfc79c09e3eb5372f533d398e19c0b1731879f168f5c9135ccc2d7dfe0cd17f84a9ecd8788fec31fcd9e60b8e6cf2
 MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index bab41265d1f7..fb941d82c887 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
+IUSE="+clipboard +luajit +nvimpager python remote ruby +tui"
 
 CDEPEND=">=dev-libs/libuv-1.2.0:0=
 	>=dev-libs/msgpack-1.0.0:0=
@@ -28,13 +28,12 @@ CDEPEND=">=dev-libs/libuv-1.2.0:0=
 		dev-lua/LuaBitOp
 	)
 	tui? (
-		>=dev-libs/libtermkey-0.19
+		>=dev-libs/libtermkey-0.21.1
 		>=dev-libs/unibilium-2.0.0:0=
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
 	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
 	net-libs/libnsl"
 
 DEPEND="
@@ -66,7 +65,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
 	cmake-utils_src_configure
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 2e7dd5f9b286..404d46b929f6 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 DIST okteta-0.25.5.tar.xz 953492 BLAKE2B ca8c40df7cf3fe40a4be6f6e2b9d1f787baa658910c3c14ced73f3f3d95c942c00ccfe559562b2e0330726723ffba8e4c7c526369453517e1fd45d3d5ce0336e SHA512 dfe45a2bc3b3fbbce8342e6282981a63a342aee47d0d90cf07449f6974ebdbac53adc7fa9f0b37a7d003370994233f002df277ecebdb6f4c03995ce50d1dbd71
+DIST okteta-0.26.0.tar.xz 969968 BLAKE2B 2041269caf027c6641e53ac5b89f5bea7323639a78d6c340007cb29fc662afc9bf99a918b8fe3ab0fb5b7a2ebd5a6278350fc1d33011dbe0db32761be9268996 SHA512 a9fd4a2481003ea16248ac49faf5061e581977fe5ee532fa67207a071259889282b5d38e84ae2eaaf1a13101774ebe415d6f7861c3f422b8a3553c6ab3b344da
 EBUILD okteta-0.25.5.ebuild 1601 BLAKE2B 3a9316ba4144b2526299fd4908de872fbac8d2aa689fd92af634a28c50c271065a6b5b2655cef3f35e912cbed881ac18fab5e609086a0f5496014fcaf93fcf98 SHA512 59148b828cb28f46cfd10a84defa661bba899bddfb31fa58d9253b4e1d9f34872aacbf7f77388c478999a303f2bea9181e86dd97f09182a1883ccd9f6e2f7f4a
+EBUILD okteta-0.26.0.ebuild 1603 BLAKE2B 2447f14877267e6295e4caa2e0af4ac4d6e5306c31957fddbcc72ee732cc17d75b7c82c5a4ed9595fb185d3b028a0596b24e04fab46d3f41d1b121daf925a8f3 SHA512 d357c46c9aaaffde3a1efa528349707584c2136f784fa183c1288eed44cf08711bc335c877dd2198abfaa0576a662d6d3f8ecd837e32aa304d1771bcda1ef4ba
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.0.ebuild b/app-editors/okteta/okteta-0.26.0.ebuild
new file mode 100644
index 000000000000..26543662e047
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta/"
+IUSE="crypt designer"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+	designer? ( $(add_qt_dep designer) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		-DBUILD_DESIGNERPLUGIN=$(usex designer)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 07a2d21776c1..9bee3808a316 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,3 +1,5 @@
 DIST pluma-1.18.3.tar.xz 3355188 BLAKE2B d53f381aa9c74cad0df82ccc73aaab9f87347cb8e3886471a2531bdd4d49a84ee97a50f2333b2e375f9bc2a634c25dc69b36659dcb589ace716e523a9d0b4544 SHA512 62ad57a8d7626e34c15610e121869ee9b06a2498acb40ec0a60839ca0273d146bd59682d352c3e98d892460c444c5442d32673c2f63897bb8c3e9e595e771dc1
+DIST pluma-1.22.0.tar.xz 3235612 BLAKE2B a0cda23a6ee73e562cb32c3f1430590042248b6a6e7cbf021103db507450b2a594506f3d8283eeed08e2ba5006ff51376eb6db5e94ea5ac9d5707b29e0efc2c4 SHA512 7c74c2ce0a89ec3813c936449d3114957e7b319433875ef567ecc508a28a1d3ddc3d0da418b2eb1278b6dc9dbaa3c75a279524f5a061b5aecb52955edcf28f51
 EBUILD pluma-1.18.3.ebuild 1762 BLAKE2B 5308bc86e3b681a3dd36fff0205dc4f45e4bbb1a490d135e975b38e1a66c400da7d3ee7014e34586d10ee5942e9366402a440d9cda2599e2dcbf256b524c1158 SHA512 8446e2f3c119ea9c1ed81b85265fc012c6d1990c5b12b56c9d3086e683c3b16b91e6e631c00f664b9027d60dfff1953b444e8135c9dc2af0da98eba6f0452b69
+EBUILD pluma-1.22.0.ebuild 1728 BLAKE2B 57c49c3aefc6f5e42258e718b8fe9ec6446750f62008e650a5ab88e0da1757708b99b4ae9c09936433f76fecf6253b1783ca9d12627ee2ab429894afa6acbe4b SHA512 87ab096902be646229adcf401f3edd1050829bdba64bffeeb216443fa7da48504c7272b7bf53ae541efde6027fabf731ade8b167ada9edd6bbf24d37507adca6
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.22.0.ebuild b/app-editors/pluma/pluma-1.22.0.ebuild
new file mode 100644
index 000000000000..7033486f3273
--- /dev/null
+++ b/app-editors/pluma/pluma-1.22.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Pluma text editor for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+introspection spell"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
+# https://github.com/mate-desktop/mate-text-editor/issues/33
+RESTRICT="test"
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libpeas-1.2.0[gtk]
+	>=dev-libs/libxml2-2.5:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/gtksourceview-3.0.0:3.0
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libSM-1.0
+	x11-libs/pango
+	virtual/libintl
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	spell? (
+		>=app-text/enchant-1.2
+		>=app-text/iso-codes-0.35
+	)
+	!!app-editors/mate-text-editor"
+
+RDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.9[introspection?]"
+
+DEPEND="${COMMON_DEPEND}
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/libtool-2.2.6:2
+	>=sys-devel/gettext-0.17:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable introspection) \
+		$(use_enable spell)
+}
+
+src_test() {
+	# FIXME: This should be handled at eclass level.
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest
index c34bc7455360..1a25b15c9b2e 100644
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@@ -1,11 +1,5 @@
 DIST qxmledit-0.9.10-src.tgz 21105988 BLAKE2B 6d1f4dcc8b3c2fdd5ef12b5e426dc32ada24c104387f6a8aab12aa778e3a5cb58c1f1f97fea746dcaa60ca2de72a98dad38902b939025ee2f7d4f8ed4c701856 SHA512 ac96b086e9bcb6140c66521c71a303a12ab806b133fc769472e23e6b473cb5f6d6dc85cac990b6c0182a1f98201a84835042f7fdfc1843c00bd98b445e47ff35
-DIST qxmledit-0.9.7-1-src.tgz 20151952 BLAKE2B ea3af07aa9cae37456a55d3dbc5e3330f1dec85702b1b0bbaa033316e7fb4deb1030af70196440e9b39e58a131a51906071843569a543546cbe27cd6461b7f25 SHA512 c2304c0d46925f36ae2e411bae805406df60339bbce1f030ebbbe42b203133770ff011cb9751e79ac6807f21425e73f3f66f7081a5b14d6701522c2aa1e9a9df
-DIST qxmledit-0.9.8-src.tgz 22814833 BLAKE2B 13b2888b1feb95222f9912e1ff6367c86f29b939987293ad325fcd89784357daa9fe67add24e9ca7879181f0a3344a127f3e99486054ed0d7bfdef6cddc2f546 SHA512 41caf161de1efd3c210104f362b1ef50ecfbec0c50d4efc98aae03f40ee0c8f51f0b8c322b3017b797f19c7ed668b456a850dea0b4adf7106557eeb9ea58a78e
-DIST qxmledit-0.9.9-src.tgz 23502055 BLAKE2B 63ee7615b7633d1385aa84a37138180963a124d2cf1d678e1f75e6629d402b5a40a5f18565aa671a005e760d1bb955666f1c8c37589689a052bb098e708f59ac SHA512 1c7c4f14471103ae1a05c28da9a84de626ca367af232eaa6998fbb14c8aff18108e486f47592f869e91af2722c7b197073877fa3a4e8bff8d8aca6b3d8b400db
-DIST qxmledit-0.9.9.2-src.tgz 23502125 BLAKE2B 4b3997d231ac9217a469b6dc2f828dde525b5e314ebf300624a5fdcef9b300b3b9f56c958de81ab8b07f5f02bd370a52b521b8a9440ddea997f83a81844de7f7 SHA512 2f3c1f8c58592fe09b2740833e0a1b581916f3f43bb6d50fefc5ea388f1331b9cd4093b3953bcecc33a947ff0ae1baf3e462e41d4dc5dd4789ec1b9dcaeac9a8
-EBUILD qxmledit-0.9.10.ebuild 1501 BLAKE2B fd41601b23a5df78b211ca26a1159c9d77a82a4b5cf46ee1e79811a7828131f1da9e1b92013ffed1dd8f2e5828f5a9cad112d4f060d72676d07d64b75f70acb8 SHA512 fd7f7a3c10327c6ee8e2260df94c790aaefa82ef9d9cb6335c675a346334020f3ada3695e5fc00a8591d097814b848d5e1567c6b260257e6eb45aa0422493d2c
-EBUILD qxmledit-0.9.7.ebuild 1626 BLAKE2B 0e5765a479747ee6f71d8561cfcb9bf436069cd6b06cf99987e6d31416ddd9e5059028432226bb84b5f6cf1f82fdec6d90c8a0b55911c20fd2bff94f33b6fe8c SHA512 d6e2b380de9fbeaf7409f5c84f0e77306b93482fdca7d92117f9467c29cd30ee32e58670bd2b43e11bd323ba7c864c8444d4133048a3e58719cbf9d71fdc1b6b
-EBUILD qxmledit-0.9.8.ebuild 1605 BLAKE2B e53568260de89369dc82e8dcd400a06cba0462e309ad166c9f9814fb3371dbaefd3ed1d7f4cf1beb5988994f3128fc041845ba3a20693f0485d7c9e7bfb6c055 SHA512 a6104331447473700fbaf4c50afd7c0ca8b9808bbd964a0e24f7dee2e84e81168ed4d1b8b278246b8f5479bfdb15c8f3036501b8886d37133eb9c9e6f47b1c07
-EBUILD qxmledit-0.9.9.2.ebuild 1501 BLAKE2B fd41601b23a5df78b211ca26a1159c9d77a82a4b5cf46ee1e79811a7828131f1da9e1b92013ffed1dd8f2e5828f5a9cad112d4f060d72676d07d64b75f70acb8 SHA512 fd7f7a3c10327c6ee8e2260df94c790aaefa82ef9d9cb6335c675a346334020f3ada3695e5fc00a8591d097814b848d5e1567c6b260257e6eb45aa0422493d2c
-EBUILD qxmledit-0.9.9.ebuild 1501 BLAKE2B b4ce57ddbc6a2f98466e27004d68ffd11aae41ebe909099d8ff6f4c811895a4b96163221bbfaf979f857d76633c11b08393ab2b83e9c463955874b6465203354 SHA512 921f42b2f09bcc3d1083b11475d05a6a6245de402625d963d88dade48a9349efeba6d64add0853c383700d2b22416e1f34b92b0f530000f100ae821d94b40c14
+DIST qxmledit-0.9.12-src.tgz 22582822 BLAKE2B 66cf57e8cd1cbf712c28e55ee39685ea907216ff397b9f6ad5307e768bbd22a16b1f32dbbd309ae186479c35bd57d0aa1a1d5b4e174d1230c3b52f844be7e9f7 SHA512 996f1a656c6191950eb18bd3df13574f6bd85ad58132b5662cce5b6538fe81597359d3a7f69cff5c252c2efceb749ee079bed7165b3c142d33e0c4cb500231cc
+EBUILD qxmledit-0.9.10.ebuild 1496 BLAKE2B 2f025fd520e2f8a466e21b9a223af975d360742b7a6ca949602f87da012528b49f8680f7265aeaacb2f16a9764196bbf0264dcde6915a2db7451c7cf2938225f SHA512 3762ad64c6a271c32f6730c48bd986ac3da6e3c4f0c7b175bde50c9b70c8fca1f8f3a686f393c1752fd1c3bb079128a5ee864095d301be9e281b0ff453255dc2
+EBUILD qxmledit-0.9.12.ebuild 1500 BLAKE2B 5d6eb52d8892a3e3d22c2d484e19801611ad99b4fc8b10153303db323f81dfcba56840fb797faab0e2ed3d1fe0678f31fd5f6ef68407cf69b4905abe341e5ebc SHA512 aa7e9fbba3813512305d959e3189b34356b163ee196e7cc0adc883976352ad834750b167de9158c3eb7c89939aec427a49b5617c7b1526ce42bb6872d4336ccf
 MISC metadata.xml 755 BLAKE2B e8481eee8abfd57322d60ebd60e467ea1735c0fc10572bf96e8800ef11b733024a3a60afd0366f1750a70bd495f4a06fa06c2c8b41c881197d7ff4d56df7c01a SHA512 c4821c0f769fc56a256849d440d86ea304ff379e165a4c6ffd0bd26e0fb3006183bbb39501136b57f6ae4ccf98418b73b00496e082d50ba4eb2bd9711141be7d
diff --git a/app-editors/qxmledit/qxmledit-0.9.10.ebuild b/app-editors/qxmledit/qxmledit-0.9.10.ebuild
index adeb17ec6d81..7017761ea393 100644
--- a/app-editors/qxmledit/qxmledit-0.9.10.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-editors/qxmledit/qxmledit-0.9.9.2.ebuild b/app-editors/qxmledit/qxmledit-0.9.12.ebuild
index adeb17ec6d81..92f6d26cf065 100644
--- a/app-editors/qxmledit/qxmledit-0.9.9.2.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.12.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils qmake-utils xdg-utils
+inherit desktop qmake-utils xdg-utils
 
 DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
+HOMEPAGE="https://qxmledit.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
 
 LICENSE="LGPL-2"
diff --git a/app-editors/qxmledit/qxmledit-0.9.7.ebuild b/app-editors/qxmledit/qxmledit-0.9.7.ebuild
deleted file mode 100644
index 08e35d79954d..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils xdg-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-1-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscxml:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-S=${WORKDIR}/${P}-1
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-
-	# bug 629624
-	sed -i -e 's/LIBS += -lGL -lGLU -lglut/LIBS += -lGL -lGLU/' \
-		src/QXmlEdit.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	# avoid internal compiler errors
-	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/qxmledit/qxmledit-0.9.8.ebuild b/app-editors/qxmledit/qxmledit-0.9.8.ebuild
deleted file mode 100644
index 75018c0bb845..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils xdg-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscxml:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-
-	# bug 629624
-	sed -i -e 's/LIBS += -lGL -lGLU -lglut/LIBS += -lGL -lGLU/' \
-		src/QXmlEdit.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	# avoid internal compiler errors
-	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/qxmledit/qxmledit-0.9.9.ebuild b/app-editors/qxmledit/qxmledit-0.9.9.ebuild
deleted file mode 100644
index c6849889189d..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils xdg-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscxml:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	# avoid internal compiler errors
-	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}