gentoo resync : 25.05.2018

22 files changed, 209 insertions, 77 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 173a1c1ad689..3bab3f710f41 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index b37c2cb3aeb3..5dd4ee06cd3c 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -4,5 +4,5 @@ AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
 EBUILD convertlit-1.8-r1.ebuild 890 BLAKE2B ac2ce2273bbf2a05fbc2499ddf6a2216e8e2810dfa212f93a7e5f0796c107eb6ff259ad05e08d300eb3d7054c569615c3abfe5d17f0cd5a7cb84761da689e33d SHA512 61059c578fa28ddd7b3ecbac807f36f7ca2b58d662a233fa80c4645ec81c928011b8c1a4a7a4d53598cf1d76bef42da06d6eb901b713eb70ca04d0632cfefc9b
-EBUILD convertlit-1.8-r3.ebuild 952 BLAKE2B 4a3e691a0661c929deb00b4bdac01b084d2886d789352365ec45837ba2173285681be0db3359353a6608d88331a8a419918d63141805682ce4f544c7776e8ae4 SHA512 0a5be146651d106f70741ee66b32c6365689456b83f07e01dd19f393b68890cb5c80364ec135568c962560796cf97b722172dcf3aa32504eb492b197db2fe273
+EBUILD convertlit-1.8-r3.ebuild 951 BLAKE2B 710d2cea0762a47128c8ab78b49ff4d7d3000d986d83f8a14fc5bd9b7aaf2fc029017f5ee7c546cd9100230a2cade1dc4a885af41af85983747bbe601d892a9b SHA512 b95136ce98aeb00b1bcd455984bcc1f2605afac35364e6b7c17558aac169f99eceee28ac1bf1c755ccde14057a42dbdade005fd8a77e26c876baf0fb00e9c196
 MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
index 40bbd4f65e5b..7befeb7eb306 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libtommath-0.36-r1"
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index f655328d0979..801284577731 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,6 +1,7 @@
 AUX cr3.1.2.71-r1_qt5_wx.diff 10066 BLAKE2B 8b1ecc7765735608e9651f23d1d9882186766e34c0ac5f9cac1312da68345d7a9028abaf9792f4ee85a4ddb5490fa1521d220b751eeeda84aa5ac79d92d33e88 SHA512 9f7a82964d1f5c308ad5124433dd0ed7debd715f1c0c2431bc84c9bf71d1d5dbbfb82a669b1c6ee114196c5e8ba1b745b07cc2195d4198c664ea15cf82182384
 AUX cr3ini.diff 1535 BLAKE2B 1eb5908bedf2a706d461ed84a60ed3232a4c98bee5d4b29c55e63d780d54785a1e3f77e9eb85d0675ac0efeb1652d505e9cef93b9c7dce39086c3b0a3f765c6b SHA512 efd7bfda3617168bda2bfad9e561b7bf3de89f141cf4155618bc6864fa5497d5b0e08ea583b302f4e9e3f60442472c7e5358313dd49549dce3fe078d58ee4ee5
 DIST coolreader-3.1.2.71.tar.bz2 10141514 BLAKE2B 143a69082a2dcabbb7a246df575e7ed2fddb4b11c542910faa2f6d44155f0de8ba6d7e0fd321b53fc0eda47c8d2867bfec02af3b95edbcb623f6a15fa6c4bc72 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735
-EBUILD coolreader-3.1.2.71-r3.ebuild 1661 BLAKE2B 00ff6e9c7a6e73f09e1c7a7197c2476545fe3424d7325e4a1d5cec3bdebdc505c146890303738d406c4c82bc16173ab510713ef5e7400c5a43b5b84d92433791 SHA512 72c1a9b718ce1b165e410b40907c45c826d04b2cb5fe87c6c215de46dc6dc5dd8f32740297abccd226477621b31a8d4270616e938d994f8e67248f39566b4365
+DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
 EBUILD coolreader-3.1.2.71-r4.ebuild 2366 BLAKE2B 94049adc28a85bbba7648a992ae1975307816f477d15fbd48343314a99504889ed22e1d4ebd7379620b295a1e378675c0a331f41a144045ee6cd060caeb08628 SHA512 21be4a384808ca943d2278fe592c3acbbce7ea6951000efe107cb744b937c8b68c32fe2f8824abcf32c41343e835265bed865e7c5a01bef7d0d77a83093d7f43
+EBUILD coolreader-3.2.2.1.ebuild 2020 BLAKE2B 17bc4cfc083d7bb30ea67b98a0dc700695823b8a39e0fc20ff4b4ae80178c5207c60838874a80a23cbbf99430d7b1b26e39b430b94d4e870b981eefed46ec961 SHA512 f8b5daa8dc76471bce823563f53e9e3810c9530a58dde042400996b73ba636b8a726115b72b2666b561a9f419865e5e56c227d94034292c5aa7edd557451fc27
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
deleted file mode 100644
index 9c7e43e5f3f1..000000000000
--- a/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit cmake-utils wxwidgets
-
-if [ "${PV}" == 9999 ]
-then
-	inherit git-r3
-	# github mirror has some new commits to fix page margins settings
-	# sourceforge mirror saved as backup
-	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
-	EGIT_REPO_URI="https://github.com/buggins/coolreader.git"
-	SRC_URI=""
-else
-	# git tag cr3.1.2-71
-	SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-fi
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://sourceforge.net/projects/crengine/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-DEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-RDEPEND="${DEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-# 1st patch: To save cr3.ini to ~homedir.
-# 2nd patch: To build QT5 and WX GUI version of coolreader3;
-# setting correct vesrion number and years of cr3qt/cr3wx;
-# internal switching between wxGTK 2.8 or 3.0 version;
-# show wxWidgets version in "About" dialog window;
-# disabling "iCCP: known incorrect sRGB profile" warning popup window for wxwidgets GUI
-
-PATCHES=( "${FILESDIR}/cr3ini.diff" "${FILESDIR}/cr3.1.2.71-r1_qt5_wx.diff" )
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake-utils_src_configure
-}
diff --git a/app-text/coolreader/coolreader-3.2.2.1.ebuild b/app-text/coolreader/coolreader-3.2.2.1.ebuild
new file mode 100644
index 000000000000..3d97d3b6b4e7
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
+
+CR_PV=$(ver_rs 3 '-')
+
+if [ "${PV}" != 9999 ]
+then
+	# git tag cr3.2.2-1
+	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+else
+	inherit git-r3
+	# github mirror has some new commits to fix page margins settings
+	# sourceforge mirror saved as backup
+	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
+	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
+	SRC_URI=""
+fi
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://sourceforge.net/projects/crengine/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+DEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+RDEPEND="${DEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+for lang in ${PLOCALES}; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	local lang langs
+	langs=""
+	for lang in ${PLOCALES}; do
+		if use l10n_${lang}; then
+			langs="${langs} ${lang}"
+		fi
+	done
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index b5b56bd2fdcf..d7884301bb99 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -4,5 +4,5 @@ AUX libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch 1308 BLAKE2B 9e368b07d
 DIST libabw-0.1.1.tar.xz 287628 BLAKE2B c8873512d7bb4c6594330dd35f044a6d6fb7bd07f4b915b5f0d0752ae36c9c6d2c8a5e7e7f66947fb5c27256e0701214b3fe171e1f52c09cfd42bbf106bc689e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a
 DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
 EBUILD libabw-0.1.1.ebuild 1058 BLAKE2B ceee966d4dd894802d115d3c7ae7c2bc40c2c2656666c274005c056fcfd932ff03422dd6da0874a9ed6eb6d0174fc9b0dbd53f38fb9c0db58639b487608c6338 SHA512 3fefdbbd95e93c934c634798f0dc6a00eacee90f0fc53967d3a3b1685cdd49f37787c903192b9e0ede7e160e5fe9fe70183107c0a6a114e970b92fd79b7c95d8
-EBUILD libabw-0.1.2.ebuild 853 BLAKE2B 16b75b057b34b7f75737e476ed5d31dad97e68540ff3e5955a9a8a1a0bd675e7ade5833c380149710de925d44250f5f77f42535dfbc8469a0011e5c62a265d25 SHA512 a0330285444077fceb262c242de4ca30c7edd8a12bd3e674be1243605156f5463e75a966ff9a1e60d7f5911bb11daa2764736f4907ea3fd195861481593ad1cc
+EBUILD libabw-0.1.2.ebuild 852 BLAKE2B 94986c5e7647b8a7950d4a3f585b061dba492ac1009d59bfce03e8e5dd5fab09bce7a86c738ac1924a85db88675655aaba5b2fae1e888bdb9a777408edc1d937 SHA512 d31164f1070df9c60e38dbc06b87786d4fe94a5913b3aed776d007fc899633d48bcef3a9df97ce7355d3183d077c768464aed74adf0769b34f222c16c55c0849
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
index b9c4771fff78..93e138cf1a8e 100644
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ b/app-text/libabw/libabw-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index ac769485786c..a014671ca342 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,3 @@
 DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
-EBUILD libepubgen-0.1.0.ebuild 675 BLAKE2B 87ee7ffe4da10a26de7aa11a25f794b5cd1cddc200dcd011df9ef09928a68ab90905380723c1b75fc168280258fb46ed1c6c88b6bb1ca4bb0230c95b575fa26e SHA512 550f45e446f2ae7f197da486701d1bd3a7248c223619adbe1c6a6ad854f7428805365ddb7499db54deffbeb56479d1a00741a394c3e996bbc09867a8b5a0c3c0
+EBUILD libepubgen-0.1.0.ebuild 674 BLAKE2B 563971c76c09a53136e140609726687a71ecdd2008a109b2a3ed4a502569ef9341955ee6136ca2815aca46cc1baaa9fa6930ba96bc178c1f473932031ef9912c SHA512 5b849eff3bd74fd9897ab7f6c910c228af46a22a2eee55497a79107b8109c9a44ee3c0c4d2075aa92a7e4ac2047231e462b14a2d9394e79c17c016d09ffbfac8
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.0.ebuild b/app-text/libepubgen/libepubgen-0.1.0.ebuild
index 0a3637ac432a..5b922895aa50 100644
--- a/app-text/libepubgen/libepubgen-0.1.0.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index 6a320f706ffd..a267933e8b27 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,6 +1,6 @@
 DIST libmspub-0.1.2.tar.xz 345556 BLAKE2B a3b47fb188fc859abf54e3375514d31a1fafa21fb57fe0ac4a20013741a223a7011adf8ce7784b61346b49e9f4c0b6c353138dc12a5035f7bcc24576a508aa50 SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
 EBUILD libmspub-0.1.2.ebuild 1167 BLAKE2B 41b323d700a9a2096a7b5f265df9d6511605b8bc0940f0ef47380a27125ae07f32deac57dad92ace14beebe211cea81b1350e5a74d866fe9ef826dda69d8552e SHA512 523d3d1660341335b2b5e6995c84e794bff2920f18ba2cd36400ffdeb69c83718c42296422527e225cef9e6b86ad6dea1f613947936c7601aaee429d0bb8252f
-EBUILD libmspub-0.1.4.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
+EBUILD libmspub-0.1.4.ebuild 1170 BLAKE2B bdccdac1722a3e33441eb452b7e4a7c92d058e04190cedbc3676fc8e8dc756ad76734841611d89bee5a0fe33069454316d95f1303a3da1f6c55c20f6ebdb4b3e SHA512 61f95c0a605fd50cba557dce4ae248d3043f7ccda1a55097e75a72b7468b4cdddfdbae0cae8a11df10a5884686ee328af5282d4c8ab9bccb47a0f7e907268ed3
 EBUILD libmspub-9999.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index c627cd0bee6f..358bec7b7081 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index e27904f44501..bc19c1967ec2 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
-EBUILD libqxp-0.0.1.ebuild 734 BLAKE2B ade0c24b5f483d27e9aaefbb0d35276359ef385acf92b956e09fca45bbd8d6d94963781039302bb2418163813c9abcf9117dc306c7fd16fdadd315f1d29f6611 SHA512 1524692021d5fbf9b7c93427dbcdd86845091af2089085cb70ec5f42a0c33fe9c4f6e9b84d89556b7fc3fe96026a2ecafd53a56e96d212c243495cbe9357d863
+EBUILD libqxp-0.0.1.ebuild 733 BLAKE2B 500a3976587919cdc6e658b5212ae4e3a99b0febe1ee7b349d77ec6ba82d62434605eb0850436727fcffa17d0b70ec27e89054b163f1985c504a2cb746b880e3 SHA512 47e159553f3ca54c2c002e88fa1f76aa016ecd04e846b7a149d33fb45dcfe3d66aebc03f111a4e6bc6a9eaeec5619eb397097030deb2d5defc2192ae9602d9b8
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
index c3bf1d28a4c8..d0769c66950d 100644
--- a/app-text/libqxp/libqxp-0.0.1.ebuild
+++ b/app-text/libqxp/libqxp-0.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index 17a04d6f839c..7b9182635a82 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -3,5 +3,5 @@ AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e0077
 DIST odt2txt-0.4.tar.gz 23997 BLAKE2B ffa2ac915c1c239cfa7a498fa1597a2462bc7ecd2fb08a90ab50f21a60dbde8abffa52f4b4c40591732f7d497f08774555b36d880214a7708f2c05b692a18908 SHA512 65642dccdb08408e34d484d78be9777aa374cdabbcadd2ab54f43df29db506b136f13e5af720b9b6b6cfdb8508e4fab44159302d35fc002a22979efabf69bfc4
 DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
 EBUILD odt2txt-0.4-r1.ebuild 726 BLAKE2B 03a906d6431d1dda4f291c6be4d961dd235bebda7cc72885292d74eb3ef6897ac68408709c0ac818668d5ce53c3a3a28833a150be5a7d05154644bed7c3f6e21 SHA512 832fffdd8c1f62f71215d804541fe0e041726acc8a1964f3733afad1ad30d08f7fc7075c28ea8d7764225c1dea7cd086343e1b40e345040b9d45594d1911d877
-EBUILD odt2txt-0.5.ebuild 739 BLAKE2B 5e275f35a641d8ffa0bc7056b018d2aff01333d8f9753cdb1862343610f6fb2124f17ebdb60ee4bb927b461a50b98bb1babd1761864f01b22c2cbd7270f0ce0d SHA512 85de6ac5290f69c68383511aed82a9740e32fb959db04cbc3e33079e9812e13e0119ddabc9176c99ffa3d8533064b4b3c9af5eef085497db995b97dd1ba296db
+EBUILD odt2txt-0.5.ebuild 737 BLAKE2B 6db11f6bf00aabc6bb29443fc6d1da60a638614c475e500148bc3fcc23d55e10a96afd169d07ba6ed2c24973fd543fdc85479cf8668de596baccad222390f8ac SHA512 066dcf6332365681d9cdcf64612e2997dec3b731445394a9187e62869588f48c51fbb2e013ce53cf38540400a1aebc8214c40ca2d320c2a2676fd3f7b8ca5817
 MISC metadata.xml 371 BLAKE2B 4d1aead738a47efd7e138ee8fa85db08b5aa64dafe7d06d64f8fcd093b741808a62fa541920a60fa120233f88dc5a5a92380e848db5ddc54be7152d813e4d174 SHA512 1fe5f8d199becebd4dc33c017d8e6f608f47f5770abde2424cc0517da49502624a8eeca6522d125bedef31c3f7aaefa6ce3a2a871ea46d28d2314bf0dededa35
diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5.ebuild
index 71f794e3cdf1..1e9be393bda1 100644
--- a/app-text/odt2txt/odt2txt-0.5.ebuild
+++ b/app-text/odt2txt/odt2txt-0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ~ppc64 ~sparc ~x86 ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index cbdd0374ddb3..98b0b884d426 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,7 +1,9 @@
 DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
 DIST qpdfview-0.4.17beta1.tar.gz 658978 BLAKE2B 7f0ba945cf7903cae7bb11ac1d3baa08fc5f70e9e5a20a9f265cf8de4f0ce0f847f34852b2ce4374e2736542c8fc1e07c15e6bd4ae54d5147d14524e076f312f SHA512 803bd9a1165fc84302fb3c7734127eaab754bd2bf23083a1bcf340810fa617800f3d0069eae7b1f43fb528ebe17a6a32a652efbb902d525a95efc31efeb1e10a
 DIST qpdfview-0.4.18_pre.tar.gz 667869 BLAKE2B ed729b6aa1104ca1525877242bc3f2c630d8ee563005ab35854d775197c24352f0a39be13bf4808e4544c50072619da9cd5c36cdbdcbae33fa2fc2016b80ce18 SHA512 3a7a2cc474078dc742fccba2c87710c1e05cec76f0bd66650fa6cb4d6d8e2103241474689d4798da28ae1aeb2caa6e09dd8d1e9d0433c2eba21b202166aa3051
+DIST qpdfview-0.4.18_pre2.tar.gz 668677 BLAKE2B 1c79a7f9f9d67c533660457ca74d27c1cb389224910d0c8482c2e1d6a0843787e588a40ae7f4e02268392c15aa19b54b6383c2422cc60b20e521d26133c10a3e SHA512 ad19dd6a2bfeb3c5f26488619688ad96653ed50821203b7e5cb2817a4f9957510ce238804b48bf3b21d965ceed25ad1b0386e0bb5e9d0bc5e5c95e6fe10ef811
 EBUILD qpdfview-0.4.16.ebuild 2137 BLAKE2B d0ce86840680b56afd8b925b820d0641a0754776d4054b469c691f5da10db072febd5b04b34b80394bc08f47d6b5b7b58390332c30d445116528cbc238fe2144 SHA512 2d89740ee569287794935eb369c8a035a3ceeceb3e428e740f0b0adbe808f532a336dae9739c789bd4ee71b1a7f87af222ce91c19028bb179275184607489549
 EBUILD qpdfview-0.4.17_beta1.ebuild 2169 BLAKE2B 61d969d7af89373d0d657c00049c7a86a6cb67d2cea7d436f1052e21c0a02ebe7d06024851a6e956b8227d41b90df2cfb862804a09a7f817307f5b2185a88d33 SHA512 14fe234d15e1f6a38a8ba2c744c5f9061c21969f43bab039227636eb69f25fea5f1a91ffb15afe84c3eb92de25ef1c0db693b02a074f365e9069af5ae145ad24
 EBUILD qpdfview-0.4.18_pre.ebuild 2351 BLAKE2B 64beca033eb45d715185360ff9ea653de2f444e0fdfa5bc58e5e37f46fa2e8f03e5674837121e2c61b2f5781281de70bc960d85ff10e763a0467c292f88bd4cc SHA512 560b54fc310413fc34e24f441eb438db5221d211cb57fc318018e27b7913588e3361b056f4102cf922d6f79d955993ab40182158e6ce00ac5394bd82d98f56f0
+EBUILD qpdfview-0.4.18_pre2.ebuild 2351 BLAKE2B aa38b631649b7d03be1a6e1df550cce81f44fe721d8b874b225ce6414a749a96dedc585b4d4482224d23c56cb2176c530e02bd47dc74ebdc45718642c8c39f28 SHA512 1c49e2ce7d9fedbbed5ea45b550403a11c68035d5943361d901b9df33c357c730d1b46ab66de6783576bcb562f64eeee61a9ca3857a93aa9759d4c756d98dbf6
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
new file mode 100644
index 000000000000..b9dbaeb26ae5
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it ja kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
+
+inherit l10n qmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+RDEPEND="
+	cups? ( net-print/cups )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	postscript? ( app-text/libspectre )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dbus? ( dev-qt/qtdbus:5 )
+	pdf? ( >=app-text/poppler-0.35[qt5]
+		dev-qt/qtxml:5 )
+	sqlite? ( dev-qt/qtsql:5[sqlite] )
+	svg? ( dev-qt/qtsvg:5 )
+	!svg? ( virtual/freedesktop-icon-theme )
+	synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+
+	prepare_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+	}
+
+	l10n_find_plocales_changes translations ${PN}_ .ts
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_help
+
+	# adapt for prefix
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+
+	default
+}
+
+src_configure() {
+	local myconfig=() i=
+	for i in cups dbus djvu pdf svg synctex; do
+		use ${i} || myconfig+=(without_${i})
+	done
+	use fitz && myconfig+=(with_fitz)
+	use postscript || myconfig+=(without_ps)
+	use sqlite || myconfig+=(without_sql)
+
+	local myqmakeargs=(
+		qpdfview.pro
+		CONFIG+="${myconfig[@]}"
+		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/sgrep/Manifest b/app-text/sgrep/Manifest
index 4c0e9f75e66a..c44668845b5c 100644
--- a/app-text/sgrep/Manifest
+++ b/app-text/sgrep/Manifest
@@ -1,3 +1,3 @@
 DIST sgrep-1.94a.tar.gz 193267 BLAKE2B fe37f62e2cb5c2ccad88df8ee3000d937357b5801ac6c55938a575f77735db7f94c0475e2eaa2521dfbae194132dcda4efe009db32e23b50c13acbc359b9abaf SHA512 8d2571a738c6a87cc34aea3a0692d15aea1d4a0439401b97368da2a021992ef8d0754e91e10409c1c059712bfe69ac4188e3be856211e48f8e6d528b5684283a
-EBUILD sgrep-1.94a.ebuild 704 BLAKE2B 8e93795de18f1cc16868c6f4462b0eb9b6dfbf1c93067842c9e4c9c6597e0371c504b0fb7d3e5b831ad236901cfa5c849453d07b4ce3dda7b7cb394171e46765 SHA512 aff8595657db0cf5fc6186fa58feda22dee88cbae4f65e45825b0e20c529126bd7c51df99aef4200fa6629d9e6396a248303a5fc30308635fa141552cf6d64a8
+EBUILD sgrep-1.94a.ebuild 721 BLAKE2B 18ece2417c18c5f3578222d2a2aa5cce21307213c46e9fdb06170b70148b6679d3ee34bd80a22c84ac89c47141eaa7c3888a1af9512d825560a59f4a3a999265 SHA512 64fa85b4e830e83694a516c1760f612078e0fe6d5ac5c256ebddc20f2a0cafa24220d1929b6e3561c8d52cfe3abcc7a57a11ec97b4eea0b67e25d8b654e2fa87
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgrep/sgrep-1.94a.ebuild b/app-text/sgrep/sgrep-1.94a.ebuild
index 6e31bd750619..2f7bae2fad40 100644
--- a/app-text/sgrep/sgrep-1.94a.ebuild
+++ b/app-text/sgrep/sgrep-1.94a.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 DESCRIPTION="Use structural criteria to grep and index text, SGML, XML and HTML and filter"
 SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
-HOMEPAGE="http://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
+HOMEPAGE="https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 src_prepare() {
-	sed -i -e "s:/usr/lib:/etc:g" sgrep.1
+	default
+	sed -i -e "s:/usr/lib:/etc:g" sgrep.1 || die
 }
 
 src_configure() {
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 2c82b7347050..d6b08bb7742a 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -6,4 +6,4 @@ DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d65
 EBUILD wgetpaste-2.25-r3.ebuild 919 BLAKE2B a6b04fa999c708d990d074e5e40465e6bf518b6728423a1ee2c125911d7124fd466696f9c048b1c55ffc521c50767a95145f102a97ceb4eefdc8b8fc08bfd387 SHA512 749f899f89c0f1ba27b2fd937297fb2b27e4d749a7c232b8274fe89d530aa03082da70019bb120a8fb58fa74ee8180f437c0dcab4f427d487d3b16eb8408ffe6
 EBUILD wgetpaste-2.28-r1.ebuild 734 BLAKE2B 9728c2dbbe50713b394897d292e42e5971e3070ec229bd8612438a0b9656ab03f7c0db071b15cb8d7e3420e88adb0c787b554c9ef6bb6f8094a606fea98dae18 SHA512 c67fbd0e5dbf8963525af996e74f9b2f17d3aaeef741c5e924a5f319d217b86cac61ef3f9b1098912bb5fbc8ea1c3c968aaabfc2e135877aad843ef2bdb4c05f
 EBUILD wgetpaste-2.28.ebuild 706 BLAKE2B 69fce5b98143b44c27536b84e2d09f71d742dd39394cc57d0d4f40250cce44506326edc5f93c603fdbd09460147e953e38afecc31f6ae0afa0f4be7d50b9f124 SHA512 8eebb90528664d16898c6161ec38a5b10e09e81b4531693fc50b5af5265014fe8917f13b96f9b39eb3eaee2bac45337dc8af6536ec740840a6168a27a127fb41
-MISC metadata.xml 249 BLAKE2B 210caabfc49730fad6228e8c34b09d11554fece8f3f754a26c6239b3b0de845ea128507b2c17d6e97343f9e6e2ae01272eb024992c3c64d3903794fbf73a66ed SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae
+MISC metadata.xml 355 BLAKE2B cfb82b6309e5508319685ccad6757d701ad60ca2c9b015bf04cd500348a1c43e951876917d60e118e4008088a40761cd57b0f08a220cf1e97b9f638a4efe086a SHA512 04699e3fb3122aa304bcb525a1130732c949473086ed946ae9051928e7e84edd5347cab006e6a31f0ad854c7d8f51f07c3e77f6e3a7dac450619f4decb52f2f5
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index ceeed1534bdd..23d91c3c4034 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -5,4 +5,8 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+	</maintainer>
 </pkgmetadata>