gentoo resync : 16.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-16 16:47:37 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-16 16:47:37 +0100
commit: 8aebb228036d5e2863b7eaa6e319ab41c1669269 (patch)
tree: 00f4b90ce32462dc8e99ae54a31d6462ea2c3ac6 /app-text
parent: 76cba73c47c8694e74377004634daca18f2d9c08 (diff)
52 files changed, 255 insertions, 691 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 10e18547e5fd..68ab5fce839f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 97261c261c17..ac6da68b86b8 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,12 +14,12 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1038 BLAKE2B bea382cc74d450842b340b2f4131f8454fe3cb023b0e57b709038d730a0853fb68f8cedf809a0ef52efa31467c3cf3363019a465d04fd90ccc29ab8cfa9b6f9a SHA512 f6f9c1183fe68817185786c665a0e3d0acdd82c56a1f2bb11e0eb411cf070a7583f66faf25bdf0c88f3822d5777e710430084fa5aa9d8db503066c0b89d1040a
-EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1038 BLAKE2B 587dd834b106b4c66a1981d236e3e9a4d07102f1d995ca8e521c433decb3d0ec3467d53ac50853706162b090d472f0957251fca9483ff6a429676f52d8898957 SHA512 193d0561043034ec1328133724a6a9e233e35623364aef45a58807f383593bed33e9feb3289a4631b2a4d8e69fc508ebcf9f95b64ca6f5a073eae415b468c1bc
-EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1038 BLAKE2B e570f274d56bb1f6011695e8f17e240dea09385f656e642d6f4fbfa883cd081f044a7a2602099b391a2b41c3b9d4a0c3d5fd39c38a5f7f02b3445efe8dd01422 SHA512 e4feaeda3d910d156e03e58d844dedaa8edfbe40f24c74660e0a00d4ca76e9509144e705a1c90315fab3c77d40728b00d17a3d1ae021c67faecf40e04bb1fd2b
-EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1038 BLAKE2B 7ef743a367ad084d2ba480fdac699237a53fb63b62d6467acf21fe8dc7fe8747bf04c1b3380ec7d0ce89e2fc821f1a009c9885a4f44fd3c8396d4407ff676e55 SHA512 98781f21a593c19d8a3f6bd15b345a3cd84ebf9e07b56c0e36b0411bc865414935a64440c96d6ba6f2c7aa02e11f9c5158ebd283589651e2c6acb4c55624104c
-EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1053 BLAKE2B b749921f555023f3ad1b22d0187f9c5b49c072907487652d86754cd67c4c517f139ec21da1b7804450cde0fa848110cf9048bed70cb93bc57ee92c72382696eb SHA512 d65d9f5b9720d47915eda5f0f978d28a413df7c47376698d9fe10570dccf8f4e12099193c5c5e1f4677ccb2a456caa923050e82517fd4b7c92ea98096f3b1e4e
-EBUILD docbook-sgml-dtd-4.3-r2.ebuild 1034 BLAKE2B 9df82149941d8c53a7cd04185c9dc42a51f6215ec89d1ed7f452e698b16d49d0ad80d150d8abcaa442d9e270541bc848f2c24806e395373093a0667a9531a4f2 SHA512 2d88c0f7c3d848a26aece7998a9eef6d0a31ba01ebf656d610664e5e1a8e07fe92418e837f5ef2e0ac56a594ed1d947da2e4aee092f855a7b2c1e1bf8dcf8b6a
-EBUILD docbook-sgml-dtd-4.4.ebuild 1044 BLAKE2B 0af3122f2b5d7ddd224b2434df8ab2c88d4771d3466d3480709d45974cb4005205864acb28f66183dfa1a86cdc5952b3ac35c0501ebcb184a0291ab78702a92d SHA512 9df85ac8bddd8c0d61b6526cbab67d4f0fd48b3c1e433b1afaa56dc66ccc6a4bae8e6b9d46929b83e596c0da7730e259f2d0fcb32ceaec27c2dbd48102bec9d9
-EBUILD docbook-sgml-dtd-4.5.ebuild 1053 BLAKE2B e986e5bf707dd3d1544a697301af30aea06c5c0aa91f6b05a60dad044359646c216886cf6ad5b588382c958662e158328f0722a233ab02fa78f341f5d6e38439 SHA512 4783873256131bba3c1d7c8f40b13cdee725a53699a6e8c06178e6ebf9eb0134b34bc9a6e0553ac3f52415628fcbb1ff713b6e7fc1fdd2aaa8929a148a802641
+EBUILD docbook-sgml-dtd-3.0-r3.ebuild 998 BLAKE2B fc8be7bd4259b96824f2384eaa2d54d3422737db2780d0a933e6919cdca4ad43e34f5c0f61cc9205ccd5a49d7fac69724df94de412c068fa797f8da2a7823760 SHA512 de1cf8959986887ce10333bf599a7f6af2c075550ebc935ca9013af9500c3ed3a18e86f7eb4b3f5b82f094e6905cc0ebaa0198f6a25b2efb318576348538a0fd
+EBUILD docbook-sgml-dtd-3.1-r3.ebuild 998 BLAKE2B 42b3769142f9892f769a4e777b4f4030b2dced088d2006d45d9fd77c3c463ed68d6a2f4b341eaa677d7ec7a339c8cd83d30297cec023d1ca0ac904bca1448fc1 SHA512 f3b626d5576e137bbe58f169ca11d237194e94c0eaf3d4e45c8e398493dad0e1c5a861d414c836af749d102ff899465977e705528675967ea9ce4cbc8a7d6eea
+EBUILD docbook-sgml-dtd-4.0-r3.ebuild 998 BLAKE2B 46ed9d8b063dabdfaad0f7165add39a1df5ef6c20be2bad899b760f013bcedd86b70d08b3fed04a7ee175ed2e558a3fdd11f82bcf941470c78e8ddeb471e65b3 SHA512 8a395cc78213ec47b3e18a5ed0edbfb617cfbd1c8d3bacb2bbae868b79ea192834acf7c53a9d2712b0a938c15ca55d8550241995b38b2e53147f11d014aa7f96
+EBUILD docbook-sgml-dtd-4.1-r3.ebuild 998 BLAKE2B 400ca316284254730bddafc254b2b05f74a92a85090d5e1f148dbc765eb7b4fc33544002cae0bb97e7797872340231862574d92f6555e75b45ebbe35427c6482 SHA512 560c60e3d575f6d8ee8992687394b1b9b417462f60f7cc0f4d2bc223b03fb5fe09c372d3bcae15b5ed69eabf408453e2a0d0941c08b556c3b3d0dff292589dcf
+EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1013 BLAKE2B cac364ca6db8c7a338e7aa246e50d11dbeaa7e1eae0fa90548e5e9696d739b9680927c2555c1b14387191cbd819017bd78b0485cb70634ffc618c8d09a88073b SHA512 0aa4acca46286a4c6af9c89ebbc959a2660c23c2ddbe576aa338548b4f101a1697cb3745151cb96d2b28c60dc1a584cbfce69af748284b8893743dd405c5089c
+EBUILD docbook-sgml-dtd-4.3-r2.ebuild 994 BLAKE2B 8563c3b0104fc86e7084ecf3bf6346eefbc843d9ade51b9646cffe1d560bd81df399fc92aa6a33d4e8d7ef9ea62f9f026aa41e0703631eec4837819135f10e18 SHA512 5428471de628c6821879af606f8a620f8ecd03a55457bd38b6b1915cb89b373e8989b3b55d4d00e9b4ba125abc6649559d1b5806c69abaca02fc1bb73e18bdc4
+EBUILD docbook-sgml-dtd-4.4.ebuild 1004 BLAKE2B c9e63807397bdad3b387f43f23663f58578db0d6b102c45a6ac98cfb2f1bc770e8fb208379f02ce6cbb4f9495bae8b8b1c80767d3d2ac2f6287311524c93e947 SHA512 ba8a6e5ae3d8edfa185bbf334326fae1a8b9a3fb57114a4b6b117de0053ccc9a09ae7c086c1b94ec0e527bd73526dfe99b0a5caecb3ea5c3d9c9339d41e30397
+EBUILD docbook-sgml-dtd-4.5.ebuild 1013 BLAKE2B d73fbbdde2122516b8aeb56e4b4593097886f09b5a088a7607c968d52a6d26c212a4d97f5bb1baa4e15b3c9e1f39ddd4142913862d0cb2b9437b94103681edd9 SHA512 415f0b59959430d3babb1bf62e29b0cb93e58751c591993e61752d5240b3a263e14be8728fa51129a5eb378a8c0859dc4ef7172f01b2ef4098799ebf2eac2199
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
index 7bc31b24ab58..e53da8b333fd 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbk30"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
index d2bee0c42c72..25ee2b14ca9a 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbk31"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
index 6fd11edf5a05..b0841961d098 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbk40"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
index 49cab1b00620..465f9932818c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbk41"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
index bc684fd098a7..3148720a2ac7 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbook-4.2"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc ChangeLog README
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
index e99be1ef8943..7f5046ce6090 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbook-${PV}"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc ChangeLog README
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
index e8a045063c2a..42f570ed67a4 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbook-${PV}"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc ChangeLog README
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
index f3897d253127..df3790d1df7b 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit eutils sgml-catalog
 
 MY_P="docbook-${PV}"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod *.xml || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod *.xml
+	newins docbook.cat catalog
 	dodoc README
 }
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 0ebf023881fc..849621708efe 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,3 +1,5 @@
+AUX 3.24.2-CVE-2017-1000159.patch 1644 BLAKE2B dfb16a3fd8403d69212d0d20fa97dc06ad2b43d1c71894a0a2b366002b945110a73942446543276058ad5bb8ed867b68b3750eb9eed5bb23d2b130c14239f98e SHA512 a09d1e4a6f22c1b93ab322c1b7201bf4665bbc12b29dd9222db22b7d1b73f9ebc745c7e9b77e2bb54656916360757fd8007b6c38c004983b42f506bbaf4369ff
 DIST evince-3.24.2.tar.xz 3509216 BLAKE2B 3bcb9e15a6576650d17d6ea1df638c4b16759ddd2353ca47b425c1fec04f90b85ff7f338472e5e18defc01ab066ef241eff40e8f493fa2238814933703636e7b SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f
+EBUILD evince-3.24.2-r1.ebuild 2874 BLAKE2B dba10da7fdf7adfc96c52ed4cde40c9793bec028e3c56043f9bd6a1acec62f1b9d3dd900bfee8281c19fbf7eb43bab8a6895ca3bad21fd49669f0ec106459612 SHA512 92527495b1f50a477458599f01c00c652bfd572d179130920c49ecde92878adb3a8bea317645a10ead7f04c963ee46a082629dc05e153aaa0ea47bd91ed92b0e
 EBUILD evince-3.24.2.ebuild 2817 BLAKE2B de7e0a0d79c45ec1c49c81c3c2a15dc3f26c3e2bcdc8d5d9c50112ed5ae6ef97140f846ce417d493c3249bcab11772cc3b702512f4a2efd0cecc1ef352d8912c SHA512 fc749377496ba1e0a22cd50960ddd15f111db660ccdf7ae06893a437c3b6b128321dd465846f47ca92811160e88e8f9b3fa9cae83da2adba101ee22e166d435b
 MISC metadata.xml 612 BLAKE2B 2736a02dc43835f7db7b02a3ffcd2c2e25a81971a61a008f67497612ce8f9c78b6641e110a00dacf5f158cf5a87104171c5aea7f82be241ee0b966bb802e78eb SHA512 a9ce7d786d979e14c852b0fe3f722b346dce2f1f52b8f9ab272a1f2291ce88adba78c5d347e3e33a3bb0a58f46d77d20febc92516a4c12bc9f987cccd7aa977c
diff --git a/app-text/evince/evince-3.24.2-r1.ebuild b/app-text/evince/evince-3.24.2-r1.ebuild
new file mode 100644
index 000000000000..f8d23a5fc7bc
--- /dev/null
+++ b/app-text/evince/evince-3.24.2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# gdk-pixbuf used all over the place
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.36:2[dbus]
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.16.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.33[cairo]
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-CVE-2017-1000159.patch
+)
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/app-text/evince/files/3.24.2-CVE-2017-1000159.patch b/app-text/evince/files/3.24.2-CVE-2017-1000159.patch
new file mode 100644
index 000000000000..80861fdc4dea
--- /dev/null
+++ b/app-text/evince/files/3.24.2-CVE-2017-1000159.patch
@@ -0,0 +1,42 @@
+From 350404c76dc8601e2cdd2636490e2afc83d3090e Mon Sep 17 00:00:00 2001
+From: Tobias Mueller <muelli@cryptobitch.de>
+Date: Fri, 14 Jul 2017 12:52:14 +0200
+Subject: [PATCH] dvi: Mitigate command injection attacks by quoting filename
+
+With commit 1fcca0b8041de0d6074d7e17fba174da36c65f99 came a DVI backend.
+It exports to PDF via the dvipdfm tool.
+It calls that tool with the filename of the currently loaded document.
+If that filename is cleverly crafted, it can escape the currently
+used manual quoting of the filename.  Instead of manually quoting the
+filename, we use g_shell_quote.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784947
+---
+ backend/dvi/dvi-document.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
+index 4a896e21..28877700 100644
+--- a/backend/dvi/dvi-document.c
++++ b/backend/dvi/dvi-document.c
+@@ -300,12 +300,14 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
+ 	gboolean success;
+ 	
+ 	DviDocument *dvi_document = DVI_DOCUMENT(exporter);
++	gchar* quoted_filename = g_shell_quote (dvi_document->context->filename);
+ 	
+-	command_line = g_strdup_printf ("dvipdfm %s -o %s \"%s\"", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
++	command_line = g_strdup_printf ("dvipdfm %s -o %s %s", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
+ 					dvi_document->exporter_opts->str,
+ 					dvi_document->exporter_filename,
+-					dvi_document->context->filename);
+-	
++					quoted_filename);
++	g_free (quoted_filename);
++
+ 	success = g_spawn_command_line_sync (command_line,
+ 					     NULL,
+ 					     NULL,
+-- 
+2.17.0
+
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index a23ef06ab535..24878bb8ee8c 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -2,5 +2,5 @@ AUX llpp-26b-WM_CLASS.patch 860 BLAKE2B adcd60863d72d5328d6918c7904c58f160651a91
 DIST llpp-26b.tar.gz 169385 BLAKE2B 9a80c22d013af063e3908bda69108ce6a4e0f72efb1c0b930308591d2b8a0f94f7b71a5f1057543e102b95b01440d567e6648d1ed77f1e85728f5ea31718ea28 SHA512 ce7d743d8ec998a93cf272083dc5926ce6a250aee6ac768814f511ecb309ffe94fb0e2561ca1778e1c7fbd5824545477937618c8e66d32fd273f9b5e5e3fd143
 DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
 EBUILD llpp-26b.ebuild 3115 BLAKE2B 03813d97d89259ddb09a0b7fc5f90ce7bfbb99464573aab532f8af232d33432b5a2406b8c455d34d2f2f87d0d6a1c095dd563ea7d419088ed83b1c594c77c9a0 SHA512 f7afd8b79aece96846f5bf5cedf3f4f3a92aa34aa9974f0243729da72f4470a942239af21c6697969b2401f4eb10743d498e425bdaacc0101775cc21cd348196
-EBUILD llpp-26b_p20180114.ebuild 3033 BLAKE2B caebe9df3f7185cd9c965b341aef4b1c3484ac4ff80ff3812c6a09ce43750f9d99fc7cbb6360cdaf98cc63b2e87dcb4dad12855d62d33f5bbd0ae07b7fb24714 SHA512 a3cf494930b97aef03b93588217f2f7ec055f2fe1c56c875a31c3ece8c8ea45abe3cb8b002a9294f2cda67cfd869d872ba9ee7a5eeb1ede0de28274d3f88568e
+EBUILD llpp-26b_p20180114.ebuild 3032 BLAKE2B d6cc8bf1fac0cd932c298d4816221137e47df136283fc752be62886a1111de02803e92230319ccffc1864dbaf81b318c0400a34454a4f1019d8825d76f353e5b SHA512 f4b0da1be74c63c71ae02e1b6dfb7067ead203a9e1203e2c88e1eb4302364205bb92c2e4e841d861124f99781e6bb7214bf5e536dbab51a0e20c178b54afec11
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/app-text/llpp/llpp-26b_p20180114.ebuild b/app-text/llpp/llpp-26b_p20180114.ebuild
index 4c39269b6b5b..4c83f9fd324e 100644
--- a/app-text/llpp/llpp-26b_p20180114.ebuild
+++ b/app-text/llpp/llpp-26b_p20180114.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://distfiles.gentoo.org/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 154018127e67..17565c1dd3c3 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -12,6 +12,6 @@ DIST mupdf-1.11-source.tar.gz 40156070 BLAKE2B 2a9991a11355a449b91955bd897b5da17
 DIST mupdf-1.12.0-source.tar.gz 51508917 BLAKE2B c34df17f0df7a200897d678514ff4012e02b1cef71189fe48740948c88cb544c6ce80f52a5dc335d70002806a7b413e5f79a1edee88865e42daf76e49416d9bf SHA512 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
 EBUILD mupdf-1.11-r1.ebuild 4650 BLAKE2B f68c39d06fae959cc37de3a6eb03758f3b146eda42253a795b48ba56ddb887f76eb79d901745fe4b6ff16924436f3fd4699b4065ed7d1a33bf605dd8f4265173 SHA512 4c2b3d4c568b42335177ccd975b11e044a0887d6541c2b78f7b3d43b1bc9030dd35f1ff4d8c3c2d4278c3e06b78ee2acab975eeff2dc5c00516575dfad436b6e
 EBUILD mupdf-1.11-r2.ebuild 4773 BLAKE2B d30970c3d275a44ff46a971b707cba9f17d2d4da24e1699cac848be97fc82fb5433a8a09166239b67a3764d13843b91683f93ff0e604fffde27e18d9bb500e7e SHA512 af89cdf6f3a595b424c67225cfa57b9c6811b4cbd9d1cb032bcadf98468aacbce00a78d4479592477bcdc3f6ad6f14703b4ea3aeda3820be7d8893ce506e2214
-EBUILD mupdf-1.12.0-r2.ebuild 5154 BLAKE2B feeda98cabe81764b76269fca21cff56d88b2d9604415ef972adccfbf9809e39a7779a821134245db0b8d0b930eadfc2ec463adbe25f6f39889d6d5d5860764e SHA512 e8040bcca783d3fc0ab87892a4f8c96c8a403a63132af9a2539879c6fc0c447331b88cce72e07197dee5452eff276066c464ef65ffbf936b463befe861b127a4
+EBUILD mupdf-1.12.0-r2.ebuild 5152 BLAKE2B b463e7aef9e8c3905cf9fc1ebab8c8a67c7e5c2a53968fbc793c5b1c5f03ab548d581d5f979d364e8a8c852268315b5b21e759aeec6fa5296b26e06cbf0449a8 SHA512 772793962bbec29211b4227a3005389971ce5d41ff02d9c0f0311c7bc2392ddcf3d61bbf8cf668673a5547c8b9ec7942cf617d2a4a97432b8fc5392ad43f7b6a
 EBUILD mupdf-1.12.0.ebuild 5060 BLAKE2B d68da2df2e328e4f96560d28dc8a79b7cdcbc5be7761513cac5dce3f9cc01a09083c11dea7ced2b8ab4cf41a788eb4a80b890e683e2178b6caed48dd758273c3 SHA512 42bf1fec67bbee0aa84a20614d322640f4c92c54eb947f35957886111834031d4a45994aaf39ba4ea08c709823475bede42c9dc4b49099929414ce587e8eb020
 MISC metadata.xml 315 BLAKE2B b143559c33bb6e3b81fe4dd7df802d48470f9080987e6c888b96bfb3f17e51dd3beaeb5501941dbbc47e1a525900a4719dc42d3d457d391d725670ff201e0c5b SHA512 1f3d23236f716a9e02a4f320105a8cd36e0dc84e25e35764677b66f7ae42039e0ae6f82ef06635cb0fe53fbb2e27ab854e54d45280275b8235f186328daa2b4e
diff --git a/app-text/mupdf/mupdf-1.12.0-r2.ebuild b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
index 24fbe8ee0af5..e9e48938d09f 100644
--- a/app-text/mupdf/mupdf-1.12.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
 
 LIB_DEPEND="
diff --git a/app-text/noweb/Manifest b/app-text/noweb/Manifest
deleted file mode 100644
index 1904c89ba76d..000000000000
--- a/app-text/noweb/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 50noweb-gentoo.el 180 BLAKE2B f61102e8d9b8732e6279654761160ac07eaff63ddb9af147e98062c3a5734b72beac60286e1791f45074cadae267f57412d54b85f323df0fc71b5476b518080d SHA512 96e3b747096d30ee2202b155dce79aee783c9adbc66f1392f5d6cee6be82ed951551de5c2c8f2f48f6a905ffb2be045cbe5bc5e999c6acd042b8d77e480384b0
-AUX noweb-2.11b-ldflags.patch 619 BLAKE2B 83645350487f9c3d4cb72710b3e1d35b02cb09f8b2c3240260ef770c514c23a694413a5e27eeb203d322efe431ca5b3452f74e1dd9cfb9abbff5f061472d2324 SHA512 4d73c9025da77c39a359a90f2605c0f870bcca2b737b47bb64d4e0096f2c2c285867383e1accf221db8e83b98ccfa6dd02f4e77c837eb2d0f195394d07359106
-AUX noweb-2.11b-recmake.patch 5470 BLAKE2B d5d73dc019a30d90966bc612e6d3f79a489e8582b4dbf8bd9d9f255c4a4bcdf3dc91ff04db01bf29f7dabe1693cc9f943398709fd0ab91e38f26f4cf6b9b5ab4 SHA512 ca7fcc11710ade0ac903408fdb4c9388903c50b885fda27cfabd34ffc0db72ee9b8ecf10347a74af5b50cce0275e5e4ee81544caafd21df36e77b264c2a24438
-AUX noweb-2.9-security.patch 6558 BLAKE2B cc416960f5e802919bfe8b1136e5e468a642b1b612a657d1c16f27e73998f44bae7ee11dbe8d8accd322da035262e6404122a8bf2d2eebca37e597c8f2a669a7 SHA512 259612cbb57a0c13d0d6e53818c4da7adf8389fa6a826cc9966c5924d2da6582c89b6457c8c77c0067e4e3580c0fd4156138de67671d30c52e9c63e75d6f80a2
-DIST noweb-2.11b.tgz 738870 BLAKE2B 039bc6673056e1cc5bf68ca9d9f95d266dbe48e54e005b8ee067f679514c4da4470c3f6d08841b5fc998b0f79ee85042bc64dd13cac2820c7604da6792dff0cb SHA512 0363c68aa31549fd806a575e6055b117db51fb5b5f28e7b30bdf3c108b3cf9546e1c6a4e64faf892b013c79665b14d436879800d4e970b0732fbd482b416d0f9
-EBUILD noweb-2.11b-r4.ebuild 2802 BLAKE2B 62df64ce4d0e32f92ed0617ec1504c25b55c3f54eb1c807d8964bbd0d235be606fbf8efd1c149cc7ceb865e2f371a604d4af4b0c9bdd646b17f56668aa1ca5f9 SHA512 ad1764f2351da1114f21aad8f7e38a236874fb9409ea7e1da15cab5bab59409b1870fc17311fa4278deaaa4cdee72440b3b90f3630db6330e40b6fb343641193
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/noweb/files/50noweb-gentoo.el b/app-text/noweb/files/50noweb-gentoo.el
deleted file mode 100644
index 90b971d74635..000000000000
--- a/app-text/noweb/files/50noweb-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload  'noweb-mode "noweb-mode"
-  "Minor meta mode for editing noweb files." t)
-(add-to-list 'auto-mode-alist '("\\.nw\\'" . noweb-mode))
diff --git a/app-text/noweb/files/noweb-2.11b-ldflags.patch b/app-text/noweb/files/noweb-2.11b-ldflags.patch
deleted file mode 100644
index 3fe114cb1dd9..000000000000
--- a/app-text/noweb/files/noweb-2.11b-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=338899
-
-Index: noweb-2.11b/src/c/Makefile
-===================================================================
---- noweb-2.11b.orig/src/c/Makefile
-+++ noweb-2.11b/src/c/Makefile
-@@ -41,16 +41,16 @@ CPIF=>
- all:	nt markup mnt finduses
- 
- nt:	$(TANGLEOBJS)
--	$(CC) $(CFLAGS) -o nt $(TANGLEOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o nt $(TANGLEOBJS)
- 
- finduses:	$(FINDUSESOBJS)
--	$(CC) $(CFLAGS) -o finduses $(FINDUSESOBJS)
-+
- 
- markup:	$(MARKUPOBJS)
--	$(CC) $(CFLAGS) -o markup $(MARKUPOBJS)
-+
- 
- mnt:	$(MNTOBJS)
--	$(CC) $(CFLAGS) -o mnt $(MNTOBJS)
-+
- 
- source:	$(SRCS)
- touch: $(SRCS)
diff --git a/app-text/noweb/files/noweb-2.11b-recmake.patch b/app-text/noweb/files/noweb-2.11b-recmake.patch
deleted file mode 100644
index 98b29935b7d1..000000000000
--- a/app-text/noweb/files/noweb-2.11b-recmake.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=264273
-
-Index: noweb-2.11b/Makefile
-===================================================================
---- noweb-2.11b.orig/Makefile
-+++ noweb-2.11b/Makefile
-@@ -9,14 +9,14 @@ SHELL=/bin/sh
- CINAME=-Nv`echo $(VERSION) | tr . _`
- CIMSG=-f -m'standard checkin preparing to export version $(VERSION)'
- 
--source: ;	for i in src; do (cd $$i; make source); done
--www: ;		for i in src/xdoc examples; do (cd $$i; make www); done
-+source: ;	for i in src; do (cd $$i; $(MAKE) source); done
-+www: ;		for i in src/xdoc examples; do (cd $$i; $(MAKE) www); done
- 
- clean:
--	for i in src examples contrib; do (cd $$i; make clean); done
-+	for i in src examples contrib; do (cd $$i; $(MAKE) clean); done
- 	rm -f nwsrcfilter *~ */*~
- clobber: clean
--	for i in src examples contrib; do (cd $$i; make clobber); done
-+	for i in src examples contrib; do (cd $$i; $(MAKE) clobber); done
- 
- DATE:
- 	(./echo -n "Version $(VERSION) of "; date) > DATE
-@@ -51,6 +51,6 @@ emacscheck:
- 	diff src/elisp/noweb-mode.el $(HOME)/emacs/noweb-mode.el
- 
- checkin:
--	(cd src; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
-+	(cd src; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
- 
- 
-Index: noweb-2.11b/contrib/norman/Makefile
-===================================================================
---- noweb-2.11b.orig/contrib/norman/Makefile
-+++ noweb-2.11b/contrib/norman/Makefile
-@@ -1,10 +1,10 @@
- LIB=/dev/null	# to be overridden
- DIRS=numarkup
- 
--all: ;	for i in $(DIRS); do (cd $$i; make ICONC=$(ICONC) ICONT=$(ICONT) all); done
--install: ;	for i in $(DIRS); do (cd $$i; make LIB=$(LIB) BIN=$(BIN) install); done
--source: ;	for i in $(DIRS); do (cd $$i; make source); done
--clean: ;	for i in $(DIRS); do (cd $$i; make clean); done
-+all: ;	for i in $(DIRS); do (cd $$i; $(MAKE) ICONC=$(ICONC) ICONT=$(ICONT) all); done
-+install: ;	for i in $(DIRS); do (cd $$i; $(MAKE) LIB=$(LIB) BIN=$(BIN) install); done
-+source: ;	for i in $(DIRS); do (cd $$i; $(MAKE) source); done
-+clean: ;	for i in $(DIRS); do (cd $$i; $(MAKE) clean); done
- iconlib:	# cheap hack for slackmake
- 	true
- 
-Index: noweb-2.11b/contrib/norman/numarkup/Makefile
-===================================================================
---- noweb-2.11b.orig/contrib/norman/numarkup/Makefile
-+++ noweb-2.11b/contrib/norman/numarkup/Makefile
-@@ -11,11 +11,11 @@ OBJS = main.o pass1.o latex.o input.o sc
- 
- all: 
- 	noweb -t numarkup.nw
--	make $(TARGET)
-+	$(MAKE) $(TARGET)
- 
- install:
- 	noweb -t numarkup.nw
--	make $(TARGET)
-+	$(MAKE) $(TARGET)
- 	strip $(TARGET)
- 	cp $(TARGET) $(LIB)
- 
-Index: noweb-2.11b/src/Makefile
-===================================================================
---- noweb-2.11b.orig/src/Makefile
-+++ noweb-2.11b/src/Makefile
-@@ -41,9 +41,9 @@ LIBNAME=$(LIB)
- TEXNAME=$(TEXINPUTS)
- 
- all: 
--	cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all 
--	for i in shell lib xdoc tex; do (cd $$i; make all); done
--	cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
-+	cd c; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" all 
-+	for i in shell lib xdoc tex; do (cd $$i; $(MAKE) all); done
-+	cd $(LIBSRC); $(MAKE) "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
- 
- FAQ: FAQ.html
- 	sleep 1; html2ascii FAQ.html > FAQ
-@@ -101,13 +101,13 @@ install-code: install-shell
- 	-mkdir $(BIN) $(LIB) 2>/dev/null
- 	true c/nt c/markup c/mnt c/finduses
- 	cp c/nt c/markup c/mnt c/finduses $(LIB)
--	cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
--	cd lib; make LIB=$(LIB) install
-+	cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
-+	cd lib; $(MAKE) LIB=$(LIB) install
- 
- uninstall-code: uninstall-shell
- 	rm $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses 
--	cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
--	cd lib; make LIB=$(LIB) uninstall
-+	cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
-+	cd lib; $(MAKE) LIB=$(LIB) uninstall
- install-man:
- 	-mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
- 	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT)
-@@ -193,24 +193,24 @@ install-elisp:
- uninstall-elisp:
- 	rm -f $(ELISP)/noweb-mode.el
- checkin:
--	for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
-+	for i in lib tex xdoc; do (cd $$i; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
- 	for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
- 	(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
- 	ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
- 
- source: FAQ
--	for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
-+	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) CPIF=">" source); done
- 	sleep 1
--	for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
-+	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
- touch:
- 	touch FAQ
--	for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
-+	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
- clean:
--	for i in c shell lib xdoc icon awk tex; do (cd $$i; make clean); done
-+	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) clean); done
- 	rm -f nwsrcfilter *~ */*~
- 
- clobber: clean
--	for i in c lib icon awk xdoc; do (cd $$i; make clobber); done
-+	for i in c lib icon awk xdoc; do (cd $$i; $(MAKE) clobber); done
- 
- Makefile: Makefile.nw
- 	chmod +w Makefile
diff --git a/app-text/noweb/files/noweb-2.9-security.patch b/app-text/noweb/files/noweb-2.9-security.patch
deleted file mode 100644
index 951af7968ae7..000000000000
--- a/app-text/noweb/files/noweb-2.9-security.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-diff -urN noweb-2.9.orig/src/awk/totex.nw noweb-2.9/src/awk/totex.nw
---- noweb-2.9.orig/src/awk/totex.nw	2000-03-27 02:00:00.000000000 +0200
-+++ noweb-2.9/src/awk/totex.nw	2006-02-17 12:47:05.000000000 +0100
-@@ -24,7 +24,7 @@
- @
- On an ugly system, we have to put it in a file.
- <<invoke awk program using file>>=
--awkfile=/tmp/totex$$.awk
-+awkfile=$(tempfile -p totex)
- trap 'rm -f $awkfile; exit 1' 0 1 2 15	# clean up files
- cat > $awkfile << 'EOF'
- <<awk program for conversion to {\TeX}>>
-diff -urN noweb-2.9.orig/src/awkname noweb-2.9/src/awkname
---- noweb-2.9.orig/src/awkname	2000-06-23 12:56:00.000000000 +0200
-+++ noweb-2.9/src/awkname	2006-02-17 12:47:05.000000000 +0100
-@@ -5,7 +5,7 @@
- esac
- 
- rc=0
--new=/tmp/$$.new; old=/tmp/$$.old
-+new=$(tempfile -p new); old=$(tempfile -p old)
- 
- for file in lib/emptydefn lib/unmarkup lib/toascii lib/btdefn \
-                         awk/noidx awk/totex awk/tohtml awk/noindex \
-diff -urN noweb-2.9.orig/src/lib/toascii noweb-2.9/src/lib/toascii
---- noweb-2.9.orig/src/lib/toascii	2001-03-28 15:49:00.000000000 +0200
-+++ noweb-2.9/src/lib/toascii	2006-02-17 12:47:05.000000000 +0100
-@@ -7,9 +7,9 @@
-                 *)      echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;;
-         esac
- done
--awkfile="tmp/awk$$.tmp"
--textfile="/tmp/text$$.tmp"
--tagsfile="/tmp/tags$$.tmp"
-+awkfile=$(tempfile -p awk -s .tmp)
-+textfile=$(tempfile -p text -s .tmp)
-+tagsfile=$(tempfile -p tags -s .tmp)
- export awkfile textfile tagsfile
- trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
- nawk 'BEGIN { textfile=ENVIRON["textfile"]
-diff -urN noweb-2.9.orig/src/lib/toascii.nw noweb-2.9/src/lib/toascii.nw
---- noweb-2.9.orig/src/lib/toascii.nw	2000-03-27 02:00:00.000000000 +0200
-+++ noweb-2.9/src/lib/toascii.nw	2006-02-17 12:48:20.000000000 +0100
-@@ -28,9 +28,9 @@
- Also arranged here is a temporary file for storage of the awk program on an
- ugly system, as discussed below.
- <<arrange temporary files>>=
--awkfile="tmp/awk$$.tmp"
--textfile="/tmp/text$$.tmp"
--tagsfile="/tmp/tags$$.tmp"
-+awkfile=$(tempfile -p awk -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+textfile=$(tempfile -p text -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+tagsfile=$(tempfile -p tags -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
- export awkfile textfile tagsfile
- trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
- @ %def textfile tagsfile awkfile
-diff -urN noweb-2.9.orig/src/shell/cpif noweb-2.9/src/shell/cpif
---- noweb-2.9.orig/src/shell/cpif	2000-03-27 02:00:00.000000000 +0200
-+++ noweb-2.9/src/shell/cpif	2006-02-17 12:47:05.000000000 +0100
-@@ -17,7 +17,7 @@
- 0)		echo 'Usage: '`basename $0`' [ -eq -ne ] file...' 1>&2; exit 2
- esac
- 
--new=/tmp/$$
-+new=$(tempfile)
- trap 'rm -f $new; exit 1' 1 2 15	# clean up files
- 
- cat >$new
-diff -urN noweb-2.9.orig/src/shell/nonu noweb-2.9/src/shell/nonu
---- noweb-2.9.orig/src/shell/nonu	2000-03-27 02:00:00.000000000 +0200
-+++ noweb-2.9/src/shell/nonu	2006-02-17 12:47:05.000000000 +0100
-@@ -2,7 +2,7 @@
- LIB=/usr/public/pkg/noweb/lib
- # attempt to convert nuweb to noweb using sam
- 
--tmp=/tmp/nonu$$
-+tmp=$(tempfile -p nonu)
- trap '/bin/rm -f $tmp; exit 1' 1 2 15	# clean up files
- cp $1 $tmp || exit 1
- 
-diff -urN noweb-2.9.orig/src/shell/noroff noweb-2.9/src/shell/noroff
---- noweb-2.9.orig/src/shell/noroff	2001-03-28 15:49:00.000000000 +0200
-+++ noweb-2.9/src/shell/noroff	2006-02-17 12:47:05.000000000 +0100
-@@ -35,9 +35,10 @@
- 
- base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
- tagsfile="$base.nwt"
-+tmpfile=$(tempfile -p tags)
- (echo ".so $macrodir/tmac.w"
- if [ -r "$tagsfile" ]; then 
--   cp $tagsfile /tmp/tags.$$
-+   cp $tagsfile $tmpfile
-    $AWK '{
- 	     if      (sub(/^###TAG### /       , "")) tags[$1] = $2
- 	     else if (sub(/^###BEGINCHUNKS###/, "")) printf ".de CLIST\n.CLISTBEGIN\n"
-@@ -88,8 +89,8 @@
- 	 #	print str3
- 	 #	print convquote(str3)
- 	 # }
--	 function tag(s) { if (s in tags) return tags[s]; else return "???" }' /tmp/tags.$$
--   rm -f /tmp/tags.$$
-+	 function tag(s) { if (s in tags) return tags[s]; else return "???" }' $tmpfile
-+   rm -f $tmpfile
-  fi
-  cat "$@") |
- ($ROFF $opts 2>$tagsfile)
-diff -urN noweb-2.9.orig/src/shell/roff.mm noweb-2.9/src/shell/roff.mm
---- noweb-2.9.orig/src/shell/roff.mm	2000-03-27 02:00:00.000000000 +0200
-+++ noweb-2.9/src/shell/roff.mm	2006-02-17 12:48:20.000000000 +0100
-@@ -214,7 +214,7 @@
- .ADDLIST 1a
- .PRINTLIST
- 
--awkfile="/tmp/noweb$$.awk"
-+awkfile=$(tempfile -p noweb -s .awk) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
- trap 'rm -f $awkfile' 0 1 2 10 14 15
- cat > $awkfile \&<< 'EOF'
- \c
-@@ -1628,14 +1628,15 @@
- tagsfile="$base.nwt"
- (echo ".so $macrodir/tmac.w"
- if [ -r "$tagsfile" ]; then 
--   cp $tagsfile /tmp/tags.$$
-+   tagstemp=$(tempfile -p tags) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
-+   cp $tagsfile $tagstemp
-    $AWK '\c
- .USE "action for \*[BEGINCONVQUOTE]tags\*[ENDCONVQUOTE] line" 11c
- \&
-          \c
- .USE "functions" 8a
--\&' /tmp/tags.$$
--   rm -f /tmp/tags.$$
-+\&' $tagstemp
-+   rm -f $tagstemp
-  fi
-  cat "$@") |
- ($ROFF $opts 2>$tagsfile)
-diff -urN noweb-2.9.orig/src/shell/roff.nw noweb-2.9/src/shell/roff.nw
---- noweb-2.9.orig/src/shell/roff.nw	2000-03-27 02:00:00.000000000 +0200
-+++ noweb-2.9/src/shell/roff.nw	2006-02-17 12:47:05.000000000 +0100
-@@ -80,7 +80,7 @@
- other, and quoting each quote is ugly.  The pragmatic solution is to
- copy the awk program into a temporary file, using a shell here-document.
- <<invoke awk program>>=
--awkfile="/tmp/noweb$$.awk"
-+awkfile=$(tempfile -p noweb -s .awk)
- trap 'rm -f $awkfile' 0 1 2 10 14 15
- cat > $awkfile << 'EOF'
- <<awk program>>
-@@ -662,12 +662,13 @@
- 
- base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
- tagsfile="$base.nwt"
-+tmpfile=$(tempfile -p tags)
- (echo ".so $macrodir/tmac.w"
- if [ -r "$tagsfile" ]; then 
--   cp $tagsfile /tmp/tags.$$
-+   cp $tagsfile $tmpfile
-    $AWK '<<action for [[tags]] line>>
--         <<functions>>' /tmp/tags.$$
--   rm -f /tmp/tags.$$
-+         <<functions>>' $tmpfile
-+   rm -f $tmpfile
-  fi
-  cat "$@") |
- ($ROFF $opts 2>$tagsfile)
-diff -urN noweb-2.9.orig/src/shell/toroff noweb-2.9/src/shell/toroff
---- noweb-2.9.orig/src/shell/toroff	2001-03-28 15:49:00.000000000 +0200
-+++ noweb-2.9/src/shell/toroff	2006-02-17 12:47:05.000000000 +0100
-@@ -9,7 +9,7 @@
-            exit 1;;
-     esac
- done
--awkfile="/tmp/noweb$$.awk"
-+awkfile=$(tempfile -p noweb -s .awk)
- trap 'rm -f $awkfile' 0 1 2 10 14 15
- cat > $awkfile << 'EOF'
- /^@begin docs 0$/ { if (delay) next }
diff --git a/app-text/noweb/metadata.xml b/app-text/noweb/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/app-text/noweb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/noweb/noweb-2.11b-r4.ebuild b/app-text/noweb/noweb-2.11b-r4.ebuild
deleted file mode 100644
index 0fe33e7bba16..000000000000
--- a/app-text/noweb/noweb-2.11b-r4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils toolchain-funcs elisp-common
-
-DESCRIPTION="a literate programming tool, lighter than web"
-HOMEPAGE="https://www.cs.tufts.edu/~nr/noweb/"
-#SRC_URI="ftp://www.eecs.harvard.edu/pub/nr/${P}.tgz"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tgz"
-#put on devspace, because no-passive-ftp is required on havard.edu.
-
-LICENSE="noweb emacs? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="emacs examples"
-
-DEPEND="virtual/tex-base
-	dev-lang/icon
-	sys-apps/debianutils
-	emacs? ( virtual/emacs )"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P}/src
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	# glibc2.10 compat (bug 270757)
-#	mkdir d && cp -r c/* d/
-	sed "s:getline (:getline_nonlibc (:" -i c/getline.{c,h} || die
-	sed "s:getline(:getline_nonlibc(:" -i c/{notangle.c,getline.c,finduses.c} || die
-#	diff -u d/ c/
-
-	epatch "${FILESDIR}"/${PN}-2.9-security.patch
-	# dont run texhash...
-	sed -i -e "s/texhash/true/" Makefile
-	# dont strip...
-	sed -i -e "s/strip/true/" Makefile
-
-	cd "${WORKDIR}/${P}"
-	epatch "${FILESDIR}"/${P}-recmake.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
-	# noweb tries to use notangle and noweb; see bug #50429
-	( cd c; emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" ) || die
-	export PATH="${PATH}:${T}"
-	emake ICONC="icont" CC="$(tc-getCC)" BIN="${T}" LIB="${T}" LIBSRC="icon" install-code \
-		|| die "make temporal install failed."
-
-	emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" || die "make failed"
-	# Set awk to awk not nawk
-	./awkname awk
-
-	if use emacs; then
-		elisp-compile elisp/noweb-mode.el || die "elisp-compile failed"
-	fi
-}
-
-src_install () {
-	# It needs the directories to exist first...
-	dodir /usr/bin
-	dodir /usr/libexec/${PN}
-	dodir /usr/share/man
-	dodir /usr/share/texmf-site/tex/inputs
-	emake ICONC="icont" \
-		BIN="${ED}/usr/bin" \
-		LIBSRC="icon" \
-		LIBNAME="${EPREFIX}/usr/libexec/${PN}" \
-		LIB="${ED}/usr/libexec/${PN}" \
-		MAN="${ED}/usr/share/man" \
-		TEXNAME="${EPREFIX}/usr/share/texmf-site/tex/inputs" \
-		TEXINPUTS="${ED}/usr/share/texmf-site/tex/inputs" \
-		install || die "make install failed"
-	cd "${WORKDIR}/${P}"
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-	dodoc CHANGES README
-
-	if use emacs; then
-		elisp-install ${PN} src/elisp/noweb-mode.{el,elc} \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Running texhash to complete installation.."
-	texhash
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index afc1d3a3c6a8..0043909b6fda 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -10,6 +10,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 492 BLAKE2B f08e967feb9944285d0eb7b257841432ef4a462386c4609908e1fc8678e18fcde72d99d49c7f527f7b4e200c16ce834aa2781f8881f424b1e2b029cb7647d395 SHA512 5485e8bf2a781f87b14cef2e1b054604a1bca554a682d6f064c940df0b2eadaa1103085e56d57ec6b5bf816792be6ef954095c90349d30d1dd0e37faf766fc0d
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r6.ebuild 3583 BLAKE2B bcfafd0eefea847378ec9f2d59c85baad4e61de8afbb5a60b9ab767489866c209d8540485e68dfaa3ff80c9629f5251d7500b02ad4cb8e9b9f245b4fd039cc6e SHA512 7dc1d6abc1a3874e00d52f0837a0281b94351fd10396006608abdfd0d2531d8c81f5787a9b23a590f2834d9dafb39fc53ddcb27a16745b26a1144174dafaca45
 EBUILD openjade-1.3.2-r7.ebuild 3681 BLAKE2B 55b6180e1382199f63eedbd24b378b1f95aa7ed6ba30f42e494a5686c7e418688ca0e5ceb0bfb7b2ec494e0a85966b5ed087514be5929aa53aad6f50e7fddd63 SHA512 7120e658a97872fc5d2f486a8d32473d527d1a828a914ce2c66b03ee1f0eff380b8f4c9caba33b79f73cd083e52557ec8da33d0687157b59e2fb461a0136c351
 MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/openjade-1.3.2-r6.ebuild b/app-text/openjade/openjade-1.3.2-r6.ebuild
deleted file mode 100644
index 5e074552dca0..000000000000
--- a/app-text/openjade/openjade-1.3.2-r6.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools sgml-catalog eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
-HOMEPAGE="http://openjade.sourceforge.net"
-SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="app-text/sgml-common
-	>=app-text/opensp-1.5.1"
-DEPEND="dev-lang/perl
-	${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-deplibs.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-msggen.pl.patch
-	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
-	epatch "${FILESDIR}"/${P}-libosp-la.patch
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-	epatch "${FILESDIR}"/${P}-darwin.patch
-
-	# Please note!  Opts are disabled.  If you know what you're doing
-	# feel free to remove this line.  It may cause problems with
-	# docbook-sgml-utils among other things.
-	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
-	strip-flags
-
-	# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
-	# on hppa. Using -O1 works fine. So I force it here.
-	use hppa && replace-flags -O2 -O1
-
-	ln -s config/configure.in configure.ac || die
-	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
-	rm config/missing || die
-
-	AT_NOEAUTOMAKE=yes
-	eautoreconf
-
-	SGML_PREFIX="${EPREFIX}"/usr/share/sgml
-}
-
-src_configure() {
-	# avoids dead-store elimination optimization
-	# leading to segfaults on GCC 6
-	# bug #592590 #596506
-	tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
-
-	# We need Prefix env, bug #287358
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	econf \
-		--enable-http \
-		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
-		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
-		--enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# Bug 412725.
-	unset INCLUDE
-
-	emake -j1 SHELL="${BASH}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)
-
-	make DESTDIR="${D}" \
-		SHELL="${BASH}" \
-		libdir="${EPREFIX}"/usr/$(get_libdir) \
-		install install-man
-
-	prune_libtool_files
-
-	dosym openjade  /usr/bin/jade
-	dosym onsgmls   /usr/bin/nsgmls
-	dosym osgmlnorm /usr/bin/sgmlnorm
-	dosym ospam     /usr/bin/spam
-	dosym ospent    /usr/bin/spent
-	dosym osx       /usr/bin/sgml2xml
-
-	insinto /usr/share/sgml/${P}/
-	doins dsssl/builtins.dsl
-
-	echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${ED}/usr/share/sgml/${P}/catalog
-	insinto /usr/share/sgml/${P}/dsssl
-	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
-	newins "${FILESDIR}"/${P}.dsssl-catalog catalog
-# Breaks sgml2xml among other things
-#	insinto /usr/share/sgml/${P}/unicode
-#	doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
-	insinto /usr/share/sgml/${P}/pubtext
-	doins pubtext/*
-
-	dodoc NEWS README VERSION
-	dohtml doc/*.htm
-
-	insinto /usr/share/doc/${PF}/jadedoc
-	doins jadedoc/*.htm
-	insinto /usr/share/doc/${PF}/jadedoc/images
-	doins jadedoc/images/*
-}
-
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
-	"/usr/share/sgml/openjade-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
-	"/usr/share/sgml/openjade-${PV}/dsssl/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
-	"/etc/sgml/${P}.cat"
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index c707a0caa7f9..c176cefdde62 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -3,5 +3,5 @@ DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 EBUILD ttf2pk2-2.0_p20150521.ebuild 1380 BLAKE2B 8a332fc015d1e328b342328096e173d90b4652b3e29ee5f235661741e350404edc9eebd919dbc7fb8d2607da798e333eec8b4dd714967296f96dbd51b2896872 SHA512 86c034a1d85d74894efb55ad7b6aca38606f8291d58d993dbe17c124e44cd71bce7b8aed5e4264e45ce4d8b43ce8e8e6108f42820d86e23448f62f7576219065
 EBUILD ttf2pk2-2.0_p20160523.ebuild 1251 BLAKE2B eb840feed846e552a3202b42db5872d26c19949be4444ec538470e02ce1da85a2a3e2f3cd03e0d1e81f0282978cb86b3282310ca8865b576c6be4eadb393e0b9 SHA512 aa1cfe98ed451aaa6066e4815698113ea0e925b4361eb50ebb51935089f26ac438e511eb06d74dc7c7737981422718a4e4fe67b5aaa839594d617f0c488296d8
-EBUILD ttf2pk2-2.0_p20170524.ebuild 1266 BLAKE2B 4ff6e6b5b773c709ed7484d3b2de205851cb333cc5236b72a19e07dc655bb8799f93dc5ca2db2fa3621092915545c2417a4eb93843096f163e5bd4a3255fae22 SHA512 0c17973b15b3116d628d1a300529f2926a98899454be50ff121687dbcbc3c6882178a25d7d9a7acb236f2dc29a63a445234d75e59b7d043c2a43abb661182dd1
+EBUILD ttf2pk2-2.0_p20170524.ebuild 1262 BLAKE2B f251a6322c8034bc4a7f21b4ffde48762c3855ad28dbe0b6e328e38a18429765bdbb1c9f634d0134af349e459544175adc77a735ae5e37e27fd34cf45b4b9bdd SHA512 25c424aa260ec67e1d95a7efd2559213ae1cb8f9edafae49ceb739c7e622ccb6145a1c978a00bb29276c6ea400753e8232b3c31309d63b33e7655fe61188e54d
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
index e3390d39c086..842a2f9e8d90 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.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=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest
index d4cedd8697d3..00ba2b07edee 100644
--- a/app-text/xindy/Manifest
+++ b/app-text/xindy/Manifest
@@ -3,5 +3,5 @@ AUX xindy-2.4-locale.patch 679 BLAKE2B b67f436e0aa67b8474336bfa1f70f6da52199871b
 AUX xindy-2.4-nogrep.patch 431 BLAKE2B 97543e7eeff2cb4c23c8b9cc0d5673fca2c3f682553a8a3d25bc39253a371320a2a423fef63294be32f5c36b5bac30717766b3a9a4c75663535ce0a6bd8e13bc SHA512 fdcc109b89a6e56c86624f348ebe1c98f574b9f788e3f307e3b110fc2b93643af087e16711b3f0bc6604dbdcfae06080693e4976d8ebec5816e68fb73f89fa6c
 AUX xindy-2.4-perl5.26.patch 337 BLAKE2B c869adcd80cc93bbfe46a385effab94a920f3fb76441c653ea269962071ad5f9269961caebd13d6fce38f3f4dea485291b510db6e884aefc5edbd22cf4b9bd4a SHA512 3f3abc9654e3c7c9de12a542241e107d80046bc26d0eed336e046835a221ea190d526b37c85f91b722e6cac89f140e38b0cebaf208a2391d8d7a42a2ca4b8459
 DIST xindy-2.4.tar.gz 498024 BLAKE2B 67cc7f96e4937e8130c66449226d581f121e7b06a82bde40f3f880e48e48e49805856e39c7670a34080731168ee7386beffe52fa6c3e8142a3d66f4c7ebb8ce3 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4
-EBUILD xindy-2.4-r1.ebuild 1002 BLAKE2B e2b1887ee564815620afe80d0dd7f808a6fce163e1c8f7455df693c0be9db93795d42f09814a620317965965bec7338fee1a76fd00a4e328d2d57f326317b078 SHA512 b7976ed3df8bde1f81e4a7af174ca6a7022759886c00a9fdaba36f2ebe03c0d1f234ed17438810169e06e4fc7b60a7be7018b11bb513f72b518c0ccece1d72f8
+EBUILD xindy-2.4-r1.ebuild 1001 BLAKE2B ab261500f7a94ab8c5986fa8552554af11c4ab47598e2c08b0e6ee52f1d6c4201f480579ee079fee0dddc373c827c6cf7a42a3a35af6b3ae7772a9d39f008b31 SHA512 99b6fda7294d8291f6ffe1c6d8335f96572f9b715530421c89091dbc26d3302324df7cfbfd35c541e18f4a0aa79609f296ce67413f5a4831af3fe954968acb86
 MISC metadata.xml 1118 BLAKE2B 1bb41c8208737b0ad0d3545143cedd0b70aa2cdf632905f1572ca2c2aaa2eb35e712eb5971b4e4bd8a66a3130ebc1f21c8d6ad194056fe5a1c15c522e1d57219 SHA512 ef09dceddfc91214cf575c58f9ffa8f82ec10bfa7274caec809a00c83b9a07668139eca7e420e04c5fe38bbca9084bfcb6fafd10bc91092138726dfa1dc4cced
diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
index a418beffd96f..fbfb484e1482 100644
--- a/app-text/xindy/xindy-2.4-r1.ebuild
+++ b/app-text/xindy/xindy-2.4-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A Flexible Indexing System"
 HOMEPAGE="http://www.xindy.org/ https://github.com/jschrod/xindy.ctan"
 SRC_URI="http://www.xindy.org/${P}.tar.gz"
 
-# The latest development is now on the TeXlive SVN. 
+# The latest development is now on the TeXlive SVN.
 # The author jschrod backports it from time to time to his github repo.
 
 LICENSE="GPL-2"
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 4d8477e3b430..b430c211d145 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,3 +1,3 @@
 DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
-EBUILD xmldiff-0.6.10-r1.ebuild 552 BLAKE2B 9041561990fe787f451eb01b3453b2d66b5034761fb07047afed23cb8e364877932e87c9bec8ed08b92745236d2759566e0202fb0853e5e459587bb2dfb7f8d6 SHA512 06f293122efe66a65981201cc886772bcbb9b5ac4b4ee477a6af1444625636c5f23b0b33a9c963896d1a6dfed960a611ec59522f088b8c08fa2874a887051619
+EBUILD xmldiff-0.6.10-r1.ebuild 553 BLAKE2B 04eabcc7d063641632d6b451fe632c74c6fc20f0f7f764fbb792a7e71301d2c7f7d61283e886d23b8b5ea527fde3b88865c68a6e708002fa316d19bd113b4a1a SHA512 cbf5af5d5c2c1a06190bf28d19ba77fea6d9f44673bdc89296dbe667949e2a95c42e5923a7205464c986526fd5369ec0115a7d02fdba05e3cac5b3c34db83721
 MISC metadata.xml 575 BLAKE2B a4b096b5e7322a3b44bd67a360f32ea6042ad59e6f90c93d33fe468550e2bbe23d3d449e633c4f1ab8133333b689341d374196784d4bb9f4a6bc2b20030002ae SHA512 6bc0a3df2b2c0c34df37d6b5985fcf4fba8577560edbebfc4d87ce0e66b8bba4d44eb6df72ed22c70d84b1ead2c975f567ec45f6bc01128cbd5c62cc7ec0fd4e
diff --git a/app-text/xmldiff/xmldiff-0.6.10-r1.ebuild b/app-text/xmldiff/xmldiff-0.6.10-r1.ebuild
index 5dc8a0594f3b..258bcb5872b9 100644
--- a/app-text/xmldiff/xmldiff-0.6.10-r1.ebuild
+++ b/app-text/xmldiff/xmldiff-0.6.10-r1.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=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A tool that figures out the differences between two similar XML files"
-HOMEPAGE="http://www.logilab.org/project/xmldiff"
+HOMEPAGE="https://www.logilab.org/project/xmldiff"
 SRC_URI="ftp://ftp.logilab.fr/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index aa2d113f4fbe..a31e2acfdd50 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-cb-0.1.6.tar.gz 7205 BLAKE2B 57fa7c8d54cdfdd717d89b8341139c70c86921a65b328a59f1e382d4c8ea03c041184f065e092ec98fff577c029363430b32db95a3b034cbeb19eb51b07d3948 SHA512 986293957b6bc5e5fe7033bb7c91e857b1089fe1a041eb39e516b4e906c2619d22d7ebfa0bfaba982cc6145cba4c6a2af01be810c6da71f4c862fb42bc91f230
 DIST zathura-cb-0.1.7.tar.gz 6971 BLAKE2B 814b0ff8e3d33c85e06ceb3abb315aa16464efda8a5c60554eb7ac8ce3babcf33daea5122e1ca201c1fbffb616a1eea79ba40b74e0c325ec23a7c2dd249d2e6f SHA512 a48c70bf534a8798d94c1b15382dad229d37ea5f5cbef8382ce87a4366c3607609577f10a8eeb2056e2aa539014e6411e08c879f5359f80ff676cb55c6ae9af2
-EBUILD zathura-cb-0.1.6.ebuild 1167 BLAKE2B 7fd39375ad96f761bd5122bfafb12c1c4510f914759540b71bc6bbe5f8932b3204ad63ef44749982568bba07478fe47bad309e97b16e18e7cb902457366b34bb SHA512 d6066874e0b39ef1fbeed2b41a3c8e6c9954ccef71d5fa60c7ccb4c25cbfbdff3629b1dad4b406304d5f176ffb0fcd37a85eb1f5261ef89d5e6509076de980aa
-EBUILD zathura-cb-0.1.7.ebuild 1191 BLAKE2B 664244593b5f2a69b4316fa8bbfc302f164121d41d1f67422a593d695136fb604437250f5f2c6a70a0c29bfcc1caef052ce2ae4bcbef3436c7880b9cb2d2ad57 SHA512 ed96d22acda27f5afbeca6a05a7fe215ee27fa7af092c1b5e5941bc2997d1b32d2347a96baf1833a1abf49df824c019a417109ae762da2e8a2f168911935eba9
-EBUILD zathura-cb-9999.ebuild 1192 BLAKE2B 53243b7172662190ae962416538b62d70484e6c3bb27223b2b4261dc74d2d58473e15431f9d17cea0798ec5fe6c6f62d6507ba24fc448c3cb02e4d9be71008f8 SHA512 491b07c8560671e5fb9d291878e9300cab7512e921e82fc3fdd11b6ef4f11e62c8f28f65279e6bcd138d5a79ecf3e014c13b043aeabe7913d18b751074de3310
+EBUILD zathura-cb-0.1.6.ebuild 1169 BLAKE2B 48bdabc0538c032080e8e25ad9b32e8114a7387ea772453e83382368bbc6b524245f02adc55afb75825cefd11108b00d62cfd7e09051ae224f022b961b11acbc SHA512 00d8287f33cd414bb78c34a682645e444eb84f59b58cac5ac4d6290f23fdba1c07f5894383747e253ced4cfe5128d28e250394239fcde54901a9ac0f401df6e3
+EBUILD zathura-cb-0.1.7.ebuild 1192 BLAKE2B 40ab3a5b2d465a29f06ae511ed608520a70425e980e19e1ea5cba0b2e5b6863841e3f832680ac054773ef6487b00b27155f0b512a28fe3c847514b6e168426d1 SHA512 db692f30c3688e5dd3999b768edefac58cd1653e46449ac95dc2bf248454d4d997a4a65f40dbc59562ca3c1744e485f73aa373aa22d79d4560d74f3dcca229da
+EBUILD zathura-cb-9999.ebuild 1194 BLAKE2B e45d6a066522374b807e917b6baca20ea91897a1b5cc99a2caccd2e9dedf5853774749a53c9c3009e4de36f2036bd09d14d7cb01cb7bfbb663c2d31f8b4b92eb SHA512 00eeca9e086cf608309fd780cf376cc40c5580de57ad42d79fc77bcc012ad799cb8dfce4530f3069e4a28b196925090b25e3a6882cae4b7ce121900798e63a29
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
index ff2cb89529c1..8422c19f22a2 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.6.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=5
@@ -11,11 +11,11 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="amd64 arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
 DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
index b9024c4ed2df..bb222a057113 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
@@ -10,12 +10,12 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm x86"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
 DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index 4c3f58bbc0cf..f1483517b654 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
 DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index 20da1045784b..51c88c241b46 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-djvu-0.2.6.tar.gz 11137 BLAKE2B 23efc23cd53068abb3e118d6dc9b1e875c3f292d2e7ab49abbf6c599d6241c37959e9f74ac2b0f06838cadca0a07e39e1dda2e188f6861b72d4cd7a4bb1fcc62 SHA512 8534faa0de896ffea8d8d6f2d0c22697f2fd6ae3f73e955f5077e0a0656c13fd8823580f1b89c4b5aebb5189c69642ef690fc9167be178ce9533e9bb5d483dac
 DIST zathura-djvu-0.2.7.tar.gz 10909 BLAKE2B 6a55927aa99ec5d29b8f24922c4871c050c25f6c166ee3435390488deefd13f1f81f4286a0c3cd348e4f550e1b4082b9a7c5c7cce40371f8fb62074c87a2d372 SHA512 f0a33f53caced4cb90354e431d180a3b357db300ba5a376051e45f5409e8476105640e92768c2a31bdbbb0b37dea05df24a6489799c556e30336013f807b28b6
 EBUILD zathura-djvu-0.2.6.ebuild 869 BLAKE2B e808ea94258c503b48549c6dd56c1f037454ef06721b3c703ee20665dd14560765d02e0f838a3d79cce7f642c0b2fedb9bb11b848ce346fb2af1f685b4dfb377 SHA512 dabaa16d72e7281c7ed9cf8deda8fb011401127f671738bcbc1f9c370bd16147acfe716c01a5e1011be19f4bda718eda25800cdc7728f52c6ea475febcde2ce0
-EBUILD zathura-djvu-0.2.7.ebuild 875 BLAKE2B 75c4a5fd3665d0befd66abba823aef857ebfba3427ff611efc7c2cf9af5f099332aca03b1bc8115efdcb9683f81d33b8c4a80f50e5c5384cc36c537670ada5fc SHA512 eb7a2e662e6f4b285e213938cc590c18af356e925ed6a3ba47c843a0ed2c316daccae8e57ee18995a6a461e37d7af83fdc0183993f6a8c4bc0ffbc46d4ba9b01
+EBUILD zathura-djvu-0.2.7.ebuild 874 BLAKE2B 50f207c61625f4f2e5569ad5f961fd3dd6643e639c243cb100e027e44e92a3adbccbd5489d085eec4edbfada291ef5a1cbe4ebbd9bcf32339903bd91c9285e11 SHA512 f1c0d7acbb3b39b044ab87a27a7ebe76912ed55cb87f7ade7d19926a4e32cea6009896e86a6348bcd527757292ca0aab70dc173dbdccb51d057711a8b1f2ffd3
 EBUILD zathura-djvu-9999.ebuild 876 BLAKE2B c0332a2c39389801dc8bbcfe42ed6aab193f23eccb43a29fce315c025f787cb47d3ee7945e2798b5b4407f5a63355a4c810e317a2b5c9826d3403bf660cce38b SHA512 e317ca99924d3e1c8a59e2f95ff91cb348b6e4dc310399f646d90b720c97e633f504508b63193fad90a7f9ec1c475253174ca4b9966b2b14ff7d6c9bcc58bed5
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
index 9d88eeddb79e..67cdfe31ae92 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-meta/Manifest b/app-text/zathura-meta/Manifest
index cb4e893eb7f1..ea587ec5c89b 100644
--- a/app-text/zathura-meta/Manifest
+++ b/app-text/zathura-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD zathura-meta-0.ebuild 517 BLAKE2B 08648aba10cfbb7620f6ef45fe4bca431989aeffb4e0715c68184b8a201642953026f76eed81ac4fa403085e229ea63c6ee19ca31eec591c45d22568a4a9f8e6 SHA512 d1a8b526de0b03ea0385788ec635c953c8d33c7556e67937dfff77e01c2dc2882087e1b45dd6ed84fcf22420189c3d611182e9c661f532cb21b4a3f0494cec53
+EBUILD zathura-meta-0.ebuild 518 BLAKE2B 08078da4df7db22f94b56a25525b454f08a35851bd3e7783fe3e2508371f3846d90b533bea45c1f2413e996e5c3ef88234ecf81c446bc9820512e225afdbec27 SHA512 5262dac8ffc3c9ab4e58b8d131a539ac53759cb8beddf1818a58d61dfc225f56ce3d76304cfa5d669fed018515948c2f98a767de04b1db351f6d64e56d79102e
 MISC metadata.xml 784 BLAKE2B 1828dcb5847efbdff5b7cad10ba17fc6561debe2c8f860863ed158c918dc74fe7851ef21a9dd08c06cd62c4322aaee30b3f1e496d0fcc60a2fd85bc64e20b867 SHA512 862a83f9aef1dd793f72015ec94a778582639c421446775316ae8f7c22a627cce2e09bef70049252617340ee1ff71704a95ea1a78547aec65af1ca8dbe9fde45
diff --git a/app-text/zathura-meta/zathura-meta-0.ebuild b/app-text/zathura-meta/zathura-meta-0.ebuild
index 65a860795df3..7c733b9625ff 100644
--- a/app-text/zathura-meta/zathura-meta-0.ebuild
+++ b/app-text/zathura-meta/zathura-meta-0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Meta package for app-text/zathura plugins"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 SRC_URI=""
 
 LICENSE="metapackage"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index cc6912248125..ccf91c29c90d 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.1.tar.gz 9755 BLAKE2B bbacecd503bda14301e1111799bf8fd82aa1488d4db5a28db7c0805b1e1391c038be64a0f4c64be974c2173396f972115ec6300686f34ac9b8b3e7e091d7ae5c SHA512 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d
 DIST zathura-pdf-mupdf-0.3.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
-EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1093 BLAKE2B d394921870e0cd321d0b98648ae1676787393fd3967ad7885d7f8e21b46843b0f488a49c63343bbd4adcc38af46e99d6fcfe189754fdbefdd3dc7d6fdfc77fbb SHA512 7e4d97e84f2ed0feca1d0778199e731aa205606d3c573816841ed0f53fd14b8642280de00ab1830d5d066c16773b71e8484c9d92cb04412191fd0ef55ef3c634
-EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1074 BLAKE2B f138c6a355e429392c6c63ad1bd4b81564eb9f1bd0692e3d59d521c8bdf22d2e4a6803940342bcd9c4da8301855424f18aa20eba2f276042da196dbd93e903f5 SHA512 eac62abe4919cf6b43b6690adaad5fb2dc56c6730d5b2d2e2d31aef31ed0ea554fc03a0b16e07ead116ada32ed09dcb63d8ab9181f4d397f7a49f680cbebd952
-EBUILD zathura-pdf-mupdf-9999.ebuild 1075 BLAKE2B 57f54296611fdab7fc827ba64a5529919d532e7e89fd6210b5547e02633c55ab6ba75edc2c6efd8d47c9684c37f020cbcccdd71cfe7b3ba2ecf318109880da06 SHA512 231cd7f38a3b2d6e86ee9e3749d85ea17d50dd1f31c9ff5247079ecd7b0ccb5fd2184794849f3edbb5e4fe5ae06fbbc4544345179f04f10f179f00007fe454b9
+EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1095 BLAKE2B 1c8506329cb6b56e46f53522990271aeb72afd30b38301cb1443fa8808460af81810713958c6f55f1fd79a635426d89812511b9ac8a5441020cc483a7b068284 SHA512 a8eb48a9029089008b9925d946d909a21802275a23a0e33edf67780c028fd1a7c8432438bc3aaac3b8460d40d0f7df8b9219bd8af5c99c6eb98339510e7c0479
+EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1075 BLAKE2B 1ffa737a7111bb24a314443f6da4e6bc69b2077ea5d1b080b83f0335aa7df897c5c9216c497f533dd3a6e59f243f9267ac88a9b7e348852a7d7c547520fa1adb SHA512 20828e21b1b6255a5c05ac42594ce1b8d6749920cf5490e4a174947734d77b4ea048ef894d5271dfe3900ffdfefa7d5ddc3daf6fb5be1fdc5b3f1853f1c01aa2
+EBUILD zathura-pdf-mupdf-9999.ebuild 1077 BLAKE2B d4f06640c28f86f45c274fdb77dca863742a4685dc47d14d82095a8adbac0c713a00a5c7676d017128926473f7ead99d6fe520682693b3e811da8b55ea49644c SHA512 c1f52c483e368114ee230b920bbe440687d668499b991ad92d85d6a93f677e0671c1561f3f8ca8230f1d84941facee607fd7661225c139a79a8299ab0140749e
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
index 88bff2989670..2d076f7b32cd 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="amd64 arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
index 1b7fde23fa81..cb18bcab1632 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
@@ -10,12 +10,12 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm x86"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 6ff77ca5cd96..8d7a7aa0a007 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 3f72a287e313..3e81a2e72e22 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-poppler-0.2.7.tar.gz 9610 BLAKE2B ed0921545cfa435f47e45db223a469e80485ae3716ff20bb1fd213cd689eb5754935644198289a4fbe44cf30e837093e5f5568f714e66d4a3de11d53adfda5fb SHA512 815ef775059652337ca91ef6a089fa51105bbd3ac649ecd167da7da2a6ac62f617d04e85dbeb311ab47d86929338d8656037bcabc1177435804035914c6dfbdb
 DIST zathura-pdf-poppler-0.2.8.tar.gz 9504 BLAKE2B fc7ac4b4789f23d03b084dd90489c2b6e6fa0a93814140cf563fb826ed5bc7bad2cdcbf100cc6c2e708ecabd85be177c88a4faf9a0fc910bbfcddc1a515a7373 SHA512 644a36e31f89ee87a4d9bd50d5f9e209f06b6755af00009756422c89ad2ab50a97dd2c03a037b4e22bcf04bd620bd5b5ea55db7c380da9d3cebe0d1c00e18b9b
 EBUILD zathura-pdf-poppler-0.2.7.ebuild 854 BLAKE2B 48cd2dbd815496570c0826fb6f265b5b983f203689a5351c3a0a948ed9cd61d3b515940c755a2c297dbe294b6fd8b9cc732970ed2e24d7181d43a3a235a39f41 SHA512 8f1064fd8da384e347980adaf2370ea1e60eab857e50038ca16718768ccab732cfb95d5aef1fe1fcc53758e5ac872c3d0d787eae14bbbd76670e9679223f6396
-EBUILD zathura-pdf-poppler-0.2.8.ebuild 860 BLAKE2B 60bb8cc8f9d78dd4391f17e18835e3e4017d95defa01c786d58a44357197eed5168cc31baaacc5f7cd62cec729c9737a9db446343c69469a3b8c3bf67161d746 SHA512 51d322220e71b566efb5937431b3a796433b7a13288bd05589c65cfe4f6ea5ab6d3b961e9828798d60ef207424c9eac9d52a58c2ba86fc6a61d8cc306eec7c53
+EBUILD zathura-pdf-poppler-0.2.8.ebuild 859 BLAKE2B 39684772f5ef3b03275019594f4991c76c1aebf76ac1e48f5e540406497bb9b29cd142e225b1b442cdf9f5b75dd34e6cd23d5b612c73a4dd6945aa4a0c2f2ac9 SHA512 c5f26fba2fa2077b14a53bb7e1d46ab8c228cce3f0d06676b673d4a09acac7dee77e524eeaf7b63c6a3882290c9a906d5aab4c8a199dc294acc91ccd7d65ef66
 EBUILD zathura-pdf-poppler-9999.ebuild 861 BLAKE2B 5237bbfc9f3202dd7178a2a37abaaac0d67af71344823969175d7b677387ab1040d6a1fbd83d6927aee6faa95f9e2e36b4fb1bc5a348bf007ebbbbf0b363c8dc SHA512 e451c62dd3fae3610b36b0511bcdf760d70cb27b56fe2c75b57151fd9fab7c714e83ba511c3f2e622e0d8467d4c3c4d40593eb882cbfba69712af7e140104e0f
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
index dc47bab8a3dd..7ad3b3bea727 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index 7cc0e3619f99..1d66205b0bbc 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-ps-0.2.4.tar.gz 5980 BLAKE2B ee60ebeea519eb618081816d0f0109cd5c327f5a4676e9260ec5b0d6c309368fe611a3bcb8dbefd7bd9661207630529311eebb1f54f4814eebf18378b640825e SHA512 c63cbd4ff032cffa85305393a8e7f2864986e3a8204832cd7f9f12878e2c69fd0393ace91dd7b0fa8829f3a785abc2675d2ecb99dfa71794d699b567be954922
 DIST zathura-ps-0.2.5.tar.gz 5845 BLAKE2B b716381b66f54626298544fab6ef6f857066db50b027e1b729cfa59e33a23fda4cab09ba8dc33317725058b6942ef84fbc7c24aa30a4d7db2c73f7ac1b6ef137 SHA512 043898fdca56bee28a8e2af61d3216af25e222c0a137737e599881bb21e805dd8a609ff2901a50763bdbb34bf2e3fca2afaf1a59b715f3ba6aa067971c99c258
-EBUILD zathura-ps-0.2.4.ebuild 925 BLAKE2B 31353e93c1a751fbf93588c6ea2f21a9cc5e2fe6ecae2eb10e139f06995e46c2ea2db8158d920605feb66203ac60feb36a47a6c1be5f277edc26e34889913f88 SHA512 151440b644811a83dffde220fed9c9bff52d240b1a13b9ee4cada8557aee0f48c115522ee55be31d2e48634257aa162efe95126cb8f523754a20aa81829f2ab2
-EBUILD zathura-ps-0.2.5.ebuild 931 BLAKE2B a44570c91c47e4ef755c0e91685142b5b4f45201a03d62c3506683ec3f83c537dfb8b1672441fc8d21fca8bbcc3ada6762b822f6f70ec7857fb7a3f51dbb4fac SHA512 0d4b693cb8e9ee7616e09270fe817bafb9bef4a2d8944e164873388bd90507d432c647c72d611b9c067ea596b839ece20906400f8fb1faf543ad70495b8d99f3
-EBUILD zathura-ps-9999.ebuild 932 BLAKE2B 79704ad9cde6720ae7f452869d46411ff59b10658d45ed0521f386b2570726d3e9399878c02699c668bc1628ec7178c56fc8676f17c424561109f1fd110cd30c SHA512 28de9c176c9d8ee111c3ff1311782af1cbdf720a2ea9e502882f48a17b61852a61e80a0f6a8a56404db60c1b3f0e523c2008c43cbe06c41166e0cb4797267081
+EBUILD zathura-ps-0.2.4.ebuild 927 BLAKE2B 28da921678d723a5a7039f80458e38b81e156ee9f1d6c2e472c70b69a66ea247e0e15b29f5218011f7585fa37a066223a6d3fe819063d244252bedc5dc1abd28 SHA512 ba7fbe161e87d476ed6413c44bc63d72ffe1ad79b5f555e9b01db19e7a06a772809b842ccd9e83e1ae98eede115cf9bcd97af005151510d2f2758f186841c837
+EBUILD zathura-ps-0.2.5.ebuild 932 BLAKE2B 1323526a3d9fbacd60af911d3d4d12069bcf8da3f2bd9d231bcb12d529dd9734b709b454c464c5f9554414c9276daf4cc260d86863faeca1553e1da25c13856a SHA512 ff560eb37bfcd9ccc371929490124afd499bb418ee9f5372256b517ada51eebde958d270d0875d078474d8b53619f8fe40b00d837197060cf6636cd7924b4eec
+EBUILD zathura-ps-9999.ebuild 934 BLAKE2B 3df19a2ebc4af3b76a3006cad4b381b2a8ac35c29c4c857f423d3a66a2be5870b9ff4aa4f53008dd8fef0b1ed39329dbc8d783444c5b142ebe1fffdc77caa697 SHA512 f4105099eef1796eb4d302c1ba0f76a1d6008464810da8c5bf59e0ef5076901a0dbe1f07dda5da8a52a6e723b8e34e0f3ff37ce4607fe16f98915a93664135d6
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-ps/zathura-ps-0.2.4.ebuild b/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
index 222e0fbcc204..f05771182caf 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.4.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=5
@@ -11,11 +11,11 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
 DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
index f2ad6c0c7ee2..0b688fc4614e 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
@@ -10,12 +10,12 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
 DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 62562632f284..305bfa827e75 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
 DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index aeef4e60bd52..90bdc0538168 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -2,6 +2,6 @@ AUX zathura-0.3.7-tests.patch 702 BLAKE2B 86ff60915631ab060eec0dbcf389157a1b6b86
 DIST zathura-0.3.7.tar.gz 174095 BLAKE2B f0025b75b319dbfa397362e102318f1dc1b5dd41f8beb1380cd781fd7594d15234781d862bf20b59ad4bcb9d1aa67210aa10779c19273e81341bfb74962f3139 SHA512 830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533
 DIST zathura-0.3.8.tar.gz 174962 BLAKE2B 44d91564ee42cea80357230c789160e37774d5ae29f8de8bac1fbf734a28e7b862d58d807fe3fa01d323d0baaf88a3960243f8022893c3ad40b67ba8d8a1ae6d SHA512 bad10eaf6642885f96850a01921dc1580357144d8b9b27e88e7765e6fc8e7d8f8c94c240904469e1e6b22114be5117a28a24c87183476d2c89d93f27a5083109
 EBUILD zathura-0.3.7.ebuild 1481 BLAKE2B fb038b60a8a130a760f486dfaaf9051929bed9e6bc5defa99e89db283df286bd1e85ea71e5d88a97350e687125921c6884c0b0e7bf8ba56c3df98fa75158df36 SHA512 0927fdbf3d1a26580505cbdc31d97ffd056d8eb16a14e116673564ccc33fe78604a1913e48e29f4df24f66df07195489a3dd6fbad38764e96a98347261769d73
-EBUILD zathura-0.3.8.ebuild 1416 BLAKE2B 16f64a691ac1b936738f3e72471faace598d12dcf29ad34be1c1f7cefac3dd01542f397a932c2d124e521e5b2abec283662616eed50e7a2694b3e3517735ffee SHA512 026f48a970cb62caf2db2908cf7e42ea53e251146d568b8c944162876ada99ea600ac5a059157ce3c191a75ec26ca88bdef11f2817f0e624dc9a30c689cb04e2
+EBUILD zathura-0.3.8.ebuild 1415 BLAKE2B 6972a811ea161d0004e89abafb330cb75ee900e02d4420ca0b31cd048f6ad9982676d1d1fe757c35dbbed2ef3c65b6e3a2090fd87278d0a060b909f97512ad54 SHA512 4779dfe9077ac2aa51815fb99026a88a877a5e3333732cfbbe07f8d926c6cfdd9c5fbc5f45854559308db56869c7e53e65a5f10b706b626d936315f14b3f16f3
 EBUILD zathura-9999.ebuild 1412 BLAKE2B 5f304234d4918670a7a4750a18e823998e464f1e853bd2a426d9bb683799b2d10a8c91aa1c72b8d6e0070573e45c639291f847cd0564f3977860ddf3e04f8e7c SHA512 f3d639e1dbf2cd2d4c998ae69ef6518c50ec1ba8d6944796cc4394d77e4974c2726529f9b019ce54816264921ec88a148ec0f23241fb729e5c0d58fb25bfd15e
 MISC metadata.xml 823 BLAKE2B 745fba701ca26b7b430c8b55393ef77dae3175068b0afebcd6e2b3a9ac90823e542734464e4c1852e1306963c06663d13a507b6dc4967b54cdcc12c117046f81 SHA512 4bf7d56010d989c286976ece526874abbeb90449d940d4ff550f5c084ded0e028998c7b021fc2e3015ebf202d43a5d35fa9b4e8083d6eeadfb9c2915cbbeaa87
diff --git a/app-text/zathura/zathura-0.3.8.ebuild b/app-text/zathura/zathura-0.3.8.ebuild
index 3f8b8b3761a3..ea705b8b5a89 100644
--- a/app-text/zathura/zathura-0.3.8.ebuild
+++ b/app-text/zathura/zathura-0.3.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-16 16:47:37 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-16 16:47:37 +0100
commit	8aebb228036d5e2863b7eaa6e319ab41c1669269 (patch)
tree	00f4b90ce32462dc8e99ae54a31d6462ea2c3ac6 /app-text
parent	76cba73c47c8694e74377004634daca18f2d9c08 (diff)