gentoo resync : 13.03.2018

41 files changed, 61 insertions, 129 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3f7f7100af01..dc1906c50f59 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index 3d8817abd8fe..14890eef7c82 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -2,6 +2,6 @@ AUX apvlv-0.1.5-cflags.patch 702 BLAKE2B f6679326fdf3263e5a304f11bb1b6d047fd5604
 AUX apvlv-0.1.5-gcc6.patch 403 BLAKE2B d593c72ef63ddc22a76fe8b93ad12078b1739f359832dee54f3ff4f5fbf7fa4249457ac74921b8fd9734eafdae2088321703df0b3bf56a89a1c33b96a15908b8 SHA512 f838fe6c601765e7d03ba83575aa5ffa2562d90e257832109ebe879b29d67228784c920ff7c9716010f10d2c36f4e873bc2425fc337857c437c6a19e6bd5e5f5
 AUX apvlv-0.1.5-gcc7.patch 685 BLAKE2B 3ece21cc1bfb5bbf66d10fb67abb140a357c6953655ca1b02b37cbc3d09503b5382694fb20337b2a7e50fc0a7ab51657f1a3091060bf03e8666b2bdbd0b8a8dc SHA512 53102dfea587fd946bdd7300fdb60b8395d6b2436aef6fe67be539e4ac88063f9d7934282227316f456951aa1e0748db7db02ddda06e17056d32ea6b91588afb
 DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
-EBUILD apvlv-0.1.5-r1.ebuild 1226 BLAKE2B 9bc5423337cb7b84e2a8f87cdc5240f86023330f9e098b5e117b89122cba4602a8193ec7dcf7fa5a78e1935493206553e8882f1eb3625d0ed5203552f6f49a12 SHA512 0d362abfd0e4e56ccd51e3945392081d35533913cddcfca9aa2556d57041e072b36b7225e54c5093a955e54e7203b20af5149eccb8d8cd34febcb1349d1e0491
-EBUILD apvlv-0.1.5-r2.ebuild 1266 BLAKE2B 552962be3c42e4017881e4ddb84775d03c68c2445333297e2ef7c1d2bd22cbfcef2af5082d0505110c0b5754e0871f0ef91426ced4f0b07c1206e486adb34cf5 SHA512 3438ef1f949c1b09c8ffaeb62c00f265e73330ae4012cb5ec479e2fad4b2c424b573bfec2388b559ec018793071de0bd0bbb0f6102a053bd1423c8c93411e56a
+EBUILD apvlv-0.1.5-r1.ebuild 1224 BLAKE2B 829d549f339a63ed73b519b29755fedb0e1449fb8332527a7b02a7db42d9fae5e5d6a05892dce1284fc01e54b44c9af644683564283ca01f9a0b5f51088964cc SHA512 76dc918f3b95ff7290bca165c690cb018ede8b17ebed1f337df3ba2bbc0d19a2a46f16440d8a04d0331b1437c9bd012ae76c52a00534c9bc8a298ea4009b3124
+EBUILD apvlv-0.1.5-r2.ebuild 1264 BLAKE2B 2d83f0be6b2a76c623d7bf2824ba98bcf5525ce317a5971e97acc74395b7dd4d8b83c222cc811a6207da4dc9ddb9841899d2a83247ace0d84e54b1bb2c3bf748 SHA512 a97a5c866deefe6e8d9e0eface5391a3458c535bc0fb29eb79b56f589c06bd36ba53c691ad3c3d64953c2d7158492d4953c65e8e531837add510bfd2f3fad08b
 MISC metadata.xml 304 BLAKE2B bd4def156407f7aa104c4bb45814ecc48caa571fef3b68961e831c0c1997324c8f0773beb78da896ee23e14f8e82634a20696bf2b2fd201fc5d87037e995fa5a SHA512 0d01027269ed441b2c29ae9ae560e16eca4a6aed7ed7d0e418887c538673b913988dc3f7c6414982198dfda258044ff7ef3667b8fc53cfd9d4f7773dd5d35030
diff --git a/app-text/apvlv/apvlv-0.1.5-r1.ebuild b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
index 2b1eafbedf1c..22f455810c41 100644
--- a/app-text/apvlv/apvlv-0.1.5-r1.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-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
@@ -14,7 +14,7 @@ KEYWORDS="amd64 x86"
 IUSE="debug djvu"
 
 RDEPEND="
-	>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)]
+	>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
 	dev-libs/glib:2
 	x11-libs/gtk+:3
 	djvu? ( app-text/djvu:= )
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
index ba041b48bf20..2b8f04dccb92 100644
--- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-r2.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
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug djvu"
 
 RDEPEND="
-	>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)]
+	>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
 	dev-libs/glib:2
 	x11-libs/gtk+:3
 	djvu? ( app-text/djvu:= )
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index b5ed05028262..7a8f585db2dd 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -3,8 +3,8 @@ DIST atril-1.12.2.tar.xz 1663920 BLAKE2B 7fa615a3d19fe33b086676d2326d690b5d6c694
 DIST atril-1.14.2.tar.xz 1703272 BLAKE2B e02fee02ad8644be9ea2c388f24c9f9e3480a68ae86bba41939e4fa195626189f9e6d93b97ea4b9d4a256f72ffc3d604f69fe4222c00a385f9d4ad9ac3a8e337 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b
 DIST atril-1.16.1.tar.xz 1691456 BLAKE2B 5fccac614c64e7241ce0369842e97379c98df00f12d61524291afea22eebf18777ec2550592d734ff38aa64b92cbfa6350d11823a043337c6a7ee4b52757989f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe
 DIST atril-1.18.3.tar.xz 1695960 BLAKE2B 2479ddd46104153631d34070054e9ba72956468c7b720aa5dc3c4a458a00cc00484cdfefb01981f2e8beeb7a13f1fc3db940dcc9a728863a1378b5b896e71e57 SHA512 d57cf4386651cb871455b003482e896a2735fb023e0b11f192ed1d169e364306f9ba55ef163df02ffd236b5f86d6afe2c1068d00d3fbc309807ded729ce2355a
-EBUILD atril-1.12.2-r5.ebuild 2385 BLAKE2B f4eedbee9c5c14d57c508d0a6b20d38b4f57117f0db851f2118f88cb20ec2fe74429e270d3ba8872e13f887902acb1febf3a79893c32c92a89124aec7f373847 SHA512 dabe0ec4e02bce40da523298ceaae37181e02c927bf486cdd4e1a799797ad5ab5294ae2272c4bb14f8916b3863eebf22dc37594ac89d180f3210dd3224b1f045
-EBUILD atril-1.14.2-r2.ebuild 2427 BLAKE2B c8197693e593f8ca6db629066b9ad97bde2196e82ef9fecc4dbd957439e69f8fdd403527cd41216166da189eceded8353206f5bca951763eb11cf30e415308cf SHA512 8e9f42cf971654f0ed33b47d7810d7f2f0abe58f6c8272229ff3833075c35c79c38e61f5e7d89d45424d8ddc8a8cc8454d7be6178e25c582ee3d7fc446611a07
-EBUILD atril-1.16.1-r2.ebuild 2364 BLAKE2B 3886d97b14d48097cd60d01062114741a120eeade55330faa0b310bd18a5a260947c98ef9fa583146a0d8b905c34540badf7cb33b346ad36d26dfa6bb5561f08 SHA512 4d6d8e1667d468a5e16e9d496ea16fdc1bcc7ae08b6471f563d3bdf9dafe15820d97c1397dd93a64ba5fac169d8fe8eb4fe6e74de188ff28ee2eeae83530dfc4
-EBUILD atril-1.18.3.ebuild 2169 BLAKE2B 3caa9aaca3f81ab3d1bf63459d73b8da16eafd9378c99665e916afb6e098dd34c1aa25d9f32887b7c5e03d2e4a534c2b3817aef3a515b15395a4b4f7cf7ba2a0 SHA512 c80982fd6d539c26272556b7a08e46ec628ecc42772caf1f080da844a26fc66f20fa569b214e656791f1cd2b0bdd34dc80b86352a510c22087d5eb1e6cc3b655
+EBUILD atril-1.12.2-r5.ebuild 2382 BLAKE2B ec25ced8e7a2cd8a016a610f25934f6a7d3d51331837b9080698290a2a5d1efcc121c5bc4b5c250e497e6c445801ad83b8acfdadf05b0446bc46745a7682c9da SHA512 c5ba364d84fc7eaca092b67abeba1ba7b1fba69c2eba9b25c222d2bd90eb340e45013186ff7d1049fc80d0b073ed17cc7a28a019112cbdb82b5eaade6f2281eb
+EBUILD atril-1.14.2-r2.ebuild 2424 BLAKE2B 08574d5d036b9d82b488eb2eb22b51c45589966b66a1ea098ddbe6549f9aff4502b54e9fa16ed286409ba36a7d06a7db5c5bdce3a6cafb2f309e59dd1cd1eda5 SHA512 08a36e6834962d26061983ec642e1ef6b2ed5ef6b2acf581d760cd3bc7d4ef1b77e6b04242c030bf5c0431b48abaad0ae252f41996d1bbe6c418354bbdf545bd
+EBUILD atril-1.16.1-r2.ebuild 2361 BLAKE2B 976f440938df2ccbc05556b1ff48113467c6e37cd9ffe807b5c57d63bf9fe89de764862516856a08b040667fdbb1239961bea0cc343644e283919846e915d171 SHA512 b12c4cd1992f30ce6a33df8e0bb063afa3ebdc292ff9226fa63adae17642beb1a7f7ce1437238c745c0faab79d0b761d29251df4a022c68854d39962c321df0c
+EBUILD atril-1.18.3.ebuild 2166 BLAKE2B 317b5a70b879cef4660947239602677c1667140775381b94e16b76074cd675cd29e7f4af3ecd3521083f3d3163fd18dddac3863275b1252e8983d5d82ba29e27 SHA512 6c49d6f01717382a81807ad5b2bbb5c56a0b162492166c3a781051efaeb6ee1205fa448daaddc6ac71744d65c95d25e143ee972c177883c3fef39fdfa54dcee9
 MISC metadata.xml 843 BLAKE2B 85c02a872255c9b51727285c86f1f5df7c8b841576557ba7bbc240cc3e549ddf1f681e1c9f416785650d7d9e3168e4db06ca52ce61e50a47fe6660a73e97dc92 SHA512 9248d2446621337488268f0c7f839821383bba8d170620376cb95b96868448fc3bc411e336104f59db0d8bb5d304dc1c0b76ef818686b930c93a04764e9f4fdc
diff --git a/app-text/atril/atril-1.12.2-r5.ebuild b/app-text/atril/atril-1.12.2-r5.ebuild
index 360dac80db22..582095d7761e 100644
--- a/app-text/atril/atril-1.12.2-r5.ebuild
+++ b/app-text/atril/atril-1.12.2-r5.ebuild
@@ -20,7 +20,7 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscrip
 REQUIRED_USE="t1lib? ( dvi )
 	!gtk3? ( !epub )" #608604
 
-RDEPEND=">=app-text/poppler-0.16:0=[cairo]
+RDEPEND=">=app-text/poppler-0.16[cairo]
 	app-text/rarian:0
 	dev-libs/atk:0
 	>=dev-libs/glib-2.36:2
diff --git a/app-text/atril/atril-1.14.2-r2.ebuild b/app-text/atril/atril-1.14.2-r2.ebuild
index 792c2c2e6a06..d3ef2efb7e21 100644
--- a/app-text/atril/atril-1.14.2-r2.ebuild
+++ b/app-text/atril/atril-1.14.2-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscrip
 REQUIRED_USE="t1lib? ( dvi )
 	!gtk3? ( !epub )" #608604
 
-COMMON_DEPEND=">=app-text/poppler-0.16:0=[cairo]
+COMMON_DEPEND=">=app-text/poppler-0.16[cairo]
 	dev-libs/atk:0
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.5:2
diff --git a/app-text/atril/atril-1.16.1-r2.ebuild b/app-text/atril/atril-1.16.1-r2.ebuild
index 24aad9d4f3c7..41128c94216b 100644
--- a/app-text/atril/atril-1.16.1-r2.ebuild
+++ b/app-text/atril/atril-1.16.1-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscrip
 REQUIRED_USE="t1lib? ( dvi )
 	!gtk3? ( !epub )" #608604
 
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
+COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
 	dev-libs/atk:0
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.5:2
diff --git a/app-text/atril/atril-1.18.3.ebuild b/app-text/atril/atril-1.18.3.ebuild
index 4769e545a0a9..e4db37226f49 100644
--- a/app-text/atril/atril-1.18.3.ebuild
+++ b/app-text/atril/atril-1.18.3.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
@@ -19,7 +19,7 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1l
 
 REQUIRED_USE="t1lib? ( dvi )"
 
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
+COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
 	dev-libs/atk:0
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/libxml2-2.5:2
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index d17a070873a2..9816d97f5e1d 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
-DIST blogc-0.13.1.tar.xz 315300 BLAKE2B e764854004bc51c2636fd7459018241835908473838e6fd242e09dbbf4e631c66a68af4c566eb6cd096302079323c74e124093989c9d3ed0ea909f7316c4913c SHA512 3fcb7440707a671c3d077cad0bbd3f2b2a09faacc2abaede6ee18f6a7d5d9e315922ae1f281cb5a1742073401882ecce0983be24f70373a4741016a3b8042dbc
-EBUILD blogc-0.13.1.ebuild 1120 BLAKE2B 4d5a2dba5c10f3bd5015842da3f9a24b41ffa71343f783371a9c50aa0c32bc5e96b0becb56364c09d163d0e64246688d45676fb333de9ab8718c5fe8869bb001 SHA512 80e734b9155ac024c78b58e68216d7f591507ca5aa2cd264e69f0b2a71837943c3ec6b7acd00e5d5b4b08a6c64bc370bf926730a8b8ed7ffe8d1ce3ab0865e36
+DIST blogc-0.13.2.tar.xz 315832 BLAKE2B f5a8392318a96bc4356b6df4386cbd2b1037fe5e6ed2a6f4bebbf02221a0775601dd39dc06995e3846e224d3597dd8b7537bc6309f46b63abe1bab37dbc80f8d SHA512 1c5a987e6ac7b1460082f2f50cadee645113134f925e331dd2c8b40f0284cbca855db969aaf624cfff503b8040094168c743f4c0d7832bea6f7a9b0b5d044cee
+EBUILD blogc-0.13.2.ebuild 1120 BLAKE2B 4d5a2dba5c10f3bd5015842da3f9a24b41ffa71343f783371a9c50aa0c32bc5e96b0becb56364c09d163d0e64246688d45676fb333de9ab8718c5fe8869bb001 SHA512 80e734b9155ac024c78b58e68216d7f591507ca5aa2cd264e69f0b2a71837943c3ec6b7acd00e5d5b4b08a6c64bc370bf926730a8b8ed7ffe8d1ce3ab0865e36
 EBUILD blogc-9999.ebuild 1120 BLAKE2B 234392dc7c1e42c3bcd2c3ac4b1a648ee9e4fa6fc486cfcc60ef0af1c0cfb97ea68bc2b2ce3da820bdd88f05ef5993b7dc6589e52137d8d1e7cbce19d9c0a064 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9
 MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
diff --git a/app-text/blogc/blogc-0.13.1.ebuild b/app-text/blogc/blogc-0.13.2.ebuild
index 29595c41810e..29595c41810e 100644
--- a/app-text/blogc/blogc-0.13.1.ebuild
+++ b/app-text/blogc/blogc-0.13.2.ebuild
diff --git a/app-text/diffpdf/Manifest b/app-text/diffpdf/Manifest
index 10492097d14b..0e0683ae124d 100644
--- a/app-text/diffpdf/Manifest
+++ b/app-text/diffpdf/Manifest
@@ -1,5 +1,5 @@
 AUX diffpdf-2.1.3-qt5.patch 6240 BLAKE2B c4f522b41e4b036222f832e194088d2377f5063d35e8eb73714745db7a993d9b38fd9e5111eee69d7f2d86710a45289a8e54d25b8a3217b1ddd2fe53bd59b468 SHA512 96ae465bb5b27ff0b26a7c4686e7656af025669b418b755878627b1baf4b91bf14833e951f80c6510d907419efdb8759dffca3f5b7fb517b5bf20ae1ee6b3406
 AUX diffpdf.desktop 152 BLAKE2B e85754380c3e607d6bfe0f4db875983596f8e562d48b8bb732e26a23f9cb6137d7ec700ac2d0596fa3a13d79b6c527de671f46825646e266cf5579f33a1a1511 SHA512 3568a49e3fdcb2fa47688fce4d818cb01545d854890806e4508f228b18b712cbb5641a6e173927990e81c9086bdb49f5b4ffd870e5f0345f26de1b4e799eb0d7
 DIST diffpdf-2.1.3.tar.gz 91856 BLAKE2B a94b710674508a5b77ca1e18b48e906568b49ecf10ce5f96d425fceb91746922fdf454ee20ec77913cf3d7467e559e59257e7415bf96c44b9c136e1708d4e73f SHA512 137e00f7c1d696b097f271c51fa5f19d471efb85fb3d5381c096c32f1ff824083b1122bbefa758fb9320ac8e0c9c16e6b88c8b6286bd98388d88c45c714a948d
-EBUILD diffpdf-2.1.3-r1.ebuild 801 BLAKE2B 7b1e48d31371bb35da8e84e3cdc2e8d88449e3a772f1f12171bc93e61a936ec49d3ef854d6022b49a295b4b1cb79c5d75e338300e91ba0735e73918c622d67cb SHA512 ed8a68efb77814f627f4ab85d195697814942ab2976e6f415ac3481db967921bd5919515175b0072c4630ff87272d1dda0729bacada1ee05ee03619aaa8ce400
+EBUILD diffpdf-2.1.3-r1.ebuild 799 BLAKE2B 0f846e1e4695c250e9a2db15c2171fdd90c2c958d679c14a2108bf7e3225a04c4211f47117c8609dad94ad9b1968f8d8448eab468ffdeedaa9123d1c65bbf9e0 SHA512 b5aa76dc3e5e6bfd4cfcfecb522b5ccf25ddf7fa221de2c11b4236f94e4285e3bb63c75b500829a59cfffa549fc0d314d9433db75d9434254075aa62ab86f580
 MISC metadata.xml 247 BLAKE2B 317f906045f70ecc77ab85491b683c74618c027d768a499226ea0c46d214b783ff308f6bcb79c1edfaf3c4a01821afd529786bf5ad2cf73e0570aac56177d36e SHA512 4ae39ceedf573357554a383ccfab1d716abb7265c3a1eb407d1dc4bf3b38fc91b5cdeec8ba0bad84efb2595aebb6d115ade1575e12812079e47797b7dcd3fa7a
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
index 1de17d540dfc..38e02ba7bc0d 100644
--- a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
+++ b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	app-text/poppler:=[qt5]
+	app-text/poppler[qt5]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 "
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 1327ab9e8090..8b6ac28da3d5 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,6 +2,5 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 BLAKE2B 9b7832675ae7776e25c2a76
 AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r1.ebuild 1852 BLAKE2B 73578b17213d709948be2b0a519a76bc263fb1e78e1fc012fb50d302e4caf16e20eafbc4bb5d022c92f8dd465f3a968af4dcaf1388ec025594459cb3a07f6137 SHA512 1318b4293582d34a4c91c4e9bd067c40270179448b50f74997bffc86cb08074be24358179c15a5956d525299f2d092a94f348cf219a94e9da8c6ede384b150e0
-EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1917 BLAKE2B aad1d436a5043ebfe98dd14c7b288c9a2bae4d6b5492be98ad948ba5a7191ee518f10ba9830614dcab085a6df583cfe908f3b9fd1b6288d36c74cb2e03b825c4 SHA512 ab21d16979b3fe3120444ae82fd83280658f6aaddde53e482fcbe7b91f7cc8e61a96b6353537d7ddaf6c4766a23197f192e97f5220ae15533d6370a182c30e44
+EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1909 BLAKE2B 75a5d7f4e6c773bd3c2cda8c6879f176df05d9818a3f0e3b3745a4531d42096148b705d80b0c375a67919c5cc0c72badf6f9fae901cc9d8d19a3a5d0a7f914a7 SHA512 3c7960d9d6a12ab50b0e735531b2ff4bdbc15a7a8548fb8b4c6a1e6a2f70a7533a4b65e6e83cb6a15196ef5490d6e763c562ecd7afd84ed599febf4025fdd6a7
 MISC metadata.xml 328 BLAKE2B 03a0d4494de5507fcbddbcaf14fd0da4002abe3ae6c00ec8afd922f0f8034eeb1c3918fa7662da1d3c2016b1ce22980dde08c59d74cbbf3489e6eba3ff434867 SHA512 258243842db06c12a0751afd612ada57c02433da50c419be86dea6ed655b11120e30b8299228bbb81b6efda1574915d69933c4cda8bc9b0ad79c506a6172bb06
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
deleted file mode 100644
index 857265ee97dc..000000000000
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils autotools prefix
-
-MY_PN=${PN/-sgml/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Shell scripts to manage DocBook documents"
-HOMEPAGE="https://sourceware.org/docbook-tools/"
-SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-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 ~x86-macos"
-IUSE="jadetex"
-
-DEPEND=">=dev-lang/perl-5
-	app-text/docbook-dsssl-stylesheets
-	app-text/openjade
-	dev-perl/SGMLSpm
-	~app-text/docbook-xml-simple-dtd-4.1.2.4
-	~app-text/docbook-xml-simple-dtd-1.0
-	app-text/docbook-xml-dtd
-	~app-text/docbook-sgml-dtd-3.0
-	~app-text/docbook-sgml-dtd-3.1
-	~app-text/docbook-sgml-dtd-4.0
-	~app-text/docbook-sgml-dtd-4.1
-	jadetex? ( app-text/jadetex )
-	userland_GNU? ( sys-apps/which )
-	|| (
-		www-client/lynx
-		www-client/links
-		www-client/elinks
-		virtual/w3m )"
-RDEPEND="${DEPEND}"
-
-# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
-# transition to simple-dtd 1.0, <obz@gentoo.org>
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}-elinks.patch
-	epatch "${FILESDIR}"/${P}-grep-2.7.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/${MY_P}-prefix.patch
-		eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
-		eautoreconf
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" \
-		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install || die "Installation failed"
-
-	if ! use jadetex ; then
-		for i in dvi pdf ps ; do
-			rm "${ED}"/usr/bin/docbook2$i || die
-			rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/$i || die
-			rm "${ED}"/usr/share/man/man1/docbook2$i.1 || die
-		done
-	fi
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-}
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
index 1627a0c29dac..71a101d90125 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.g
 
 LICENSE="GPL-2"
 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 ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index d5d3fa049d7f..6a320f706ffd 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,6 +1,6 @@
 DIST libmspub-0.1.2.tar.xz 345556 BLAKE2B a3b47fb188fc859abf54e3375514d31a1fafa21fb57fe0ac4a20013741a223a7011adf8ce7784b61346b49e9f4c0b6c353138dc12a5035f7bcc24576a508aa50 SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
-EBUILD libmspub-0.1.2.ebuild 1168 BLAKE2B 0c55aafc424575b019d2032cc51ae4076a8a75cdc65de89b7cbc1e5085e4904188ae52cfd3a55cab450170887576ecc0655d4cac3a04e4b1d2ec349a85bd7891 SHA512 1a3b56695bc505b745a553eaf2f675e7f2b89750c298001c09cf2d845d271a17f9a3bbf9e99d06f3c095120dc969c832a1aa23eccd7fb0cd2535fd5a90071b52
+EBUILD libmspub-0.1.2.ebuild 1167 BLAKE2B 41b323d700a9a2096a7b5f265df9d6511605b8bc0940f0ef47380a27125ae07f32deac57dad92ace14beebe211cea81b1350e5a74d866fe9ef826dda69d8552e SHA512 523d3d1660341335b2b5e6995c84e794bff2920f18ba2cd36400ffdeb69c83718c42296422527e225cef9e6b86ad6dea1f613947936c7601aaee429d0bb8252f
 EBUILD libmspub-0.1.4.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
 EBUILD libmspub-9999.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-0.1.2.ebuild b/app-text/libmspub/libmspub-0.1.2.ebuild
index 840b2e136a89..16c01c8e0026 100644
--- a/app-text/libmspub/libmspub-0.1.2.ebuild
+++ b/app-text/libmspub/libmspub-0.1.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index fe66f828a90e..c20121ad7e49 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -23,6 +23,6 @@ DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774d
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 EBUILD poppler-0.57.0-r1.ebuild 4336 BLAKE2B 1278223b785dbee353822f3b91f28cf17c33b4e34016ff1d7191453131db50c34b345e8789c9a50a0a217fb00b4666db5f6bf3239e299e6bdfcb6130fb76a660 SHA512 dcfa207b810d16af609f87485706e7242d132ac056acdf3fdee603cbd98f0c8096b76d490f0a4dcd180819ce96532a18febb83e420733ae8e35b5ed9e36ea014
 EBUILD poppler-0.61.1.ebuild 3856 BLAKE2B 31e10b8db75b10189d684affa9d6cad922305305c0528dd378d3a60753638b79ea957825ad4575ff020d75638be424615b9ae3151896959b13716e58ea956045 SHA512 d2121cea0c4e754926efce3b76d4ad2964bd3e98e50904266235631765e805813336f6ceaa1dd96f1c73dafa93a60c6f10a963b6fd4aad7e0c8d22ee0de2ee4a
-EBUILD poppler-0.62.0-r1.ebuild 3542 BLAKE2B bbe031997baffb072d948c1a32aa7fdf492a6abf5200115bc23dfafdb70f9eb283e4d86efa5b84c8cdef17ff16b4e30480645352840a9c694fe04097ab02d3bf SHA512 8c3af0909f0eeb73fe39d3c2fc095ffd627ff8886f17cef7e655006bf3dac249c284520e1d889c967b6a6502f47da62f9dcbca49a9c9c4bcc54dd4c860ae0755
+EBUILD poppler-0.62.0-r1.ebuild 3540 BLAKE2B 656cebbee90daa102b9b6b1e41d3b9af878c208c539e887b3b5903059390b208696ef15cc8ef91f5df390a90710d0239c3d6a15ee3ccfec87c6757b3b54d321d SHA512 47385df9eec448897997f446ee39fa9eeeed56b6c583003b41f76b06a59d0ed93a5e3143e8a05d754fc95ea8fb0fe0091de864cdf19aa0a832f38cfc75b6bbf1
 EBUILD poppler-9999.ebuild 3517 BLAKE2B 3ffc4a8345489eafac51dad441671279c7ada0dc0f476dcab4eef2be083ce79f026863359cf7563e447b483148f4ea78ed58528f2a68325e5273ff851d213e6a SHA512 e7fdd6efb1207d61917d63b5e8f70f6bddd792ff2835aa421215e2ad286971661397147be0d15b68d40922919461152c11c1293254dd3ba7611275937197b8fb
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
index 5fdcb9fca1b4..a5ce74b4e661 100644
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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"
 	SLOT="0/73"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 875436ffa4b6..852a92934957 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -8,7 +8,7 @@ DIST qpdf-8.0.2.tar.gz 7952979 BLAKE2B a9c81f41d6b5e3e9f80dab8325fffbedb8740ae50
 EBUILD qpdf-5.1.1-r1.ebuild 1316 BLAKE2B 843ad7e84eebd53fc18232207cc1701d928a69393a701b2fe5ecdade82942403d38146aab292ca96c2ec7873b604c37981c17bb8fe4e6dd6d4e982ad5d2bf259 SHA512 f8803fd52e6f7ee42f364cbde11465b95181350b3e1ab0f7378db844eb9f183723805350347d27a12071c4da6c3f4ab0a604430e5894a6ed0028b1794835a234
 EBUILD qpdf-5.1.3-r1.ebuild 1330 BLAKE2B e331790df4c0ec8e2491e77b1d304c064e23b222aff0a01c15dd06963e8071bf8d03a260773ad27307bf1c3dc84ddf217d5ca28a280b67ab1769500a0d0dcafe SHA512 8ba17da0d59e2fd3219d5edb02d778accd75a6588fda5d218d62755a5e54488c80f513566fec0091a85a19ea55c0e49f74ad17454d9128104f9724d343b27ff3
 EBUILD qpdf-6.0.0-r2.ebuild 1223 BLAKE2B 683ad52c39451760bf7a916c061710161488fbc25ee4e568901ea6e01d65938c39b0802f3859c4d5b8929dcb2df2be5143ebec5c4704d4f94ec11b90b637e9b7 SHA512 9d11d2921dc5a579e9099c33a1b6fb9b3dfc30f38e5c928e91758fb96be0a478f68abb9ed8d41878fca9e34e989c60a92429bdaa9da293fcd3f7f6bc291f1819
-EBUILD qpdf-7.0.0.ebuild 1236 BLAKE2B 2e2d7095c7a8e6c439fa50c7ad5b8a0d0efbe32dc64f47e2eb2f476b6efd5720ac8056bc25c7347766df92b244de6ead1cd90af44260a957c2eaf976f4c04c7a SHA512 f75bec7851178ad251cb0cb30e10fe301dfe5a70c8170c7fa5cad775dc8bf6ce5f59c51bb4422be56ea32fd0e53dab84292b017d481975e954257effb5360ca6
+EBUILD qpdf-7.0.0.ebuild 1235 BLAKE2B ae9a20cc67d4e3c95c69505a9a09990375afd671ca233ca734a5542271691a0a615dda307283b6f9ce7b91bf4a866606f74406b4109200460350cddba5fe960d SHA512 6084dbf8db8a3c0349a74fd8f025cbbf9e89ddd5642de19291e5c44c3e22b1a22abd9b3a1904dec69b7e3a75106249105764a74cdde81f1966e5f19d91b5284e
 EBUILD qpdf-7.1.1.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
 EBUILD qpdf-8.0.1.ebuild 1247 BLAKE2B 764bccbf564caebf07f28c24bdc84fc9b14dd8a494aa529d27c32ad473443cfce21ef062cc74a2b5e0a44c6e61f40f123611140298cfe9051fd7e68604a555e9 SHA512 7370df6aa8c3ac1609488169d6aed641fbcdcf7130ccee68a1f24ddaf153cf9564fa02b2476851c4141d81b0dad39481f5db77ac836aa1a950744a6961a1e447
 EBUILD qpdf-8.0.2.ebuild 1247 BLAKE2B 764bccbf564caebf07f28c24bdc84fc9b14dd8a494aa529d27c32ad473443cfce21ef062cc74a2b5e0a44c6e61f40f123611140298cfe9051fd7e68604a555e9 SHA512 7370df6aa8c3ac1609488169d6aed641fbcdcf7130ccee68a1f24ddaf153cf9564fa02b2476851c4141d81b0dad39481f5db77ac836aa1a950744a6961a1e447
diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-7.0.0.ebuild
index d8c0aa18c857..3d3aa36aea79 100644
--- a/app-text/qpdf/qpdf-7.0.0.ebuild
+++ b/app-text/qpdf/qpdf-7.0.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/18"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/app-text/referencer/Manifest b/app-text/referencer/Manifest
index 627490f236fe..2cc56a60cc98 100644
--- a/app-text/referencer/Manifest
+++ b/app-text/referencer/Manifest
@@ -1,4 +1,4 @@
 AUX referencer-1.2.2-lib_path.patch 809 BLAKE2B 2cb37ce577ab7b877353489dcaedf32fb135b7970ed70c031de843e0db50d619c8b83d451945dfe9c5d88f60fd21e5243c026c6cf10b0f113fc375bae7f766e0 SHA512 4857eaf468aaba555e7a74b23f91049c68746a6bc1a80d4df287a3363f92871ccb879bdf7f0f8dfb6f18a6f0443fc61f743cbe23b164de4fa0f8a076f59a839b
 DIST referencer-1.2.2.tar.gz 694421 BLAKE2B 2b48b71610d0cb79feaaeae7af203dedd1dc53d194b1b93306c5f022954a5e50f5db1dd693da76b7d4f33045d3174ed82a0764a9dfee6b6bfe98f352575cf59b SHA512 de8d759890f283e7863e6174334bcb051edf70f87a6fb06f724ffa1699be60c83d0191bde0324b571fab0801752a5b92fb507a3cd337fa9adb5ea7d22b280907
-EBUILD referencer-1.2.2.ebuild 1156 BLAKE2B 2e9c1f24ff81a25465cbfd438f4b16047850330aee22219b7ef7711e5b330e441e95363570248d073bec57cd90d9385ce2cd23a618b79e2c1ca7114e0352185e SHA512 2566c111f2d65132ed4a79c386e19d2cec91da6916b3012d42e7b9e6a019ce612035c751a9fd4ec8f7f50c0496211e1ff742003b87fe80ad76cbd709bdec41b3
+EBUILD referencer-1.2.2.ebuild 1154 BLAKE2B 3d21875ff3ad618dc50b59cc1ca149d5222a5c449827703fabef5318f1559c7ae7f81af552c818312dcd354907407d15f8c6d442526d18c7968f5c9e94ed8c10 SHA512 216e116d7f0c610645c40c4c668a2b5bd98e31d7304e258983a992c4db69cee053c1331bc7a1cd37079cd8fca87c676c387d955e4a2346d57f530e6c3194087d
 MISC metadata.xml 453 BLAKE2B 8422bf3441f4a64d469ed5d1f3935f93d6ef0a9b04dda823d3ab6cd03f53de8794fcc30732d9c5ba7414f925a346d96ba70fbfe52c628b1ba473b4c4c3180cdd SHA512 966bf89a47f9afee99af80214048a21d332e810ec1013ca8c9d7edb9e7038575c7a86fd1603dd9cf34ffe90f2a93ff55f7f1d1c229d66055872123f7b6f20649
diff --git a/app-text/referencer/referencer-1.2.2.ebuild b/app-text/referencer/referencer-1.2.2.ebuild
index cbd54159ff5d..06a5922851df 100644
--- a/app-text/referencer/referencer-1.2.2.ebuild
+++ b/app-text/referencer/referencer-1.2.2.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"
@@ -17,7 +17,7 @@ IUSE=""
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=app-text/poppler-0.12.3-r3:=[cairo]
+	>=app-text/poppler-0.12.3-r3[cairo]
 	>=dev-cpp/gtkmm-2.8:*
 	>=dev-cpp/libglademm-2.6.0
 	>=dev-cpp/gconfmm-2.14.0
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index a7181a8bc587..fc31219e0780 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -788,5 +788,5 @@ EBUILD texlive-core-2015-r1.ebuild 10925 BLAKE2B 85715b6526c34cb996854834f70687c
 EBUILD texlive-core-2016-r5.ebuild 11555 BLAKE2B a518636f0d5ab05d7e76a5200e2ba94bb8a0c8d76c37193b31789c8176b32bb2142cf5616c5a278732c110914be82636f0598e3e4c9234187d38f049f4cc68e6 SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237
 EBUILD texlive-core-2016-r6.ebuild 11560 BLAKE2B eccee05d4a349985c5eafc0149d5e85ded7d7c865883b2fd668a3403313ed74d6ba2060ab730d80d8a6d47cb19e384e2e62329f8d6b923183ab7732441434276 SHA512 1e2796e4c9348d229066324ba9916b9635957b7a823836abdfa1a9b55e7062d2c175f38c3d1f67f64831c44fc3ebd6752decb2edf2411f6252a24d410502ca2a
 EBUILD texlive-core-2017-r2.ebuild 11637 BLAKE2B d2b7e0b062a14232492e21e7a7c2d747e054888091da79786d03898d7ab0eda2410ffe9fc9533c79b844c1ec4dd96cc8ac8610ad3428a9e16d1bcaff8421ac15 SHA512 2298ae898b67362cc5bb3c56bec13f105f0124980e26da8aaaca2ffc21edc04eac6cf7a755f1867f85835a98c00865656f9b97e741bea8dec22aac841e2e727c
-EBUILD texlive-core-2017-r3.ebuild 11604 BLAKE2B d915d5c8ec929927e50d4c6a0ee715e622dfe5d364f92901a29321adfd4e1d992a13be96ba5e5e40baed02095cc978eeece8a80836ce0cca565df3f511e70d59 SHA512 83d61f6534b8bfb44e7af523ae8e34449c5da940debebd3498c058ad70d055271e72e43b300a598f46be5d40b50238c5394cdecbb4fc72bb18023a293b467a15
+EBUILD texlive-core-2017-r3.ebuild 11602 BLAKE2B 2dcc0b7085b76f3fbd216e13e38a264b1ca97b1452e7d80495ec94dc1f8664145519450a0d23d3eaac873101c18967c3bdd4e1c1075854a60c004eb8aa387fb6 SHA512 64f7ad363ef398eae49fe40c2a48feeb80703391c5aa7f53a4336af29b9e816bab987923edc62ccf57385c1bfbd5c167d02af19cff6b2cbae4f624ca366860f5
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index 9aedb1a07870..b2285a763280 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index dddf9f90fe31..cec4a72873ea 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,3 @@
 EBUILD texlive-2016.ebuild 7545 BLAKE2B e6924aa445756dbd686f8f87cb717bcc444fbc39ecbebd4828efcae10f25a88fddcf8a9649a97b485996fb8df54fda0556de9cbe38d1a9e631f1bd07e0a5f4c1 SHA512 f5306d3c4031cd7095e27e41990f57dd8f8a5bc4045ab4ef4ed40f9ab7b3bfe656ab8d531c1aa527f316895eadc774dcb3ccc81724b176794e89dcce726b100b
-EBUILD texlive-2017.ebuild 7403 BLAKE2B ecade1c30d50ce72406b32ff1984dcddc1b3e0073c7dbe567ccc7fd7da15050dd42e9b17bc57918c869e7f996e509f7053815d53060f64e20304a16c51a61ff8 SHA512 9f94cbf388205b9ddeb143de575271cd0fbdd8fa9a86858241ec9690171ca5038d842a27994ac5258461c75e184231bfdecf292b694ccfb3796ef7a1dfa32d5c
+EBUILD texlive-2017.ebuild 7401 BLAKE2B 0dbf043a781e2f43e5ab72d28165ad99f413d470aed20a920da67a375ccc6c594d98fe8b69f6a2cdf85d0ccc7e6539615b9dbdc2084020225d7b8a738da3ae03 SHA512 f820fc122ccc5a0941d9f59f6c5498ff564c89b72828b8fe387c97a05c30d05a2c094ece150adec64f4b2e75b216dbabd9d0f1698788297d5e6c1e64f4288722
 MISC metadata.xml 2501 BLAKE2B 973dc4c6f9f8bcd51246dc345a9462708c0272604f95e38789f2583c25fc1305fc38a602389bf41d821d5b9aafb7e5ca25cd0554741d0121c8c62446842ea39b SHA512 0a7fc544e4e52ce62503217fa1257813694701dfd4b4e170b19e3bcff698e87f97e586e7a6c4879fba8f27c8478efc211e538eefaf19a46488b4f1ddbd8312e0
diff --git a/app-text/texlive/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
index b0bf24656cec..4d0863a39f79 100644
--- a/app-text/texlive/texlive-2017.ebuild
+++ b/app-text/texlive/texlive-2017.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index f1e0e966f214..b4ade9c1bd6f 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -2,8 +2,8 @@ DIST xapian-omega-1.2.24.tar.xz 438104 BLAKE2B d2b26ad007849ac7a0a8daea919fb215c
 DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
 DIST xapian-omega-1.4.4.tar.xz 501712 BLAKE2B d46a463c323bf75db6d426e0ac2057f4cd6ad16ea097eeb189f00356df484af52ba0c8b09d81a0262fe833b784d2bce9df20dd3d36b6f74c17c0e7337a30e2af SHA512 927c6afe24f8a13018fcc233e874c71c0912cb6200094f7246c12b4175bc48d752312e57128a314e7674a948a50ef092dd7f2dc8910db7df8f3ccf9c44f38533
 DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
-EBUILD xapian-omega-1.2.24.ebuild 1268 BLAKE2B d09cf958684a53eee7b2b24ca539d42ca3f19b02a075baa4e84dae33842465be9eeaf10904e2fbc0ba8dd45e34a24028a7ce6b63a56168a0fc9d5f402e87465b SHA512 4d74b0bbb965db51bebbb241852024dd8ae720ac2d7cac8b52b888e0a4dadb400030be2e1a74f570cfa1ee1ca5ce8c4f0acae783e1c8ef1cb95a2988bfa49eee
-EBUILD xapian-omega-1.2.25.ebuild 1276 BLAKE2B 0b091aa320c42c8ef1d0bd911dfc44fe738f830e8fae303d90720c679ceb7450939fde1e33973793a091c34ad6c063f024f09d9ee5b25d7e03d07425ce3bdd9a SHA512 54d65e4d09a752db726595f652e07d3907f24c8b94ad47dc38890cff459a1861bd22f13263575b73295b3d21de1d60ce53ffb3b334e61ba3fe238a2c2c7fd0d4
-EBUILD xapian-omega-1.4.4.ebuild 1159 BLAKE2B 32271e845a65e403a71f1e1e66fb3711bb0e175196be85eda79fea2a20f0339d28a2d116e585c0cf77e2ce36515c44c189adc535048f295613b6a3bd48c8379e SHA512 1fc47ae8c850f39a6d1a2c1fcbd6254a7dd0a5c41307d87a5006916398ff566f6a9ef03e3b7547ed669c186a0b1b5799ee81e6138db9f2b0f8888321c30636e7
-EBUILD xapian-omega-1.4.5.ebuild 1162 BLAKE2B a50a43b4aa53f6ed9ba452f670be1e61bd1f461e7ef9825d870a4f8a3a611ff1f1cebb02402d1f9e2b03cefae41af3a1049cf750905360b24769a226254e63c1 SHA512 2de575262e573913edb301e2cc8358c6bc35c40959fd59da2b22059cd4bbbf6eef5a91a0c6c21b81f8467f8341c41727dc981477290d580414f74b3469e58b9e
+EBUILD xapian-omega-1.2.24.ebuild 1265 BLAKE2B 3208b0fbbacfe32abde89176a4f4615a9cc848e7f37a9f23333309da9804b457713a9a7b774d62d97043701813996ce53abb689bf944ca1cec1262510f61156d SHA512 8f8902b4d7843bb2a70e1c673b6aa78e5fa17f248709a9c62d03ff65c3a47784b98110ac8c3f73dfc8772f58094b96ceea41b11c7ddac17744714fbde6c55674
+EBUILD xapian-omega-1.2.25.ebuild 1273 BLAKE2B f57b3917eb6e9f37879b55d1e759e529c84901b237c673a5093acd2ef5d5117ed279d310995f2709e066f2e6f03e9a3cd6b4cccb2bea2faaa5adcfd03da93277 SHA512 b9a29ac4b8bfdacc219d171a088e1a05e3b092744317d33f197ef77415007ee589d89ee3512a937b4a0c63c781d3a319e05cc3ea7ae89aa5770d6a258784bc38
+EBUILD xapian-omega-1.4.4.ebuild 1156 BLAKE2B 04daef4ad0d3cdac10fc657b54cb5d21c5fa445561a51b1add18db624ec97ad43531597ffce51648ec978fc39f57760c61e1b120cf660a1e8b452470311f2a97 SHA512 006fdcf2159d49895786895245f7236dda96d81fea5e6b80d707083a7cc17153aec1969c1a30a6677a0b67e39ee53376eb507a9a7efacc12057b8dba070fcb66
+EBUILD xapian-omega-1.4.5.ebuild 1159 BLAKE2B 20e6767964ec6e986b48c02758c2acabee7ad2d6ef27308f92fa2098d02a07b4a7266b217b46b746e37c210c5514d2541350c4fb813e7ae3f228ff6f6ea21aae SHA512 0c152b80fa9f8495290e8869888f93866de076498e0ac33471b10e520bec2b6a0149d0c6d4418ec25d450c4f815721291e08e090619feb1ae809bb4f1dbee732
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.2.24.ebuild b/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
index 34228da944be..461cf699baeb 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
index e690281efef6..b7f2da1d327f 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
diff --git a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
index e1d29c7a0e86..00a7af4ec641 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
index 30c6df2a77d4..69bb116aaa81 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
+HOMEPAGE="https://xapian.org/"
 S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 84ae567bec32..81d2b08c98f5 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,6 +1,6 @@
 AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70
 DIST xournal-0.4.8.tar.gz 641240 BLAKE2B cbf82f3ddb27854ce4a17fe80d1ed012f47529ee3f41eac0118f4948f4ca76488fb647c77ab21c99cf19de0016df4db31a448d4c626a42219b2b13b297b5d51e SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf
-EBUILD xournal-0.4.8-r1.ebuild 1204 BLAKE2B a20cef53d6c52b4a352c7891283a1429f517f3b6b7563ac8e3b1dd94f3f96f5b12b97e8e46e96cd8828bfd34b38cd55ea6e7948f4d48cb914e0492ed07027748 SHA512 33065def7429ef8f79ad2e2f39d20effae9217744f30b1aff3a163d8b721d020c9edfd5491750646515428cdfa0b4691d8134f2448152ab4d45615abc4558add
-EBUILD xournal-0.4.8.ebuild 1071 BLAKE2B c2369f2ed2734bb8c0cdc4ef0dd9755d38695dd500f832b9c31f793b1a430f346be516d89e4961c22b209070f721bd88727a95aef2b80cd939dcab719ed670c3 SHA512 a6304ee06043c8e2ef57d1de563ed2efc64bb8098c5f88f5ab41d2aaa8e867a6fb71da6280c9fe5e4a123a93d89e8748ceea7d6772714823a29ac004475e1373
-EBUILD xournal-9999.ebuild 1073 BLAKE2B 57ef9df97e7b51e8703a32bcba8817f4ea62c6e2b8cf4df6b50df8b8090e398bb2b8366c891fb60f47e0fa16b7cf3a4543d351270eb66323ddde1d8fcde81413 SHA512 d249b87b6f0170acf7bb10117a31f25b2a105c12dac4c99a38cf5b883e40ef0a233b8726df37f148c3a51c14c85a72a1b3a20b59ad2b21acd7bf8eff608e6293
+EBUILD xournal-0.4.8-r1.ebuild 1202 BLAKE2B 7bd649419efc8c130d88e90303f7b1946a907c8737b1dde4cc5aaf3798e3fc54e7459dbb70abf4fc0539245b710f5b5e8f8a9f125452cd2e0a6d4109532c8c39 SHA512 f872b8b3c4b00a265ab0fc74f33f895c1fbfd676d39df4ebe2a1c2d5282b3265d13f741067ce6f417cc03f437db7e10768693bd9de758ec9b5ffc6d920d300e0
+EBUILD xournal-0.4.8.ebuild 1069 BLAKE2B 26606ab4d9128be573c91e33025270ed832f71c9b8d6b27cb1fe80defa11936d3ea8d2643376e691aa365d5140e287cad109be3019de6bcf8f02baadbc45a168 SHA512 7f74070413631ace102df1bb34cc06023d17eb35a6da2e5fce6c09914e6afff101e49eff7cfdfcfb9afc7699b4345e07c7d3ad7c575685269d7050e136769eb6
+EBUILD xournal-9999.ebuild 1071 BLAKE2B 3fd299a2670fb915b6e9bc95f7a043c3a6cd916cfd02b9d754dd9eed6b1cda72196b0d7024ef093997dde7176bfb618d24850cfb7418479062a15feb0a08e5c3 SHA512 8d6d811f448f371fa312e0c27ad0d03a4c1df35451e94f2accce3300a3882da2d02ffb6a49fe9af04771d6197ac8799f579aff9d513629e216adc3e81e9eaf56
 MISC metadata.xml 652 BLAKE2B 780548e075d6468df82b41e454b8d77c97eb7c9e4b4e4e286b7cd98a4f6c2d5489b355eb088602f414eeecd32b19b42d7c24aec6b1436aed3c818f60605d54f7 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648
diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild
index b30ab3a5467f..69d6ceebd250 100644
--- a/app-text/xournal/xournal-0.4.8-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.8-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
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="+pdf vanilla"
 
 COMMONDEPEND="
-	app-text/poppler:=[cairo]
+	app-text/poppler[cairo]
 	dev-libs/atk
 	dev-libs/glib
 	gnome-base/libgnomecanvas
diff --git a/app-text/xournal/xournal-0.4.8.ebuild b/app-text/xournal/xournal-0.4.8.ebuild
index 1b5655d9ad20..1e879f6a6f85 100644
--- a/app-text/xournal/xournal-0.4.8.ebuild
+++ b/app-text/xournal/xournal-0.4.8.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
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="+pdf"
 
 COMMONDEPEND="
-	app-text/poppler:=[cairo]
+	app-text/poppler[cairo]
 	dev-libs/atk
 	dev-libs/glib
 	gnome-base/libgnomecanvas
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index 61353ac0307f..422842c0e82f 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.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
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="+pdf"
 
 COMMONDEPEND="
-	app-text/poppler:=[cairo]
+	app-text/poppler[cairo]
 	dev-libs/atk
 	dev-libs/glib
 	gnome-base/libgnomecanvas
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index ee0faaa9c4e9..f1f1a56c019f 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 856 BLAKE2B 7119f650bdfbe7df414d18abf04e81fefd85fbf3eb88a228c600d5e12ee93af6d3ff55dc287f80542a48d200aa4153081799fecc803182de3e45d1776c6c5338 SHA512 018d50d54fb143b27c21bb8352f50ff1b7d908c2c749b0cd929ddcb1f8b4a3fb7f71ede84211218b3ab814b5fc7297e1a541816d3471615e82edc54826c584fd
-EBUILD zathura-pdf-poppler-0.2.8.ebuild 863 BLAKE2B 2dab024a767fccf4ade1d5d42b12335547e2c545bfdeca270f9096f767c8ae46560467e4cbd03d537f2766dbf9821747d4e1a0e407875e6d69fcbba867948c45 SHA512 4888ffb610c38a0a0fed99b5871b7d841a30b965d47caca51d1aa8290a258d912bc2f1257388427b8cbb2494f112264c1260dcc701afaa80ba1697b0974251ea
-EBUILD zathura-pdf-poppler-9999.ebuild 863 BLAKE2B 2dab024a767fccf4ade1d5d42b12335547e2c545bfdeca270f9096f767c8ae46560467e4cbd03d537f2766dbf9821747d4e1a0e407875e6d69fcbba867948c45 SHA512 4888ffb610c38a0a0fed99b5871b7d841a30b965d47caca51d1aa8290a258d912bc2f1257388427b8cbb2494f112264c1260dcc701afaa80ba1697b0974251ea
+EBUILD zathura-pdf-poppler-0.2.7.ebuild 854 BLAKE2B 48cd2dbd815496570c0826fb6f265b5b983f203689a5351c3a0a948ed9cd61d3b515940c755a2c297dbe294b6fd8b9cc732970ed2e24d7181d43a3a235a39f41 SHA512 8f1064fd8da384e347980adaf2370ea1e60eab857e50038ca16718768ccab732cfb95d5aef1fe1fcc53758e5ac872c3d0d787eae14bbbd76670e9679223f6396
+EBUILD zathura-pdf-poppler-0.2.8.ebuild 861 BLAKE2B 5237bbfc9f3202dd7178a2a37abaaac0d67af71344823969175d7b677387ab1040d6a1fbd83d6927aee6faa95f9e2e36b4fb1bc5a348bf007ebbbbf0b363c8dc SHA512 e451c62dd3fae3610b36b0511bcdf760d70cb27b56fe2c75b57151fd9fab7c714e83ba511c3f2e622e0d8467d4c3c4d40593eb882cbfba69712af7e140104e0f
+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.7.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
index 9d5af0ac9e48..c27384680f4d 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE=""
 
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="app-text/poppler[cairo]
 	>=app-text/zathura-0.2.7
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}
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 bf7a74bb4025..ca0b8305c134 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
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE=""
 
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="app-text/poppler[cairo]
 	>=app-text/zathura-0.3.8
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index bf7a74bb4025..ca0b8305c134 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE=""
 
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="app-text/poppler[cairo]
 	>=app-text/zathura-0.3.8
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}