14 files changed, 27 insertions, 122 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0c70a6b9f626..8e11e9a22e33 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 86ba33194ca5..0596c4a9b93e 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,10 +1,7 @@
-AUX calibre-2.83.0-lzxd-bounds-error-bug-540596.patch 1296 BLAKE2B a600a8777868b7f73c95d62de9097382cb1d3e076ea756b589811f5e33aa86f1724f93177d82247132a85779ff82960f178cc325b497f8b7f1391ff113729c69 SHA512 fba16c95a69b38113d4331faceae4a81f2319ae1631a03662bd3483ad6f1b687d16db28f9df019990a3bc6918c75f4a4492ca7ef772168a575cb06ff0761bddf
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
-AUX calibre-server.conf 523 BLAKE2B a9fb65a327656f9b2f54eab27dcaf2cdfbcbe5f0d637204ea39f891c515ae899da156098609bc99398354337524843afbf45409bbb1098605f293661bb8381e7 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058
-AUX calibre-server.init 1811 BLAKE2B fe22257128896d4299c5d5edab6ac63cdcf79da483f4afc49b0d1649b17599389dd4b9f88c35a964e289cbe6d961136f1e5760a2244137c404e573510899bd60 SHA512 760aa7a8f51b23b116ba07749855737869ff2313f0528d67e5a46bc362e5c0a04a7e1f46c32dd6e82add4fa5dc41d397db32dbd1a09c912008e0890d1a133eeb
 DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 EBUILD calibre-3.15.0.ebuild 9288 BLAKE2B cf28b1c8127288117bfaf3454a61a3485c1636cec5c2ab8dd07df47a9b5d3665e0c5a86768e6752ee57d88d24d7eb6cc2c1f78fb46ab53a71db695aec4cfd4da SHA512 fc2c83770465ad21f358b5592da05838527956b9e491ad3f1adead3a575936e5bba5fe1e1153200171ad9aaa3c10e313bd3f5c678614d6e6784651c2d9af33c1
diff --git a/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch b/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch
deleted file mode 100644
index 5f7d5a4682f9..000000000000
--- a/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f335c8719b224d3ca7a967b6e91cebd5b26684fe Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Sun, 23 Apr 2017 16:13:00 -0700
-Subject: [PATCH] Fix bounds error in lzxd_static_init
-
-https://bugs.gentoo.org/show_bug.cgi?id=540596
-https://github.com/kovidgoyal/calibre/pull/650
-
-This includes the changes from the following upstream commits:
-
-https://github.com/kyz/libmspack/commit/6a42ddd1d472afeaf0f7da91e16b60ab2063fb92
-https://github.com/kyz/libmspack/commit/ce3cc03aa500dd9c0b6b820f9519f6b6b9dede05
----
- src/calibre/utils/lzx/lzxd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/calibre/utils/lzx/lzxd.c b/src/calibre/utils/lzx/lzxd.c
-index e683a9e..c531aaa 100644
---- a/src/calibre/utils/lzx/lzxd.c
-+++ b/src/calibre/utils/lzx/lzxd.c
-@@ -357,11 +357,12 @@ static unsigned char extra_bits[51];
- static void lzxd_static_init(void) {
-   int i, j;
- 
--  for (i = 0, j = 0; i < 51; i += 2) {
-+  for (i = 0, j = 0; i < 50; i += 2) {
-     extra_bits[i]   = j; /* 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7... */
-     extra_bits[i+1] = j;
-     if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */
-   }
-+  extra_bits[50] = 17;
- 
-   for (i = 0, j = 0; i < 51; i++) {
-     position_base[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */
--- 
-2.10.2
-
diff --git a/app-text/calibre/files/calibre-server.conf b/app-text/calibre/files/calibre-server.conf
deleted file mode 100644
index c1bed84289cc..000000000000
--- a/app-text/calibre/files/calibre-server.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/conf.d/calibre-server
-# Change this to the user you want to run calibre-server as.
-# You may specify a group too, after a colon
-# NOTE:  This must be set and not to root!
-CALIBRE_USER=
-
-# Set the path of the library to serve.
-# Defaults to the default location for CALIBRE_USER.
-#CALIBRE_LIBRARY='<user home directory>/Calibre Library'
-
-# Extra options to pass to calibre-server.
-# See the calibre-server man page for more options.
-#CALIBRE_OPTS="--username calibre --password password --thread-pool 10 --port 8080"
diff --git a/app-text/calibre/files/calibre-server.init b/app-text/calibre/files/calibre-server.init
deleted file mode 100644
index 2f905424cfa7..000000000000
--- a/app-text/calibre/files/calibre-server.init
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need net
-	need localmount
-	after bootmisc
-}
-
-checkconfig() {
-	if [ "${CALIBRE_USER}" = "" -o "${CALIBRE_USER}" = "root" ] ; then
-		eerror "Please edit /etc/conf.d/calibre-server"
-		eerror "You have to specify a user to run calibre-server as, as we will not run it as root!"
-		eerror "Modify CALIBRE_USER to your needs (you can also add a group, after a colon)"
-		return 1
-	fi
-	if ! getent passwd "${CALIBRE_USER%:*}" >/dev/null ; then
-		eerror "Please edit /etc/conf.d/calibre-server"
-		eerror "Your user has to exist!"
-		return 1
-	fi
-	if [ "${CALIBRE_USER%:*}" != "${CALIBRE_USER}" ] ; then
-		if ! getent group "${CALIBRE_USER#*:}" >/dev/null ; then
-			eerror "Please edit /etc/conf.d/calibre-server"
-			eerror "Your group has to exist too!"
-			return 1
-		fi
-	fi
-	if [ "${CALIBRE_LIBRARY}" = "" ] ; then
-		CALIBRE_USER_HOME=$(getent passwd "${CALIBRE_USER%:*}" | cut -d ':' -f 6)
-		CALIBRE_LIBRARY="${CALIBRE_USER_HOME}/Calibre Library"
-	fi
-	if [ ! -d "${CALIBRE_LIBRARY}" ] ; then
-		eerror "Please edit /etc/conf.d/calibre-server"
-		eerror "The Calibre library, '${CALIBRE_LIBRARY},' does not exist."
-		eerror "Please modify CALIBRE_LIBRARY to point to a valid library."
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	local pidfile=/var/run/calibre-server.pid
-	ebegin "Starting calibre-server"
-	start-stop-daemon --user "${CALIBRE_USER}" \
-		--pidfile "${pidfile}" --make-pidfile --background --exec /usr/bin/calibre-server \
-		-- --with-library "${CALIBRE_LIBRARY}" ${CALIBRE_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping calibre-server"
-	start-stop-daemon --stop --user "${CALIBRE_USER}" \
-		--pidfile /var/run/calibre-server.pid
-	eend $?
-}
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index c4ba1a8cfc31..3d4987d3b593 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,5 +1,5 @@
 DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 BLAKE2B 7cc22370afa045ac13bf05082d396534e08a454f13f6bf321bc45c4743c33813bc32c31b655c21d731f091f11d13aeef405bc82c8e2b0ed0d0a12a25e4e7f3ad SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec
 DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
 EBUILD htmlmin-0.1.11_pre20170909.ebuild 634 BLAKE2B 9a55a43ee6ffaa3e5a363df3f776164e9671ff0c43d121bf575ef43a5e8d6de35368cc187e8af782f14a993966f8f141dc93df7eaf89d72422d757a6f881e0ab SHA512 c39a88b40626f7e8e943d8ef05fc355d523d13b65577c6e535139e8fa958489a83490bbff47a9cef2595f1e3c871512e4083bc3b115864f2d6644662e7a2b608
-EBUILD htmlmin-0.1.12.ebuild 510 BLAKE2B 7fbcff6d9ba90ef0b0fb54cfb2193dd6af3df6a48fb26770fe4a3c7a7fe760052359e06210156c46523f70efcc05ef4934bd96abed2e53cb11010b006d27f648 SHA512 7161bd303a555e2d70dda490d5c5ced5c2b43891c4455767736ae69d8790a90dceb75312c3c0fea7ab59a070b7ab9bc98a55213ebbe51c37e4f369f2e609fb7e
+EBUILD htmlmin-0.1.12.ebuild 508 BLAKE2B 57fa9adb75cea920eb9ef209a31f8c329315f22c269c75f714a149d8e1c07b4fba41b6a6c8fd9e170058555c1e455b05ab5d718c8a7d027e46b2792efb4ee34c SHA512 97feee6c9be7a7d96cf9a0acf2b70b2580c6e240d9de77c5487e1df260fa4327c1a365bd1d182a50fffde330b82411673514d40c9da546476fb648af13037593
 MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index 3f036caef84b..cdddc86d92a3 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index 37bfbb757692..e197d4d5107c 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,5 +1,5 @@
 DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
 DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
 EBUILD libepubgen-0.1.0.ebuild 725 BLAKE2B df6c45b50db98bc979374adead89de3e2cb5d7a055b298d6538ce2dea44790b201cef4b437e1af86755ea3bae0c7cd6f8eb4de27f3c610e6db78df4ebf497f4d SHA512 8de1cf0aa61451aa11703e3dadb1fb00a03e3945f4ed2dfb8b4e7fa96f28fd0da2d14124f45e71b5868c72bf62e7488cd63785a4f68c652df618b15f25d43691
-EBUILD libepubgen-0.1.1.ebuild 706 BLAKE2B 00fadb6d869bf4866b3aaaceee60c70284af1ad92e487ec9d382bb329e7ff17e053b5acf22a3aed2494b05bf38498b1037a0e8cd7d0198fecc478e124519dd2c SHA512 b01ef9bedb52c698aa18d64378b41a72f72738cb3f64d1ce8040dc28d193864a1374a92db39f6c85a279eecd271999d163058fb4efc0cb91309628a4214f43e8
+EBUILD libepubgen-0.1.1.ebuild 713 BLAKE2B 57119868a143aa90b78c9e82339fa108e2cdf988220626a759459bbfa084d3ac9dca2a93af3488d9f2409a79e4876e75bc1cd0ac075df00c8aa291ad26c965a4 SHA512 7372214a9bd3f0576c5a23cde82b528dbcd9d16e2d2a3cfcf439052282da13b8e9eb03e7aea97b514c2fcd013a8574ae53c38ee0828d39c8a386642cedd319c7
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
index 2fe034fa1608..80387cdb8ac9 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1.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 ~arm64 ~x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 01a514a334cf..b6ae26a14c21 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,6 +1,7 @@
+AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a633875157acbb4c1e727bc7bcf2a4f1af67197c1d9762a7aa6265e31357eead2baff13c28126d6f4bbc698a997f442bc58771b5b2 SHA512 edc407a4958befee95b53733b0c73bc8281575b53b8d2c65491eee6aafc63d775d3ce9d0a0578ce51cf8bc8f047a683bb0dbd8b79f2b1914dc5df6de64b835fa
 DIST libetonyek-0.1.7.tar.xz 1256232 BLAKE2B ef2abcc427014d515a75ff75d90a78da0b5b28d54b5de3793540e8448f163da0b6d3ff4026373ffc3a4973d3e0e4fee280e75a77407620b3ba0e833bd7d8c82a SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f
 DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865
 EBUILD libetonyek-0.1.7.ebuild 1181 BLAKE2B cc869861947ebb3b5a3e117999f2f2aea14e012f9412f07d610af7c4c5df02ede968557b821d2c88252742796fbe2010f2749d6d0df5631054f6276722f0cc7d SHA512 d5e73167601b6fcd21568f4f9f45254d4b8098a1d503aaa6794b6c5af4de497bb607613eced94d4adbd9c93ccb15b1a6fbc115ced80c0db2c041989ba5b2b85c
-EBUILD libetonyek-0.1.8.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
+EBUILD libetonyek-0.1.8.ebuild 1218 BLAKE2B 27d32c5df3acc0abbfbd33ed52dc5893ca124bfe77d2e8dfe8176aad2b0f78d0e8b2fb418006b5d8c3d4d62ef94faf19f34dba6b06d3e3d4a8dbc5e0433b6bf6 SHA512 95166c5ede3f644277b2b5efa36ce212a288916b8bd690bb24107b35008005dce89e92bec7d52419d9ede991301b4144f9603d7d75bd5270b86fb0e374575d50
 EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
new file mode 100644
index 000000000000..db78fa81d471
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
@@ -0,0 +1,12 @@
+Gentoo-bug: https://bugs.gentoo.org/657820
+
+--- a/configure.ac	2018-03-18 14:51:31.000000000 +0100
++++ b/configure.ac	2018-07-11 23:13:14.901127036 +0200
+@@ -119,7 +119,6 @@
+ saved_CPPFLAGS="${CPPFLAGS}"
+ CPPFLAGS="${GLM_CFLAGS} ${CPPFLAGS}"
+ GLM_headers="glm/glm.hpp"
+-AS_IF([test "x$enable_tests" == "xyes"], [GLM_headers="$GLM_headers glm/gtx/io.hpp"], [])
+ AC_CHECK_HEADERS(
+     [$GLM_headers],
+     [],
diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild
index 39b6f10a69f8..7e445ac2171a 100644
--- a/app-text/libetonyek/libetonyek-0.1.8.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.8.ebuild
@@ -4,7 +4,8 @@
 EAPI=6
 
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+[[ ${PV} == 9999 ]] && inherit git-r3
+inherit autotools
 
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
@@ -20,7 +21,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	sys-libs/zlib
+	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
@@ -32,10 +33,12 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=( "${FILESDIR}/${P}-glm-0.9.9.patch" )
+
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 1d8d8d9769e6..4bd817aead09 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 732 BLAKE2B 2d925322161bd3762152d89d3502fbc81b4634fb8ea3df1509728ed483e61d4b9a1f7603f690a131f2b907ae38c2e8534f41a6182deb1ad6fe64e782e822e1e4 SHA512 4bfafacd9383f0f666c0f3f6959bb9e319d32a6eaf74e0d4629abf8de482da52a877ab0f213dab8182e31e94fe4bbeb5f01de0f7359574b80ec2195c340fe155
+EBUILD libqxp-0.0.1.ebuild 739 BLAKE2B d4430fe59ef2c7a64a2d96a87354ae15cdb26849ae752927d87fc6c9aefd77a957c6104862fbb6689bc4b1b543e988068eedac682583c6cf34e5f14f80402a3d SHA512 42479a0ea9e024af42a40469a773c2830692dfa0b13b791f28cb29f5abaecab4766ce9debfae41ab6b41e21fc3464822618d09bc1c801ce1958bab0f39189fdf
 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 709bbbbb8ce5..bfa4a9fb2255 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 ~arm64 x86"
 IUSE="debug doc test tools"
 
 RDEPEND="