gentoo resync 08.09.2018

31 files changed, 95 insertions, 41 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 30ba73925f60..35f3fdcc145d 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 53e9087d6abc..f65194d28bdb 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,6 +1,6 @@
 DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9b0126ce86695c6b5840b69f94d0e5befbbfc355006a10d13d34e8ed3582f0bfb678744654a7d2040555016b1681 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
 DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab1503bd8d5d6bb6b7d66c442cf8bcd47ee4325dbb572bdcfd01168ef1bccc3430ee7c545e7b3a6715b8ebf09516ad9 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
-EBUILD asciidoc-8.6.10.ebuild 2428 BLAKE2B 0684c4781333547a21565dd3c0c04415ff71b424793dc3e6263b210af63e87bd4af15853ab8ce2e0d62ab9e63ac80320012b692fabb4f87ab2b292434a869fdf SHA512 2e13bcb6df18d5ae9a785d1f0498617a5a8bc38e94775eef48d7902313b8f9b6f964dfaad868310073d681bbf94181c851dac5066f4b856cad36076b07dc9785
-EBUILD asciidoc-8.6.9-r2.ebuild 2182 BLAKE2B 9afcba8c17bdc898a80a57fd660bf0615d10a0757a12707b85b4f4d177e8782abc08476dd210329a522a809015353b4a4e8be1311deed0a54f39b4691a5e0aa1 SHA512 17bbf46f4f39ac05e83017e18997908a52dedbf624dcaf0e6c62506a683fc88917f2b042988a1e36cd43c71eab86001959e65c36bd92af40b45bc0a993ab0df7
-EBUILD asciidoc-8.6.9-r6.ebuild 2381 BLAKE2B 3f10a76d93d77748c69ed6655ae7bfe1cabc0c167af6132fc1f3a1ff3e527df9e61b3f69cec32a6fdc7821fb8e8d044877498f1e66e97f71e046c564694002ad SHA512 43f555c2811a278b8226941936ed8da27ea05a6daf244bd1fb62952f8941bb504f4614e8796d675849f28c8aebb1b2303a83b72d64d6e1d3402be0c3ed2f7018
+EBUILD asciidoc-8.6.10.ebuild 2417 BLAKE2B 05f2b65bc56930aa35a7b65162cacd357e609fe210f3433e42d63e2916a022dbd70961277a176a6ba33bd73e3a1d4a4f9d2b4e572a9f69d4bd9e7ca46e857316 SHA512 58b8bf69bfbac965e5ae33fd6e45da0680c68df64debc8940f7453b100481804778bc61b186cc09d85a2fd0b7a16933d6ab7b02652e590c1a3e5e9a0fcca7a48
+EBUILD asciidoc-8.6.9-r2.ebuild 2171 BLAKE2B 76606035ddef0bd31709a24a1b9896dda55ee1c299a043b46724da1a3d21565eddbd484ec0fd80db320c6db7aaaba1b340d6e1aac4bed7416724b9cd421791a8 SHA512 5a5bb301dab871ca93c282892c0e7a9421dad343dd529670385231397cfb96bdc01a483ce23fe86348c4af7ff2f00185006cb498e65b0eb5718e34c2fa7a3883
+EBUILD asciidoc-8.6.9-r6.ebuild 2370 BLAKE2B ffa3b9a29ff82b63eeb56d4af3c527ec62d19034086a40569116c8949fbb8bde289273f006f6f707cfed75d3f5302a8da7d09b01e998b58268aa83925eb39d31 SHA512 f953144beb29005d3a0027a644f3a1d68fbe54dafeeb2f22d176ef2a28fe92e7dc6b315c47d49e7d6132cefdef8f623e2b1c90f30337324fa90a418e6e29e39d
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10.ebuild b/app-text/asciidoc/asciidoc-8.6.10.ebuild
index 79a10d61469a..b7b019cda57b 100644
--- a/app-text/asciidoc/asciidoc-8.6.10.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10.ebuild
@@ -10,7 +10,7 @@ inherit autotools python-single-r1 readme.gentoo-r1
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
index cded88810c54..1a8c91dd30a4 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
@@ -10,7 +10,7 @@ inherit readme.gentoo python-single-r1
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+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 ~x86-macos ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
index 7be61c90a3f0..06458cb42e0e 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 readme.gentoo-r1
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index a3189fc68ee2..e3037883789e 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,5 +5,5 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 EBUILD calibre-3.15.0.ebuild 9281 BLAKE2B 8eaf92eb0c23c1b500105c74841aaf1980f71d7f3d01f5af76a0bf906a904d3df17ed71a5b01d150a70c1fd53b431f66de9a8c3a055a26b086dd60b714e535c0 SHA512 2194ef543af3296766c960768dbe8e6330d89583318052ad56a8a35df5704c88deec235c1dbfe042bc4c99df8ff94b48fd87f3b15b012c288a87f891433d49a5
-EBUILD calibre-3.26.1.ebuild 9282 BLAKE2B a32a06282faae9116f819875d2e048608d77c8c9f2e8efc9dbf1607db4cf67436ff0424c0536b850a2ccbd4a115e92f4443c429b15b6daae9b7105a1809a1b3f SHA512 2ee7018b965a27f69d40fa455b7bb8e76ced57527a05b12deadf442571cc2fe63234b5aed01ad1192aea69f5007678392810687e9b9170ec6e8271646671e5f8
+EBUILD calibre-3.26.1.ebuild 9281 BLAKE2B 8eaf92eb0c23c1b500105c74841aaf1980f71d7f3d01f5af76a0bf906a904d3df17ed71a5b01d150a70c1fd53b431f66de9a8c3a055a26b086dd60b714e535c0 SHA512 2194ef543af3296766c960768dbe8e6330d89583318052ad56a8a35df5704c88deec235c1dbfe042bc4c99df8ff94b48fd87f3b15b012c288a87f891433d49a5
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.26.1.ebuild b/app-text/calibre/calibre-3.26.1.ebuild
index 1b17039bb4f1..f761e9c5d83a 100644
--- a/app-text/calibre/calibre-3.26.1.ebuild
+++ b/app-text/calibre/calibre-3.26.1.ebuild
@@ -31,7 +31,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 SLOT="0"
 IUSE="ios +udisks"
 
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 1bcd0d5ee4e8..b97b734e7832 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,3 +1,3 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
-EBUILD coolreader-3.2.2.1.ebuild 2044 BLAKE2B b3d1f58d769dce2d28f9a821b01bedd8b29758660a5099b49bdee6a6a2387dbaff63a304cf0417c274c786eb0ab0e7438ab75a9432af449bc24efe340fd1b746 SHA512 f642e67189be63bb996fb1381de92d26ae7b7a8d2015ae575a991bf1c0cf0e05fdada2a140058b12f06d57d6d284f4875817e97a6b49b7dce7cbcf8c87c2b7a1
+EBUILD coolreader-3.2.2.1-r1.ebuild 2083 BLAKE2B b585ccc372f61ce062e98bc4051d321f1f285a1615b4919e6d68564a235a2ae34a1eb8aec8ba4683eff2585d2e6c4172dcacd97d69984fb56e9b5d7cb6f26fac SHA512 d9357022da3f13ad4e4f51f111d77267d1a26faa49d7d6f133b37058613070f1b2dae0e020311138e2205778548c6e70310fe402cb3ba9ba21f9e79564efbd27
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.2.1.ebuild b/app-text/coolreader/coolreader-3.2.2.1-r1.ebuild
index caf405eb1501..672463952a1e 100644
--- a/app-text/coolreader/coolreader-3.2.2.1.ebuild
+++ b/app-text/coolreader/coolreader-3.2.2.1-r1.ebuild
@@ -30,13 +30,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="wxwidgets"
 
-DEPEND="sys-libs/zlib
+CDEPEND="sys-libs/zlib
 	media-libs/libpng:0
 	virtual/jpeg:0
 	media-libs/freetype
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 )"
-RDEPEND="${DEPEND}
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+DEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
 	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
 
 for lang in ${PLOCALES}; do
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 01186e8ac2cc..5984545b2e74 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,9 +3,9 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1360 BLAKE2B 1a788f3d9a0bbb2828dcdd8661d29845ca885bcc82b4de3715de6ef515e5861747e9aaf2a6942afc7182b1c8fba6c46ed36097ce583823babcac1a886a5ae1cf SHA512 292e22ee2c56ca3a19437774cee409ae6b1e4153a7d17902e9c12242768984dce1514ac3caa657298d49591a4bc88fd988463c01fed43ebf6ba7d7f19cac65c4
-EBUILD docbook-xml-dtd-4.2-r2.ebuild 1339 BLAKE2B 09d9e31aa0a859abc11aceeab5dea1806f8eba26cf52ad79a2355cb49b246e5d900799180d2e96b0b67c7a0f4f8e38064c4cf061f0db17bdefbc544dcf985abe SHA512 3a9304d3fad564f154a317641fc7173c16cc69572127a891a4d3c1c8465ff26cacedd3243d19eb329309252120610ed57c8154ce91d00b0791a5ec0a8778b398
-EBUILD docbook-xml-dtd-4.3-r1.ebuild 1356 BLAKE2B 366c732f8f42cf1b4601f7494ccdd632692e49f9995306eb0dd0827c146c8f820385107092030e99c91d773e999fa9be3a9bed13092f4f5c3128fdf3d2c3619c SHA512 c00cde0d71964d449563affaba36ec535343fa13d80b43578cd6362fe30afc9d1b49398e27ec1cba265c76eb4f556df2136870022c8fa97e6e8c470f6b7e4a0b
-EBUILD docbook-xml-dtd-4.4-r2.ebuild 1538 BLAKE2B d212965364a5b787f5c2b7087f1f1785776d1e6151e3cf6f7301b9b51c16656f7f99bce560f085c8b82ddb2b02b4476e8ec0c82cbe654bb84a5c25c7a59b3254 SHA512 80eb507425ea2109809d4353fdce2bc3386d73bf7ab7a6e4a227e381cbee41fee6857b1bc34d5900e5b3f6aab24aa91badc51ec5c09aaa923649372bd126c727
-EBUILD docbook-xml-dtd-4.5-r1.ebuild 1573 BLAKE2B 26913c0e0936b3fb8d2d4ef04544f0cae2764e68f63cb5be1bed08fa9ca25e255055f59b3cc19a73883dd3e88cac4d2e1fa98b9efaa0f0c5079b6ae7552f5a81 SHA512 9a82340165608df94d352c6802e90ee4d2a935b717aed27839064fe59c26ff8b2f4fc8e5ff21a478307676696c2d055488ffeb0a7833c1f329179330e471080d
+EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1349 BLAKE2B 46886e64acc157d69e80dca374d2443f0daae86c697b7d43648ca1cf8c470a78e2dc14d6f131d950784a3f32b36f9291723548080833775f002af2b4e71a2a16 SHA512 f846508d4f5d922eb3388e007f2534b6ac72558c7b3a987ea2275a2ffc36df32b86b3705884c0f4eaf930663eca00fb7d7b8f78ec736ba16870dbe98cb5ed810
+EBUILD docbook-xml-dtd-4.2-r2.ebuild 1328 BLAKE2B d8d4485b98d029de27304f7f71aade00a4ce20b9d2b80ac3bb5a3521cc88309850f5e439afd7ab9a4be7d0ec6548a0f30f043ed3fb0d3a0f45507f5770258768 SHA512 70d181cff9c4a1635a32e015df149216aedeb44d678586ac458064d12ba1fe9c13b43736edc702e1657d3d3ea7d94a700b71ee6222e0c3d629f3f7999ee34604
+EBUILD docbook-xml-dtd-4.3-r1.ebuild 1345 BLAKE2B 41128ca2215ccde39a55920ff9b6e52f50d2f5fc34cb7041979be6e8a35ce206b0d63e0e7f28980096ba87b3e5503acb593238de8d8e5ad90f8a0e318cc7d689 SHA512 321fcec7130de85cca77d61d6571160fb20076da60c9240c1fcbf1018c1a650eb64ac21e5a2dbc595fd85219a593e3a83f244d7bc3436c26b5a6058709768e5c
+EBUILD docbook-xml-dtd-4.4-r2.ebuild 1527 BLAKE2B b503076778931d6fe2905585aa0ead0fe36650c73a36601a4327cf1d3892e0316dd6f9be232b5c7c1478860b421d03a5913f788106280f5ccff20d28f10c49ca SHA512 1e0612e382bb549158e02dfe8a371841c150e7eac29dc06934cb7f92db330ac7e0adfe68e2d1820444ede96dfee3cfbb367dc9de24749526ce1aa1486b3b26e7
+EBUILD docbook-xml-dtd-4.5-r1.ebuild 1562 BLAKE2B 756826ce687cf0dc89626cc1819ecbf1f5b5e934a383dc9866ae7db0774f03cb795bfa056edad1444d691ab97c932ba0bca4e5ad520747d4edc84f0127734966 SHA512 392dcc7878bf99456d59400a52fb2927745714a1b782b1779955c35c257b457805b2d01ce3a46c92f9fcde56c3b920ed3f0b9c834923a6321731db2014be0ada
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
index 17ce4acda401..6aa08b4abbfb 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
index 3671d422a054..a9ca1172eea1 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
index 7528a2e56d70..82b3736fb1f2 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
index 5e5d183af461..ad6a7fd527c0 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
index 134c00d770df..4e0cf7321356 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index b2a0d1a7cde9..36bdecd9ece6 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2171 BLAKE2B c7720c9f35b56c9302e364dbcd9b9e1d571aecdcf363e2260035bd202bf561b800e2ef7c5f6347c2c6de448ec8cb703b468e3c3b8e2207761156e4e0e2079617 SHA512 0e7a04f68a10a037c2784336c64edae12c6102d44bff00b2eaca64ac76ca4c7ce6a23c0fdcab31a7b65d5c3b3be2a6ded06301685aeac9f161ee7a695b1eff1c
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2160 BLAKE2B f89155492c330a910ffdd2c839451d6f3e2ca88df6ab941c71eeb676a50626945fa3674da05c23bd4e1a22ca3265ce0163d9b7bdd0bcc81c7894edd5aba30b33 SHA512 172a34833e380d19305bac32dd00ca0a3c4bd08f1773ba7398cda0b90581b278d761d62b716eef8e0fb5026b9eae53d7ebfbc795691ef6d83889701e657f3b5f
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 25331a2f2de1..66d7cf90e11c 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index e8ae572deaf6..6a432ce0dd03 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,4 +1,4 @@
 DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
-EBUILD lesspipe-1.83-r1.ebuild 1134 BLAKE2B 0593da935bf18e040e0d9859e051d867fde05644ba39b7c71bf8ac6a60e9a5581deb74fcb3884c0370e7947f23a6b8802bb6c53685dd2c772139bda286252d49 SHA512 dd9ef9aab18b1b1b3ce69436963ccd577fba41c9e6dedbf69aabf7c61093bb04c0b2ea3bf9e62e25304f8008ea81730407fe410c208a85aece54e6d4a05c400c
-EBUILD lesspipe-1.83.ebuild 1147 BLAKE2B a6d4741acd7713b6231dbaedaacef655a2ac1cb0bf1df903dc771318e42cecb5e6001d3aff9c8d46c344514e9d00112d469aa65e785b7f474be520e671acff67 SHA512 a20258832d481689afaae1a9ac9234ce407e6d5746617a159bb49452bf82965f25039cfd5e65c79175039808a08de30aef7d3c8898ac9a5ca548d838b2489085
+EBUILD lesspipe-1.83-r1.ebuild 1123 BLAKE2B e0e9a8373bda948281b5a584b174bb9bd1b75b503f004fdbaec54629673cbb7a850a685445dbd7de9b3bc1237f052fdb10e8ee771d3600c5fee4f2cfcacfc5b7 SHA512 334fae62576add56f38a0ba9c0ff46bdba7a5bf03a5f5236e028b30ee3cadc123913aae4d78ef38942d7b816e2f243cdb6828c7a366313ff83f48cc82e92fddd
+EBUILD lesspipe-1.83.ebuild 1136 BLAKE2B 4e7dd1ab4b3a24c1233539d1132b791b5576eb81c32fc866bfaabe3904c9de104e02db88a516f122f5892a08c9da231100c1417a55536973b241751bd55fdbd9 SHA512 aa8ed4b60d7396c65204d149057ac8f56480201ac1fccca2d9f5661a76100cdca8daf2c322dfe9d3e754281c49d5ec6b07201b938e72e96e72f2a1f4212f205d
 MISC metadata.xml 303 BLAKE2B 57a0ab69188055eec0a29d4f2e331dd027d87b12623099013f889cd4954574772f3279c7fdce85c0fe627083db59a89a6d3daed8266c867b17bbdf84d1fef4a5 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
index 92d625cc3641..0eefc64e5ed0 100644
--- a/app-text/lesspipe/lesspipe-1.83-r1.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
index 0340429979d4..e879930b2086 100644
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index 703828218c64..8ad0b20703f5 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 646 BLAKE2B bfb4bd847f6a94f6db1cf5b7536ce4984ac82c8feb12cecdec09a01196a93fd95512717a262532721e2095bff5d043889dcffbb7c47f75495b3920386a4e9e6e SHA512 7e4582eefc9acfc019b6bf4e9601d3efce10c70bc512af5e806b899bc1d7c9d08b5af4e0ae06d791e110b0a1803b53d1248890ede0f625578b7c2139ab3ad74c
+EBUILD manpager-1.ebuild 635 BLAKE2B 9c311dff7c08dfa74d44796e8ab65746a6389fa2ed759bc913d66818d53386fdaf6f18f5fe51b0d36503715aac4357f40d5e57d1b696017ed98e342d836b4dcd SHA512 e9d0b5a43a85ec5dddcae072b13a503c4ec79aef906a825789155172c1207933171959496e06182327e3e180f5135d457dda749b27222dd0d7c53543c798a638
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 39b1214d8e0d..88aba7bab89c 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 245a3873ba30..49c978e67f67 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,5 +1,7 @@
 AUX pdftk-2.02-flags.patch 1922 BLAKE2B fc8be4321b7f39d3814a4da73986d4d81fd9d0eb52941e77f2ebcf85443c418b618584a5d9632979b3c6ed121e2fb4a42d7d694832119ee215a97454139e3d51 SHA512 96d2aceda2c98704ee70e55f84bd831ee131153d21a2b6f094ec111a1475cdc5da01434566d1c9aff2de403e55a81b0ae6baeb5d3017cb979662de895ebbf768
 DIST pdftk-2.02-src.zip 2239008 BLAKE2B 9bb55fb687b85de2ee0f9bec4ff16772646613b1519afb6d432985ad452cd09d04636788cb2deedb9924833cc10a802057c0e8ff146789da29cd4969cd614c39 SHA512 5c73ab3b7b12cfc24a17c2737d224fdde2ae684e1712031a968b83f5b8d91c521d477e932fc47f8b4a8c0ff0ba183678aaa13a1e7b29107c5c47ded8d960ef54
+DIST pdftk-v3.0.0.tar.bz2 546821 BLAKE2B 1d1935322f1468d9e2e8044e748fbb816e399599e445e078866d416d5e99866739134fb794ff42dbfcc37271d66655440f706db46f152722ab7030cba16edf38 SHA512 3b487f7532140366c9ac41222cd366d387b93e67aada845772f60ff20601e25611e34a190a65fbcec9d776a0b5683100fdd54453357bf7c43cebea7dda0c6229
 EBUILD pdftk-2.02.ebuild 958 BLAKE2B b67ae137dcd28f2bfef9ca0fb5b2b718fd14a8d51628995f24090e3c5cf5db69155ffa75f8788137f46669f0d625e544e9fc1f9188ac21589048ac51c55039ce SHA512 25565e5ea0c59b9af269419acab47d7a4d452800494697238a1e9b48d11617a4f46024357a91bf3b25c080a22960177b4249275f571d2bf38d9a492d70d650eb
-EBUILD pdftk-9999.ebuild 665 BLAKE2B 23c444ed411e75e8a8c00f080ef67533d7a75fce5553705f386dc13ae457976383e5601566f81991c29b1a0a27b07be32f7ad848bff52d50d29d5f6a16eaf263 SHA512 44edc70c6b6948a240a131d4b58c439dc7f68809f3f0d74bd082d172084bd4be6526b75c1074f823e0d4cfa1b222fcdd7e1dd65fa3194b2c248a9bd576a86686
+EBUILD pdftk-3.0.0.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
+EBUILD pdftk-9999.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
 MISC metadata.xml 348 BLAKE2B ef51c768c6964646b5e264d379b5c259134b37df3c9d4368b92c44855ee21fa40005fcf1514e95fba43fb683fbf49c35dc251521d1b63f91449c73ecb527a749 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572
diff --git a/app-text/pdftk/pdftk-3.0.0.ebuild b/app-text/pdftk/pdftk-3.0.0.ebuild
new file mode 100644
index 000000000000..9fe6b13efc09
--- /dev/null
+++ b/app-text/pdftk/pdftk-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="gcj-free version of pdftk written in Java"
+HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
+else
+	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/pdftk-v${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+JAVA_PKG_STRICT="yes"
+EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+CDEPEND="
+	dev-java/bcprov:0
+	dev-java/commons-lang:3.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.7"
+
+src_install() {
+	java-pkg_newjar "build/jar/pdftk.jar"
+	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
+}
diff --git a/app-text/pdftk/pdftk-9999.ebuild b/app-text/pdftk/pdftk-9999.ebuild
index 38734756ceba..9fe6b13efc09 100644
--- a/app-text/pdftk/pdftk-9999.ebuild
+++ b/app-text/pdftk/pdftk-9999.ebuild
@@ -3,11 +3,19 @@
 
 EAPI=6
 
-inherit git-r3 java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="gcj-free version of pdftk written in Java"
-HOMEPAGE="https://gitlab.com/marcvinyals/pdftk"
-EGIT_REPO_URI="https://gitlab.com/marcvinyals/pdftk/"
+HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
+else
+	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/pdftk-v${PV}"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,5 +38,5 @@ DEPEND="
 
 src_install() {
 	java-pkg_newjar "build/jar/pdftk.jar"
-	java-pkg_dolauncher
+	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
 }
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index c72aae165978..a51e4a21a60e 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -4,4 +4,4 @@ DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B f2cca4dea35df82015607c88b225d
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00 SHA512 8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
 EBUILD sdcv-0.5.0_beta2-r1.ebuild 1426 BLAKE2B 6711cb854f6f010a06bf7e016de9739d719a3429e400005009847ee53087c4c1c2b49bd64e342b365cbe70d1fd9efbf333bf3287470537585ef29da1f7fe8023 SHA512 c721c50436f5f3224412f6229ca2796ab685bec580702025a341656b1d3b62400e5cbddbeea13ef0178e7635b55ee7616db6ac39c06ce4640ac464d837423d00
 EBUILD sdcv-0.5.2.ebuild 1587 BLAKE2B c24d31dde663516dfba35363d80896498da53dee8e344634228dc3971c2f194ab6d80286fb9de5c520a24fc30e098f1ca6d9b0cc746d3eba9220a51af8fd69f4 SHA512 5bc612298d2cb1b562acaef6e60156ce7b2103837f4ea4e95d1942ac4f0b8a65b849335a992603034e52d5e53626a7838ec6ab788e3e043361f3489c876413f8
-MISC metadata.xml 523 BLAKE2B a3ccbb4d5965978e7eeeda8acc971d81d6ce65f04e4ab0342c1da8d3de0dc5512c8f172a7642b5d1c6f201717f52f6a850f459dfcf61e10fa041a35998c9f0a2 SHA512 d1c4be3dea4d7cf435bb98f6a02cce92925c113fc17c505377659095b53c1857b2730fa2363910630e51dda847f6d85f9dd6dd80abece74b844995ca7a09c8c8
+MISC metadata.xml 528 BLAKE2B 56e25a716843e62cb0a90bb7e75abf3811dbbb38c5c91a4153d5b340c355efdd4db771a815b116650e696b637deb4dc42320e0300d903ddbbc9b124b57934071 SHA512 0128fc0c89045f17ca1dbd13e18d2351dbcdc7af76451b80ba586ad223025c8c96f9100c09db5857e88f503534c6d699e649bf68c1bb3e23c6972ca2e5536c99
diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml
index ef1706e494f2..0b6f03db0294 100644
--- a/app-text/sdcv/metadata.xml
+++ b/app-text/sdcv/metadata.xml
@@ -11,6 +11,6 @@
 		dark background.</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">sdcv</remote-id>
+		<remote-id type="github">Dushistov/sdcv</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index 8a5e70d5df70..f86670209764 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,5 +1,5 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r6.ebuild 2481 BLAKE2B b4b4945c34f62854ef6db9c1bdaee90ad0814f44e705875a6da1b80956aeff8829d087dfc34939f5dc8edd60d184d8d6d9247a1d4754aec30ad82c7661962b98 SHA512 15d48f36f85740b8fd4c5a056b6483ced6fbe8919b43942928b32fae2c9367a5f07f29eb507918c7d50afb9e403f339e969de16fda5c447e19181a50c461809d
+EBUILD sgml-common-0.6.3-r6.ebuild 2470 BLAKE2B 98da5a7a0fc5d260b248c40823ee7f69eb9f30151c55a01574d058cde0d69fa5622d2ba2731e6a4f3702f0732d97df5d56fc806fba8ad468de81323141e16702 SHA512 f223a9c24aaded3af9c6ef5a4921b060efb77ee7aa17613825ed96e4c386a7193fab678955fb16a992550aa763cc97e9841c67ffcb1c7af90f4f8110728d74e6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
index 2926cea5963c..92f169fab150 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 74b90265eda7..0f5166c99672 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,3 @@
 DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
-EBUILD yelp-tools-3.18.0.ebuild 676 BLAKE2B 3b61711246d66e63716f0eb89cee32dd2aa10bf08c2d110b5a93d9fd2acc83e45b0fea8b7eed2666a58b14ff4615e54fa4f776e5d9251af12ebe09d7d2d7b685 SHA512 2c1ad45aac535e45e939a9fe99ea124b4973a00ce37bd7c89c021d40a92c0a6ffadfae3afddae61126046e9261b2ee9a2265d3e828b0eb43d1c957545e79b4a5
+EBUILD yelp-tools-3.18.0.ebuild 665 BLAKE2B cca32e98a9cbcf49457795aa608955662f8a58ab7276b24aed66b5069f1f67de5c6ea5c244c4ec8dba26670b996e3d1554d210888fe339bc1f7b299b32aca978 SHA512 265e23a9f7286e866e85c431dbab8bed4f1c6477ac55029f1e55680cee77840be72260470d6bb81590174a16a0f5affc8c54fe8d072bd834ffb666f4d685f8c6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
index 5763df6d82b6..fa0c5f05052e 100644
--- a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="