gentoo resync : 30.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
commit: b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree: c66442ced2011c5ca81c3114cc51041e314c6d33 /app-text
parent: e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)
58 files changed, 118 insertions, 468 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 11d3411faf3c..2878f1322cc3 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index a9e64f0bf7e6..8c0e8adaedac 100644
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@@ -2,4 +2,4 @@ AUX antiword-0.37-CVE-2014-8123.patch 528 BLAKE2B 612718b3af9f3e91b5b755401a124c
 DIST antiword-0.37.tar.gz 317884 BLAKE2B f47c815e2c6a1ddb33fefa33b3579fa5ba6e3900d3b9339350d28ebd0223853ad60ed717a1bccf4960c835427ebacc4de944548f9b354cd34889f0742de4e74a SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 BLAKE2B c01aa7c02539fb5148cb1ec01983a8406315bc3cb2f909118c022c2f218660919e6862582cda34dbd4c08a21beb02c928f685273853d1ff3350548957ae30cde SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe
 EBUILD antiword-0.37-r1.ebuild 1431 BLAKE2B 2367955fe72a8c5d31e86fc8fb9303b858f4605e07d02458f63ce8d66fc35179e1ab5a6679cc31ea57f93f3e412dfef48e370b74384e4240f72741e64fbb7c8b SHA512 fdc188c4658e1093e4f843711a1843da8e827f1c737a627e54000bb3b4d16827eb828c52019b64adaca2fcfb20e6f57b29271f8d7c21241fc7fd9878c0204585
-MISC metadata.xml 586 BLAKE2B c0f76089a0e3446bf401eadd4102ebf48e4dd951d62359a0909f9577982a85051ec372af5a6c775e4f5fa85008be9fae6ab63d8c9747b17f81208ae4c1d6371a SHA512 19ebf64ad8a3d5177eb7603aec79d31d86d0416f519c467000236e58c008e52c57398b05d76e81e86a7bd6b434aca77845f308a821d3180fbe5ee823d322d92a
+MISC metadata.xml 343 BLAKE2B a255d4f9a7079612cf94d69b3136bf3dc5d1ac638629e02430c96512b039fbaa0d1d05a216f7181c7269a1701c096292e47251769581d1f4dc5bb1559c76501a SHA512 6a09982bb72f873e6fcfc90d8dcb8db7b06c11b43633793303f511b5bdc86f83a2b2ab560f6ce1e4b62e334c16cce96fd9b0ad983caee6381612a4b4102ccc09
diff --git a/app-text/antiword/metadata.xml b/app-text/antiword/metadata.xml
index 30c6e6d53c50..8ee341cec0e5 100644
--- a/app-text/antiword/metadata.xml
+++ b/app-text/antiword/metadata.xml
@@ -2,18 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>clabbe.montjoie@gmail.com</email>
-		<name>LABBE Corentin (Montjoie)</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>grobian@gentoo.org</email>
 		<name>Fabian Groffen</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:antiword_project:antiword</remote-id>
 	</upstream>
 </pkgmetadata>
+
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index c1b015ffb9cf..53e9087d6abc 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 2440 BLAKE2B 3e6d8f513d28af9a840c58bdb7a1806cc42d4d20779e9729028c0c0b26576c892bb96375a881cd5ad3f9182c576786467d4d309e848d28b077064cd3fb4b44d0 SHA512 25ef3bd66c29931f3d4c2ae5d1d7ae8afbfc9fb646397a788f88c00ded48533ffd698f4a1ac649f38f0b6f46831236fb1f09da6e90baad80776c240689ca29f9
-EBUILD asciidoc-8.6.9-r2.ebuild 2194 BLAKE2B 2220da9b448de8c9682bcc73513c43f713dc6f329860a5ebb62017f5fcddb6d33274cad6e47d6592bb58b914811c93bf18f873ac7d5c15a676af55913b0610c8 SHA512 8800a9c0a0ffc8105315d468194b8c6aa0a23d2345b1a5aa4ba5950c3d2daca94f28ffd81f40e52c10d8de94d9f67306d69a3c00acf4008821ffb4c21625f190
-EBUILD asciidoc-8.6.9-r6.ebuild 2393 BLAKE2B b3894e1bfefce30f5d75a843b2065f3bfae89c8e78d4d30c886d50082b078468d1b2676ca3b08f30761d2adbdb65137dae81ebdd01d3755f47e71edac7bb807c SHA512 ef5cd7559f8c7a1a3de05a6ec2b81647b8b2bdb22efe6112d5136a36f83e32071a09febfe9a4310e437fdfa92b1e752bf0744010218653758fff5d39677a7e66
+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
 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 9b0209cb6e6d..79a10d61469a 100644
--- a/app-text/asciidoc/asciidoc-8.6.10.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 
 inherit autotools python-single-r1 readme.gentoo-r1
 
-DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+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"
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
index a8ca6c45174c..cded88810c54 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 
 inherit readme.gentoo python-single-r1
 
-DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+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"
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
index 4b9175db95c7..7be61c90a3f0 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r6.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 
 inherit python-single-r1 readme.gentoo-r1
 
-DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+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"
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index b685cf807454..c578e6fb4122 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,5 +1,5 @@
 DIST gocr-0.49.tar.gz 392386 BLAKE2B 9e2661f33b321b60ca761a259db31fce58be80f2408f003c31cac5a4b4c30d7943b864b36c4c6044c2db2a71efcb6d0b5b22fb17dc33dd971920f6c0210664e6 SHA512 4559ab2cb05d67212da1857a9e7280abea0b4a172454d5145f04f7d23237d065c7b17ea110123ebbea5d62e589c507e73957e1b15e856b19f9bfc5efbecf467c
 DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
 EBUILD gocr-0.49.ebuild 1194 BLAKE2B 17c24733407f842e9084c57164aa9eb93ebde88b5d2afeff1496bfa66923b5f5e1ad4c11269bffc4b38a922ec87a6f86d8bff942ca57423be6c20f15943b7351 SHA512 d6f044d7a983154b6298c95d8d86bde528c7374d8e6cff82967df4414df07252c81dc691dbb0e49d7ac8c4a5b528b336c4978cbc4ff185bc9e2d675d2733e06a
-EBUILD gocr-0.50.ebuild 1204 BLAKE2B 32a2e739d6bbf38a4be93cff3d6a477d4ce279760649c174c081e18407fe230f2526eb8c2541c8907462930d2f2044236c2ddd9746b7b9677dee9cc895050b60 SHA512 263c081f8758fabea06b1dd89e834b9589f4581860729d798ad15f8d030241806b307a324d277625f79ef7ecbeceb16225e4c4f099e7708b746c14d6d79c3626
+EBUILD gocr-0.50.ebuild 1199 BLAKE2B ab0670e4b0c0af277050a2cf59cdcc5aedae968f061943bde4c6aeebfc161336c1e83f397f20cb37a1adabccdaa4fe36f27c9dc0cc90dd2b2ac96ccd96e75a53 SHA512 d73b4c9f4ed68f3c1f09ed7f2fe45d296c0a4fc74a29fb728e40090367be214e030e3615e50c91c9bc156d26ea9403624790ab9d71d3a0dcbf4c046c0f410cfe
 MISC metadata.xml 323 BLAKE2B bb09f6949d6fdefdb0ff856c96a0ab766e9ef11559aed7bc424b6da8eb226f4f9090b708da8b4ab62a123530201bfe721e5e6b505b5a6f3d5cd40f48941a86d9 SHA512 5b38ff42ca62ce001e5041406a24ccd8bc1c7f33d7a9e1f84ca0d5d48a3ad2f80e74732a846ffb6768709748bd2dca5868f76ab4c1b00f1e75a6f622597858e1
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
index 17055f00fc67..d117bc57f841 100644
--- a/app-text/gocr/gocr-0.50.ebuild
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc scanner tk"
 
 DEPEND=">=media-libs/netpbm-9.12
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 452f564de1e3..5b097fa2ea44 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
-EBUILD grip-4.2.0.ebuild 602 BLAKE2B fde77a5097a56f4ec4d6d27c49bf0d7698da77b8ea2ccb5e2fd04b534f8fd6a3b5e65adab4d0de0723f915db9ece67c4a5e6043c095f4aaca342b2d4d653312a SHA512 326080a495036c7ccdc99f2041b177ff8570bb9dcd0abac5899a719489a9e32a1662a7bfb637045a64c9d2aa87693c227ca08c7ddf74a3de72ab4a3f1d5736d0
+EBUILD grip-4.2.0.ebuild 604 BLAKE2B 8fe0d9f6d6c66a46207a688e4d98c666dbc3936e2709b5a1013d30ca59f29c8241ae2adbb23a17605496f80deb0c4ceb0fc95b169a853536c91a4c61a2fecc8e SHA512 1066cf711fde9c9dae1048cc60a13571de56023db83f7fb1976106f3874498f9618f05d4f65e4c4711470817890eee50a34881ca064854a8774b73bb927224a9
 MISC metadata.xml 287 BLAKE2B 97d6c8c5b9fa03b5b8435a9719b819a9e071d1310656d97e6a203a8cf86d2414034e8642de7f010aa8f64955bcdc849bc66ef64a1e0e80fd23e355af50c6bbc1 SHA512 047bdd78979d55e9e37b92f51b52190c6a5780d6b3475560ae8908fdc98274949372918e1ab150821f09bff97cc12f25097f4e89ee4431861b608be79bd942bc
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
index fabda5f42c93..26ce65a13626 100644
--- a/app-text/grip/grip-4.2.0.ebuild
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy{,3} python3_{4,5} )
+PYTHON_COMPAT=( python2_7 pypy{,3} python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index f1aaa9f58bca..03d4339c90bc 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,5 +1,5 @@
 AUX gtranslator-2.91.7-gi-silence.patch 869 BLAKE2B 9916f2b8b83ddf924b55d9839b6d0c48796b593227dd02494e25f652f9ec75fc3e439ce3809116a5dd8337c596acfed89b6baaccd5d053b78379860c4f4f646c SHA512 c23457f2267377aefda4842e2300b33ced326ca7933d5d060e9f4c2e419267f722589f7fc9d7793f5b73e1f3cba2a3f863501c44ddf4f50a2acc45ad3b2b862e
 AUX gtranslator-2.91.7-gucharmap-python3.patch 1851 BLAKE2B dd54f2cd05501e0cdaae7fb082c8731b80cf232886ebef70f86b082996ea3c68e67d1c5fbf737a6dbfed14a63727d6cf937f93800ec24859b2e1afda528ff650 SHA512 0a622e707018fcf27c8d29317d87ad967a98eafb6961c447c566a383b434b4c06d8544e7c8575bfe36b352d9e08b2e6570628b4bf41ac3c41af3e31905a7a1e8
 DIST gtranslator-2.91.7.tar.xz 2835836 BLAKE2B e6e1f7b512705152a520a47bdddd01336ddcecb9ca20409546d64caa124f1bca2985fd2a9cd7564983a8411c6a7227d37b55ce8b3e452ee7a0d5beba3460bd59 SHA512 8d2a582e06ab0fecb9c18bde372ca0cd02d426155d4b30b876bd8f2e177c88c79d410adb0297ab85f18a952eeef32c17352cde18eda3c4c4fe33833db25022b5
-EBUILD gtranslator-2.91.7-r1.ebuild 2151 BLAKE2B 68647d15bbede552fcbb457686e36bc80f9cfcfd37c7d66e266b7a6ba2c4bfdd355a2a076863333f8926e63f681e84ce4f27ab3afe75490a6b206a17aaac7a0e SHA512 31547c1651f68d81ef446352424de2e9fba5525b5f23ca302784ecdf6cd82005e8f8376ec1b29f710334d692f3df8fd142a2c59553e3e909225b6559e95986b8
+EBUILD gtranslator-2.91.7-r1.ebuild 2155 BLAKE2B 6e1e52dabd1b6cf90485c489ff1fa80966f1586cd2e16bac7ea8cd23ac1d5fcefdc817b701bf5e42647ec7c0368899cefc2b551eca09bdd32da0e496c6c097e9 SHA512 9d09a607d270e4999fff278ac4acb7b8424acf96ae6951b05022a266f7a806313bf07831b9f47b5bd7184c4c87c8014900cf57e00a36cb867e32cd25582ee144
 MISC metadata.xml 586 BLAKE2B a88ed8865c080411d6730962274dc991abceca8927ae3d427892cfe633a985c88bd6db8b3f409c19f552678ab55ec9f29422a830a4b6c12fa1a8c89d60344e0e SHA512 9f1f582767da7fec99f0cebecc01775b4b76b5eba91015a1c987599ed37bf8f4b031004765dc4388f8094e34034d3cf3636f53f6ac3c7b8c15e8a2e7986fd76f
diff --git a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
index 81f1ffe9481d..7e68b60a02a3 100644
--- a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
+++ b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit gnome2 python-single-r1
 
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 57abe714fb92..9ee77e90340e 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -1,30 +1,16 @@
-DIST JabRef-2.10.jar 15223054 BLAKE2B 1eca45d1da64bb51c7a5e222db9d23599abbb5f7382554651a26f682c8626c3da958b22cfb61a630b08dcebb388dacf984cfd7695d7659f9a370ed1a01f14039 SHA512 833ec41bf8d5a76892ec82f0726c5dcf6382de8b05a949b1d697dbdbb79ba727557069f3267827a7febe6ec4ead996c8de273479b8e3d0363467ec6b91e6bd3a
-DIST JabRef-2.11.1.jar 20375475 BLAKE2B 39e870cd59a9dee403ce765fdde4a6df260eea47eda91f21a60a5ed5b6f147520793dda92d2816489b681bd54a9ff8ea50bb6fe2eaa21ec5df44c18525b395d3 SHA512 515b97f0bdc2a3067260912a3f1fd7b866f420b13e04f66dac99e05b0a9682fead5edf964e7a697f7fdedead7b56011f6822f9610e8533c715486d7fd7b9abb1
-DIST JabRef-2.11.jar 20374561 BLAKE2B 4751e8dbc8c73ba3752100b0a3522a9e9ff74de344ee24e8b41d3a1cd2aab580bdd8b20b3572ef458dfcbcb38136b543bb4fc70a2fba3dde76dde171bc82a824 SHA512 e16703d9a849c56f1203d3d55bd93e9da867f8778fedb09d3783a806f3c24937ba16a06e10c81628571a2f7c1c4e31c31ca2f6a319b77ca00b617b7e3f2a819a
-DIST JabRef-3.1.jar 20307649 BLAKE2B d5d53b79a2cd6a0c0ba14f67632856a8c19c485fa855c3939f1fbd36c98ef87746a6e3bab3698b1f578e4b71bcb66833cb628b25227f22e4fb1d10edf56d02b3 SHA512 aab648f19feecf64a9afe3e69092736c0c2c177ee3a6c0dc3a9a9a8cea6d5a0d24201abed7048e4b569b0f1bb4736c1ad75df056243293e7b82795f50eb16476
-DIST JabRef-3.2.jar 20246639 BLAKE2B 13727aeebb59e98f213de46cec18b6673006e6683d8a617944a0489e96efb0af802f4d17fc67c96104caee545eed3582d221f37ddd27b65a8555c432dc923406 SHA512 db7c2cde0e1d858d14b80f7820a729cac97c74a442e65b18d7c8a7366dbc719bef14e652cf44f04256efffd9d42136e2c865347b3975a0450ec13ef4b3cf71c9
-DIST JabRef-3.3.jar 24456650 BLAKE2B e0ee900e1009d04e2fc7dbea642ecbadf602100db473985bb921a8f0237035e9fa7cde2bd492113abfc8ba5f827c2abb4ef2c704412b7dca7bf9a730c33f5424 SHA512 9d5ed2ff35bccc3d45181be6a013b6c10f1859e63d98b4f5ab2d325a69abf107ea546b78609c9ca620bbf939857029be5d32b92a8eb25be6c526b6e15f41d24f
-DIST JabRef-3.4.jar 24390719 BLAKE2B 4c02630c9479e0b8556f22ded10792b921fc998a1e3404380f5e1f459ae017f3a588fe071df499e7e1486e7a7e8bccc59ec138e85dbbb2a24d1a442ffdb68862 SHA512 310993160888f31d0ad644b562a7f643abfca18c7c3479a7f24db5620ebbdc04f8285bbaa47f46964aab5b61308f337a334b05200214a1084e0def0c0d32f490
-DIST JabRef-3.6.jar 25421252 BLAKE2B 52ea4681d3e7f237308cdfd07e9a99668148b091826c997b1b7eb6be9dbfade5bfe67305d77e19d1734ece310dbe32a9bc16e9eb9ee3d215f79cde594bf2d761 SHA512 756f02fe76b9d04c6a6db149d8f9c6a3365be0922e2bd2af9fba0dd7bc88bbda7ce7843e862e295fc58c1d8c0c95c0d5dee88f024ce51405f09159c308880237
 DIST JabRef-3.7.jar 36702576 BLAKE2B a06dd79792f47cb202573a1e620da3f15c9b29705bac5e712e1c95d4df0c21c4c52d2ea30704b9e7427af11cd52ec01fd83017cb343e728ab1d073a7f2513690 SHA512 74ed9fcfa3e6e4a3facf588d8fa2d73374137d9796ba79aa9c97df6807348af5f5ca9b8670e8909d06847f8501c9a344e300172be444be9b2bd773cd4d6314c4
 DIST JabRef-3.8.1.jar 36739725 BLAKE2B edee679afcbcf3745a251e372608ac24fefc29bec9e99e41fcbbb296255edfb2ea8df38f187efe7d6345855af62e0bee82a835f781418a3202cde19abc00fff0 SHA512 9241fb586da7bc6047dc6eb6e5b31800003bf31d6262033b54629e0c81856b56234a5c671ce7ab87d3b7332a70551c81c2275354e97607ad9f513686c5826780
 DIST JabRef-3.8.2.jar 37003442 BLAKE2B 7414128603c8a3c41c0f88003b504636fa64865fbdc0ed82b23b54855750d56631f55e371382209f331579f47ac4b3d3b1ed1d389f50f168dcc2468dff3a411c SHA512 84546987ffdef106643b3aba3216041809ac42464ff37fb63dbe806e282c19c25139d8532b695a4f5ca8ad638eb23860b32bd3806e82409e2d38425d5a42e830
 DIST JabRef-3.8.jar 36714920 BLAKE2B 4a26b40168a66dd8872ff194ce687589bb5b0c679d24c1f3acb133ead2d7fde4ce305b3ef27e1cab99045657701b83054d42c17a7bc6e25e0afba13e1d6ec0e6 SHA512 15805d06c7a566b60c28035e0f9a1d525b68774395a618e43ed7fdcc053d21e61f5930c658155d2e4ff739821789f2f988ce6e9a5502bd5536ce0a672ee19854
 DIST JabRef-4.0.jar 56583311 BLAKE2B cb45bad15d507ddfa9320b7805c9c8fee4be888eb2e209a1e9447d0923e729683ebac4dc91df29172da062946c9aca816200034106238de573e7c34a31ff601b SHA512 a3e27ae895c77c6d9e6a9bd2312c7b590fe7d9c45a5d42ecc5ebb75a7be9bce27bcfb7d17e06409c05e7fe490b3ff0e6776c3f12b205acb5e95bceeef6823af2
 DIST JabRef-4.1.jar 56793908 BLAKE2B 12d046efbdd9e7d4397f889c8be2ceb495e6c2e66039705088e6459355367f9b5b776a5f3649fdcccd7f74223832cf1dd9adc2ffa6a95f9c48451857b40656df SHA512 8de74dce519d28fafffab2b57aa6d15641f0862ba562de2b0642d1836d16fe30f732707a9582dd8a98cca508f26054d585640bf992be0abc4c9368ca46c6fc7d
-EBUILD jabref-bin-2.10.ebuild 603 BLAKE2B b4cfdfe3b47aec938c39eab787bdd72b71bb251fdf23fdaf7060712d8f0edfb2968647d4b75de3827eb7fac9f518f042a4ca2c523cb158d18575fe3026049165 SHA512 2544d2c4e19e3131512a29312737c73f3ffe8eca139f6d4b951e420213d96ae78e94ef2ad7ad57f3289ddfbcfca7b8ef6ac73d6e02f5be248b5a0585f2013a8c
-EBUILD jabref-bin-2.11.1.ebuild 828 BLAKE2B ad1d916f3539b5edf4b3d859a65979f677bd26a285ce45874568be483ab8dbfe115ec47fa3b2b0bd5c814abcc2e78fdcd72dd9dd8dd4876b0df3f5fbe724b050 SHA512 6f5c3e9723a731eac11fe529f7444ad32b4f491af7d951e6c86cb7244db6fbd394c1af3e491e339fe10fbeded05ce32efef287f850423f67b0131d7576406295
-EBUILD jabref-bin-2.11.ebuild 828 BLAKE2B ad1d916f3539b5edf4b3d859a65979f677bd26a285ce45874568be483ab8dbfe115ec47fa3b2b0bd5c814abcc2e78fdcd72dd9dd8dd4876b0df3f5fbe724b050 SHA512 6f5c3e9723a731eac11fe529f7444ad32b4f491af7d951e6c86cb7244db6fbd394c1af3e491e339fe10fbeded05ce32efef287f850423f67b0131d7576406295
-EBUILD jabref-bin-3.1.ebuild 870 BLAKE2B a05ea74c416d8564bae48f4c7bad8fe6d806dfb39ba2e9dc59abba0bff9692e697771997770506f5288b7d128c314a07509aefe14aa16005d3c64c3cf49941d0 SHA512 539c8eb3d01e3de6fefbdc506750cfc3f79d6f8900734a72905d867eed7d0d015d31c5e0929f330a83a55756119eeafb01a904dad277c25a713c2f1202036a3a
-EBUILD jabref-bin-3.2.ebuild 860 BLAKE2B 1c8b3e2ea6e3641d08de5f46bba0479c268948b6e8877a2e598ff3b9a1b48f9b101bd77907d421d72424797c866430c0b04c8624e0eb1f230e7670db48d79e7a SHA512 25cfc1213aee19d39a7e3fe904157ddf47ae9a354a6b001bd5c46f0455260196f9efa91425b25202ca3866caee509c5aa9d6f558822c66d5a535d904bff39f63
-EBUILD jabref-bin-3.3.ebuild 862 BLAKE2B 979e5b6c6da84ef2ff0a2dd63fc6777114964c637f51556b2bc2e59f98f4d71364c338724463b3680b53278525adf6fc3e16917838b58ec261b930e6e35224d4 SHA512 fbe6ac430bc156d163f9e8cfb4338121ad6e68b6ecdf66312927a92e60179d50cc55961ddfb83f87209937957703bd83861b761e916a863385a1c4e43c23a5e4
-EBUILD jabref-bin-3.4.ebuild 864 BLAKE2B c698510211d73ecff97a4d16767c3a32f34273b63e5d7a95ffac4d9e6a08f78bd309068e5098efd60dc9140dad7b932ed5bf7de73196ebf87b126e948ab95f21 SHA512 c46c42698f69a57e1906fa6a20b923c41e71b2a85d621d71fb108d395a1936a8293dc0d33aa8091d281e86c1b2f84bf19a9bd2743a9c8844b4c99eecb86789fb
-EBUILD jabref-bin-3.6.ebuild 866 BLAKE2B 2b8611a87d1179e8d639d5877cc572c77f03f373531a3af98c95d81baa47ab9edce616f418cee9e11c2ef78b6b982a3b0239b7cddc3b63a31e06cb7eaf40414e SHA512 cfa723738a369055005f5f29bd96b1148cece86feea5cb0e543a2d1e879dad5be9f9e3ed99029dd2bbf6568ac699546dd49371671e1ebc24b7c53255f207a945
-EBUILD jabref-bin-3.7.ebuild 864 BLAKE2B eb19455996533923d59e5be9db0af51b235896d02e936c1cf265c9d56681f93af74572b3be1abea8633533e79bd9e59fef72cb3b596886e05167fceb84e028bf SHA512 de433c0159c235682089415e190723c35cf43d103f3057751dee50f294841cc5b274d0f06de63ea875bd2ff84c4765d3fd93a0b170df09822bc785a95e928561
-EBUILD jabref-bin-3.8.1.ebuild 951 BLAKE2B bdc40e7842b802e816bcd75b15ed9415597f88655ce3ba2b064c695d59fea0fcd41ba746aa7097a57529ea74fd6c490c6a4171e014b8c251dadcd78665a00290 SHA512 6694b2a83bcb8830c754b5fe79284dd4936070b2ce0ae65426482fe869390d8534212b6824c39a3be1bc5755d7bc458959185e9ca483f7d2444ec0bd30b8dcdf
-EBUILD jabref-bin-3.8.2.ebuild 947 BLAKE2B 4164bbb76ccf38a30159d1302fa1dfc38cb45bfef9c225f4c4251b28a89e4d02928b7c2f7a5cd482f0b683d9502833b9dce1bb48b4b22909c4306efb6f404c4f SHA512 4adbfaf1cd4059428418f0589ad06a6aa44eb1ee57fb82678798f80354a53afaf33ee0384db1453a42fab786bf2e339087c3e176c7dd23e9d327c0423e2a5219
-EBUILD jabref-bin-3.8.ebuild 956 BLAKE2B 171b06778cd69642e253f4d4cb8af003d9f7cf201cc92bfa4aa1be7ea2885f191a2d3ce9a5693aab35a54dba33acf073e0fadc387eb2f0307dcb6eb8387c5210 SHA512 fc4c01169ba38ac8beaece6f2240791eec8c361b0a72bdca2fa26262115ef8d7e5c64b69d8398c21c7ee6d41597c837da6fb1aa3aedeff18f216228bab96de1e
-EBUILD jabref-bin-4.0.ebuild 1237 BLAKE2B 2ef869ac348b75a4557db15cad1983463a40cf7f4b3c51da7bf5bbd08f142c9550def6a9ce2684fc290f3e7b26d41c076080efd9834046ed4ef79075d33994d4 SHA512 dd902f44aa68c67b7eab9696969cfdb03d49e1d11d3c6fe50171fc3044bef73884803c880618a39152e8bed0e94975f6a48b891e9a3a2afe31a54ebf54bb5c18
+DIST JabRef-4.3.1.jar 56868438 BLAKE2B d970599f6bfd4fef7ceda656fafeea77b5c2860ece1b5086bf895cbf212c49bb5e573f5573c483a7fc62431266899dbac7a9bd8e20308d51f5ba2d0c8814319f SHA512 6ff466e91d827254271e5728a9af9c46ac811c2e4fe01c01a2ec6ef9cc75d20978803f18e49365c8a695b0d2db7009ecf05f69f446b9e9136dad5526d5e83f19
+EBUILD jabref-bin-3.7.ebuild 864 BLAKE2B 2bb3f6d6c210c50bb737e7929283236c8771f0192b3b8a11a139ff317e375ff02d88716bacbee0be107a8038805f5acee025931eba47d21c1e4858fadcb36123 SHA512 243e44d36c417ed77c809aab63a5eb527e525874b786cd3d75ab487894e0cc27fd190f942a763aef4e3878524c7330da2dfeb43ce198cabb42ea44a73d377131
+EBUILD jabref-bin-3.8.1.ebuild 951 BLAKE2B 486b75b0dae55f9245cad51e5f5c750097adea5341e922ac0e2032e7dbbeaee56ba17a9f4c54e6e44e36bb4d189607cd752270f885893ab95c77d8a759cc48e6 SHA512 31e3af881a254bd9acc969e2ba538dc35206c360abe879827acaf80914ea557ff6e7e2c3f432a939314f37f7b3492e7beae5e2e722dc34b66fe66a7e64a90321
+EBUILD jabref-bin-3.8.2.ebuild 947 BLAKE2B 2b18c663846b348253c37a8c2adbdc22efbe1b6ab77b476f14617f4f5322dd7889f1921a19b0d1226d63dbb7597011fc7663f0f44ef9eaa39af3e0117181e782 SHA512 d7693a07bec915d348e3585defb30093bfd6574e023c16ed7d266c88972f08e7b87d145428d2ca789cda26702997b82365663c709dd3a38b9823f3ce1993a38f
+EBUILD jabref-bin-3.8.ebuild 956 BLAKE2B 1f2efdc7390090f0542a1bee2546f644fd0ae37ee6a598cabd9e4fc953adfbda423681bcdbf8a6dfc2348abe3bcea221348f97798c7c7229708c2a2c15b242d7 SHA512 4b0bd398d248eacf573dad7ab6fa70e5f49d3efb942a461bf4297801838031651aebcc786a9d0335d799d5c029f2ae2691ab5fad6d37a5d867b2e8e3e8a6f2d4
+EBUILD jabref-bin-4.0.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
 EBUILD jabref-bin-4.1.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
-EBUILD jabref-bin-4.9999.ebuild 1209 BLAKE2B bcc73affd51feff2facab01676d4363a591aee1350684d69e1f6c397a58e2479923ee8feb8aa4533a465c4ea577db5ddd0a12dcde6acd4b53122e418e0cc7ea1 SHA512 25b5719b5f88529cfbf700c2da655f8c203cc6548997f53bc18866bd3675c4e769168e457781824c8f2b83298c0d8f10d1b70df858cb2a437cfd9506ce555e6a
+EBUILD jabref-bin-4.3.1.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
+EBUILD jabref-bin-4.9999.ebuild 1209 BLAKE2B 4acf2b1a219c94010c74edc7eb15780c553978faf148d18b57df1cbb0e5dd018be7007cea6bd04e442b10e5fcbeb30960721eeada97a78866df6d3b9e06834a3 SHA512 141ee714ea516d86b8a303c18e6e20176bb47f33cd737ae0229094076be67b1329ce5d6b9f8ce6fc48fe6c4281631e87f9c44553c8e72cb1065107798c2f4509
 MISC metadata.xml 911 BLAKE2B 126cffb014bca2a1ac056adcbfd52140c8adf76547aea45de34a9d98a4e7c77d1e175e302e7f1cd3677181dda238bf4f75754f9f9a2dfb981196fc8b974d0fd3 SHA512 7a3e7ab167709c28857aed83ffd4e3ec5b202b9d444b4fc7a07c33d2415316e4aa8f22b80cc2bd281a1625e02503bbb5b517c01efe6a70558b2b9815b3b7f2b3
diff --git a/app-text/jabref-bin/jabref-bin-2.10.ebuild b/app-text/jabref-bin/jabref-bin-2.10.ebuild
deleted file mode 100644
index 0820eb6e6bc6..000000000000
--- a/app-text/jabref-bin/jabref-bin-2.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${A}" . || die
-}
-
-src_install() {
-	java-pkg_newjar JabRef-${MY_PV}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-}
diff --git a/app-text/jabref-bin/jabref-bin-2.11.1.ebuild b/app-text/jabref-bin/jabref-bin-2.11.1.ebuild
deleted file mode 100644
index c55d7e11f04d..000000000000
--- a/app-text/jabref-bin/jabref-bin-2.11.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${A}" . || die
-	jar xf  ${A} images/JabRef-icon-48.png || die
-}
-
-src_install() {
-	java-pkg_newjar "JabRef-${MY_PV}.jar"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
-	newicon images/JabRef-icon-48.png JabRef-bin-icon.png
-	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-2.11.ebuild b/app-text/jabref-bin/jabref-bin-2.11.ebuild
deleted file mode 100644
index c55d7e11f04d..000000000000
--- a/app-text/jabref-bin/jabref-bin-2.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${A}" . || die
-	jar xf  ${A} images/JabRef-icon-48.png || die
-}
-
-src_install() {
-	java-pkg_newjar "JabRef-${MY_PV}.jar"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
-	newicon images/JabRef-icon-48.png JabRef-bin-icon.png
-	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.1.ebuild b/app-text/jabref-bin/jabref-bin-3.1.ebuild
deleted file mode 100644
index 3703a092e2ab..000000000000
--- a/app-text/jabref-bin/jabref-bin-3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${A}" . || die
-	jar xf  ${A} images/icons/JabRef-icon-48.png || die
-}
-
-src_install() {
-	java-pkg_newjar "JabRef-${MY_PV}.jar"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
-	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
-	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.2.ebuild b/app-text/jabref-bin/jabref-bin-3.2.ebuild
deleted file mode 100644
index 79a8e5e6a71a..000000000000
--- a/app-text/jabref-bin/jabref-bin-3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${A}" . || die
-	jar xf  ${A} images/icons/JabRef-icon-48.png || die
-}
-
-src_install() {
-	java-pkg_newjar "JabRef-${MY_PV}.jar"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
-	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
-	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.3.ebuild b/app-text/jabref-bin/jabref-bin-3.3.ebuild
deleted file mode 100644
index 3b4bd83b98ca..000000000000
--- a/app-text/jabref-bin/jabref-bin-3.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${A}" . || die
-	jar xf  ${A} images/icons/JabRef-icon-48.png || die
-}
-
-src_install() {
-	java-pkg_newjar "JabRef-${MY_PV}.jar"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
-	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
-	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.4.ebuild b/app-text/jabref-bin/jabref-bin-3.4.ebuild
deleted file mode 100644
index 2fc1f51a3d03..000000000000
--- a/app-text/jabref-bin/jabref-bin-3.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	app-arch/unzip
-"
-RDEPEND="
-	>=virtual/jre-1.8
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${A}" . || die
-	unzip  ${A} images/icons/JabRef-icon-48.png || die
-}
-
-src_install() {
-	java-pkg_newjar "JabRef-${MY_PV}.jar"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
-	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
-	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.6.ebuild b/app-text/jabref-bin/jabref-bin-3.6.ebuild
deleted file mode 100644
index 59fb615fdd29..000000000000
--- a/app-text/jabref-bin/jabref-bin-3.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/unzip
-"
-RDEPEND="
-	>=virtual/jre-1.8
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${A}" . || die
-	unzip  ${A} images/icons/JabRef-icon-48.png || die
-}
-
-src_install() {
-	java-pkg_newjar "JabRef-${MY_PV}.jar"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
-	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
-	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.7.ebuild b/app-text/jabref-bin/jabref-bin-3.7.ebuild
index 305d64f7834c..1e671d607b1b 100644
--- a/app-text/jabref-bin/jabref-bin-3.7.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-text/jabref-bin/jabref-bin-3.8.1.ebuild b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
index 73c9a8ac3519..c69c8a61c6e9 100644
--- a/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild b/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
index bb4572b0046b..a0ff6dfe94b0 100644
--- a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.8.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
diff --git a/app-text/jabref-bin/jabref-bin-3.8.ebuild b/app-text/jabref-bin/jabref-bin-3.8.ebuild
index 7168c09aeec3..9bd260099483 100644
--- a/app-text/jabref-bin/jabref-bin-3.8.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-text/jabref-bin/jabref-bin-4.0.ebuild b/app-text/jabref-bin/jabref-bin-4.0.ebuild
index 05500ee88f03..a4bf511e4d47 100644
--- a/app-text/jabref-bin/jabref-bin-4.0.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.0.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
diff --git a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild b/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
new file mode 100644
index 000000000000..a4bf511e4d47
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_WANT_TARGET=1.8
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://www.jabref.org/"
+SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="
+	|| (
+	dev-java/oracle-jre-bin:1.8[javafx]
+	dev-java/oracle-jdk-bin:1.8[javafx]
+	)
+	>=virtual/jre-1.8
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	unzip ${A} images/external/JabRef-icon-128.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+	ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
+	ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
+	ewarn "Jabref 4.x is under heavy development and very unstable."
+}
diff --git a/app-text/jabref-bin/jabref-bin-4.9999.ebuild b/app-text/jabref-bin/jabref-bin-4.9999.ebuild
index 7f9e3811a59c..9c54f3b9b7e9 100644
--- a/app-text/jabref-bin/jabref-bin-4.9999.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.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=6
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index d4fb74782b66..dbbe03ff611f 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,3 @@
-DIST kbibtex-0.7.95.tar.xz 4060200 BLAKE2B aa08cd10c4e67bd8cdfc52803df03326a3c49b86aff699d7be2c40082f5d7359ef8aeb399dd3ab7c6b62f63274ad5d545c6acdaf4f77ed2b922583346557e76a SHA512 683456504861271df46d4b423ed8994f7e97d653e3b634c81c14b0187efa51ebae6d72bc4ccbe7cf18682ccfd9ff2cfcc2ba399a1d7f6bac62e3cb9e79710cd6
-DIST kbibtex-0.8_pre20171110.tar.gz 11423893 BLAKE2B 78bcd72da35775d9927f35b865aba1e5ee88fd6391e5b354dd23d319a17a18c5aa521d32f58f1827a86bf33d1a42e7bef19940fdd1b83e67124b7335520bb1cd SHA512 719c40e78e22dc936a5395bf299962b4ec657df89877df78f17139dcd9b45a7ed98ff213a7c8a0cf0eeb4960a3b10cafaf7521e334a3269f96e2abdcdd67c913
-EBUILD kbibtex-0.8_pre20171110-r1.ebuild 2023 BLAKE2B 034890e5745e0d58442f985ad50a6abb543cb83a3f18f77d18110bc9e83b0b893e3d2937836bc4d0437114ea343bde2e78325c4a6c250a33708b14e56ed67901 SHA512 11b1445ecde7738e4f8a1818b8c7772d460c08dbbf9b8925c6f2eba095e54b9b53bd075cb5a3c0b616d6bba74194bfe4c225dff8ebe530bcc3dd855762666de0
-EBUILD kbibtex-0.8_pre20180526-r1.ebuild 1991 BLAKE2B 22fc9408993aa7c551b1eb9b9b02932c89a226650791a91db1af54238380e63582ce8cbdf7c610383023be26a4d362f1e81a42292d4926aafd386a7a4a4e4209 SHA512 7af2687fb97565c478bb38f1fdde5efdac067fcf360c3d356b63ba171dadfb955e1dd02a8e6d0375468caaf3073570d4537d9232a110d41cd297b72382f23719
+DIST kbibtex-0.8.1.tar.xz 4060484 BLAKE2B 1dd100b0c469955f273907d79765268fdefdd4ae05faa851f4c1823c41f312810f2992113cda97c1f8e19c4c3bf35e7e79c6a0bc12cde60995edbd903a9b5ae3 SHA512 73c318b1d29de98761f43de9828a48e943528f413c6c2489e916f88ef4ba1424a300bd9eddd10fa763985322248ef863cad1b8cfc681f083eb9acdabd6c6dfea
+EBUILD kbibtex-0.8.1.ebuild 1939 BLAKE2B 391e01cd97909347fd764878562f327754be35dda6ca3f9d1e6e657638f75bb477bc583747dad0dff3d940842d1806dcf6e3937c4c5eb34b4b0b355f2ba299b8 SHA512 59844f3d031fdac85f1bbfbbb352fe693dd7b4030bb938fcb26543a4a81787ca54e36aff184dfb2ad9d881cd2054e95a4d3857f9d10197a3dec44521cba44356
 MISC metadata.xml 518 BLAKE2B e10a5e38918c43315c3804c787f80c6df00f7a37da896784a1ee932a90c7f6c15d8a1fc69313314dadaf01461b65e6be78b189226ccae9fda5422950a86edb63 SHA512 be7be6b52a067ed23384344706adaa13cd06667e768a9b5adc2d93b2edeb5feec426dc83395a226219a469bb5fbe99d378b5e1c87ea82e17a05c9751f03e12bb
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild b/app-text/kbibtex/kbibtex-0.8.1.ebuild
index e581fd7cf61f..498364c65ead 100644
--- a/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild
+++ b/app-text/kbibtex/kbibtex-0.8.1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-MY_PV=0.7.95
 KDE_HANDBOOK="optional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -12,8 +11,8 @@ inherit kde5
 DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
 HOMEPAGE="https://userbase.kde.org/KBibTeX"
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/unstable/KBibTeX/${PN}-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
@@ -62,8 +61,6 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20171110-r1.ebuild b/app-text/kbibtex/kbibtex-0.8_pre20171110-r1.ebuild
deleted file mode 100644
index 80b33afdabdd..000000000000
--- a/app-text/kbibtex/kbibtex-0.8_pre20171110-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=4ce7c51f163508f293c3fd39a716770cbb14ef7d
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://userbase.kde.org/KBibTeX"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-IUSE="webengine webkit zotero"
-
-REQUIRED_USE="?? ( webengine webkit )"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	app-text/poppler[qt5]
-	dev-libs/icu:=
-	virtual/tex-base
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-	webkit? ( $(add_qt_dep qtwebkit) )
-	zotero? (
-		app-crypt/qca[qt5(+)]
-		dev-libs/qoauth:5
-	)
-"
-RDEPEND="${DEPEND}
-	!app-text/kbibtex:4
-	dev-tex/bibtex2html
-	x11-misc/shared-mime-info
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package zotero Qca-qt5)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/okular:${SLOT}" ; then
-		elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}"
-	fi
-}
diff --git a/app-text/landslide/Manifest b/app-text/landslide/Manifest
index 799eb9628cb9..741e25f52065 100644
--- a/app-text/landslide/Manifest
+++ b/app-text/landslide/Manifest
@@ -1,3 +1,3 @@
 DIST landslide-1.1.3.tar.gz 151003 BLAKE2B 471cc83cbfc1c7ddc437b88514fb48632016e0915fc27c65d502a71b94f83a1184de8a7dbfaf2af8b75963e687c1af903add48e5ac8893308d9cfa07fdcc4c61 SHA512 2b29c416f8af04c0bf048060e0fe67b0b6a5e293485c5e3f68b9d1ce9d63ef66ca3bc58a96f65705c6918542932ef0a2fa6072b17c4c01cfc1975d283b417152
-EBUILD landslide-1.1.3.ebuild 817 BLAKE2B 23675912d5d80c71df265e6990f800ae677ecd95d729a7d604bd8c179ed2532413df9fc3743210c32539390652536e04a2f15cdd66c84ffb9b55fa9fff892d4d SHA512 216fdf069c2d726f729efcde3fe53ca50533fb5c8c3a0cdc3dae16832acfbca7ae03d4779c248c603b769a66a861c502b5f2fc36300cef7ccb5be04c82a788b6
+EBUILD landslide-1.1.3.ebuild 819 BLAKE2B ce8070f581d056ca6a7e2b58dd3eaf2681f789b8bfb230594ad3ae4a4334580253d275512a66297ebeb2c62148bc7eaaedeaa2568ab927011db6cc3f90d6bbb9 SHA512 0821de505a6fd2b0e68ae3ac30faff81e71293af4097bc2c952e91a0f9e52dd02b93cbfcb68d116027436c4769422b2fcb5d4d395566f94a2c98973825f8dddb
 MISC metadata.xml 298 BLAKE2B 15316fb3bd0eb0be967bec08510269e31406e72c3cc7623d21cc2334bfb36b8031bf304c4627b085fa64cfec15964cf9a6a486ba29bf312facf1589f36cd9819 SHA512 19a5bf1f42b94a00856b856fc0120024df40a4394a17e61fdacc817d1b355b601595a27cc0f814d3f6b436775799b44aa4f5090daa91452b55d4760e8c89b8d0
diff --git a/app-text/landslide/landslide-1.1.3.ebuild b/app-text/landslide/landslide-1.1.3.ebuild
index 686014a4ffdd..9d41221f1cf3 100644
--- a/app-text/landslide/landslide-1.1.3.ebuild
+++ b/app-text/landslide/landslide-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index aae84f9f8352..1254005f5a46 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,6 +1,6 @@
 DIST libmspub-0.1.2.tar.xz 345556 BLAKE2B a3b47fb188fc859abf54e3375514d31a1fafa21fb57fe0ac4a20013741a223a7011adf8ce7784b61346b49e9f4c0b6c353138dc12a5035f7bcc24576a508aa50 SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
 EBUILD libmspub-0.1.2.ebuild 1167 BLAKE2B 41b323d700a9a2096a7b5f265df9d6511605b8bc0940f0ef47380a27125ae07f32deac57dad92ace14beebe211cea81b1350e5a74d866fe9ef826dda69d8552e SHA512 523d3d1660341335b2b5e6995c84e794bff2920f18ba2cd36400ffdeb69c83718c42296422527e225cef9e6b86ad6dea1f613947936c7601aaee429d0bb8252f
-EBUILD libmspub-0.1.4.ebuild 1169 BLAKE2B cd68cd7f1b6b51358e78f59b7af38a3da8e9a04c4008e39209bda33f6be03b3cd34fc6ba341277c7434ab4cf99d12ed1b3a29e01a68fbb6d8ff4274e34be11d8 SHA512 51d391abb02111bd9628f8abf9f63171e09f7eea345774989c0e214ebde21f0335870371cbe9a6badf3b72bbdd489d5c7726ab5dbe24c311d60c80978277c37e
+EBUILD libmspub-0.1.4.ebuild 1168 BLAKE2B fff7ee4af9526add5ef82bb18ff471b0914737760f0bd93f3642c5f636ca9ce3196ae3084f1f3e85b13f71b8beeb592bd425b89a755f633c39be9e168315302e SHA512 1ca54c51d7e88b9f65a615cc2c25e52ca62711e09f297c7fe11021c1ee37380a790d2f04af01b6ee9b19dab3d216e6ec876553a4a68d57fecb5170924abd9328
 EBUILD libmspub-9999.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index a7a301490ef3..f881fb03dafb 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index a7ef1a4c462b..6c38c805d78c 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -3,5 +3,5 @@ AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e0077
 DIST odt2txt-0.4.tar.gz 23997 BLAKE2B ffa2ac915c1c239cfa7a498fa1597a2462bc7ecd2fb08a90ab50f21a60dbde8abffa52f4b4c40591732f7d497f08774555b36d880214a7708f2c05b692a18908 SHA512 65642dccdb08408e34d484d78be9777aa374cdabbcadd2ab54f43df29db506b136f13e5af720b9b6b6cfdb8508e4fab44159302d35fc002a22979efabf69bfc4
 DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
 EBUILD odt2txt-0.4-r1.ebuild 726 BLAKE2B 03a906d6431d1dda4f291c6be4d961dd235bebda7cc72885292d74eb3ef6897ac68408709c0ac818668d5ce53c3a3a28833a150be5a7d05154644bed7c3f6e21 SHA512 832fffdd8c1f62f71215d804541fe0e041726acc8a1964f3733afad1ad30d08f7fc7075c28ea8d7764225c1dea7cd086343e1b40e345040b9d45594d1911d877
-EBUILD odt2txt-0.5.ebuild 735 BLAKE2B ef0051bfe8979bce952e4f9bf2b5099cb5099c18066d973f2879533df026ba2f3157f2542093b4c84037204ad785ffc99e57e86e79acc29fd93501c9265fa0ac SHA512 84433e49a5688c6212755591287143d9c30f79c6f325d6ae374517550aeb8edc485c5a378d94db29189ba15cfbd7a069a72be6d8e3dc2ef75a1c1b777b3f79b6
-MISC metadata.xml 371 BLAKE2B 4d1aead738a47efd7e138ee8fa85db08b5aa64dafe7d06d64f8fcd093b741808a62fa541920a60fa120233f88dc5a5a92380e848db5ddc54be7152d813e4d174 SHA512 1fe5f8d199becebd4dc33c017d8e6f608f47f5770abde2424cc0517da49502624a8eeca6522d125bedef31c3f7aaefa6ce3a2a871ea46d28d2314bf0dededa35
+EBUILD odt2txt-0.5.ebuild 734 BLAKE2B ced2ae39bbf6a14ac6a03fcd04c319ccf818fda352f10a08fdd73e5a56b1e4708bbe1a1deb710eeecba8383e9d830e7798efe26354786d0c0d7988f3ecdf5f69 SHA512 11bd6caddec71145458b7b28198677fc3617224dcd67ea2d675db3ba368fd670155deb0ff36e366fc63c6d951ce6eb9ab88c9d534db0361a5d7f07e39325e1b2
+MISC metadata.xml 167 BLAKE2B ee34aa7c86910531f97e3ba5ec71670012761b3523ddf4e0e1fccb2134b6ddaabdc9329c3b45d697b4f745a707dd513f6b71a8cd32fb840a6b0b5af774ac0015 SHA512 bb251ebe24a6b0c9ff8ee0298e1aa3653443fc97bf44ff71ff56b88b82c36696a5db75c19cb345a1852e6a455874c603efff97b15799d7e8a224124a312df8b8
diff --git a/app-text/odt2txt/metadata.xml b/app-text/odt2txt/metadata.xml
index 37285a1e6899..684b678e70f5 100644
--- a/app-text/odt2txt/metadata.xml
+++ b/app-text/odt2txt/metadata.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>clabbe.montjoie@gmail.com</email>
-<name>LABBE Corentin (Montjoie)</name>
-</maintainer>
-<maintainer type="project">
-<email>proxy-maint@gentoo.org</email>
-<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
+
diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5.ebuild
index d9bcf722b1bf..1931fab8e2e6 100644
--- a/app-text/odt2txt/odt2txt-0.5.ebuild
+++ b/app-text/odt2txt/odt2txt-0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc64 ~sparc x86 ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc64 ~sparc x86 ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index d2717a425bb2..87bfc97d0135 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1,5 +1,5 @@
 DIST pdfgrep-1.4.1.tar.gz 151926 BLAKE2B 68b846b26c28e8209fa3ac7a7e6fe3d0c4c6a298e9bea2e3929fd82a44482ec914bd3594f3e07da8c56766e94ca3d4c3c2d6997364393e95b3741b1bf9685ec5 SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735
 DIST pdfgrep-2.0.1.tar.gz 187217 BLAKE2B f498158e63e2f8419829df0d1801a31d3dff02627ccf0efee7239650203300233d1a19a5c72c57eb24495f2b5403e0e2c6a479b0f28a8d053aa578c732866b1a SHA512 4285f8cb514975a0040cdd6b82133090e27ba5c2f95ca880dccc3dd4fa3427260a5fc73d807df9124a79fa36ac6ed8c11380cde11e00599ed7134d92c50df4a0
 EBUILD pdfgrep-1.4.1-r1.ebuild 607 BLAKE2B a47cbf6264079ace41df672bbd62cb0585aa9ec7b683f42dca5c4f157ac2c461dab5cbe84acfbafaab58fcaf4e3b40aee6a97743c37a983017a009081df36cd1 SHA512 452781a1574939f7ba9e47b601c67a0897ed7f2f422615cc1bc9bfd98e7d1d90700b2de0132134aba9ea930aded068ad7cb4298b88b4d21da33b2bb5078af91b
-EBUILD pdfgrep-2.0.1.ebuild 639 BLAKE2B 5d6ffc89dfc723b0e309640c086e52d8ad2481cd7d5bc2fd516e7c1b5df7081bfaa99e0af8775a853fb4f4213794ea748cee7974a51c6ba988f2038e52f7d7aa SHA512 ad7e531f46569bdf9f59071068b93e197fc4ce3679fa91d1aaf4fd6d19334773b500fe46e659739311c97b56974c9d830732a9e9abf24f87f97017f024c05f96
+EBUILD pdfgrep-2.0.1.ebuild 638 BLAKE2B 36037efbe53f9981088d18203265353cbc0bc3761faf5c931bbcc3138b42d7efe326ba2f7e33619093cd51313698c7a861f3339cbd4b639469b2ba3f9a9bb3d5 SHA512 06b890603bd08c50e0d870881db47555fa927f976010dbd2bcbfd008cac608d7612b9dddedfeb2f6fa044b79ad645bb55bf0db403f06c236d70a271dc3a67188
 MISC metadata.xml 573 BLAKE2B 1d00ee8770804161567e271e2c983e331788ad5374e8f0b06a31a797051f43e4e7e8ed6d54f9c4a26347267f9b17332939ae0aeffa8389880ef1820dbc2272b9 SHA512 4a346cf15b881da8b56dfaa9899134163e4792ca563934c69d0c58591a8dcd12a96c2b4e0d2487957fbd5498e85af501603a312f0db39994050e610011e683ed
diff --git a/app-text/pdfgrep/pdfgrep-2.0.1.ebuild b/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
index fb916b4566ae..bc4a71cddff0 100644
--- a/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
+++ b/app-text/pdfgrep/pdfgrep-2.0.1.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
@@ -9,7 +9,7 @@ SRC_URI="http://www.pdfgrep.org/download/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+pcre test unac"
 
 RDEPEND="
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 856664d64c1a..e52175872e56 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -5,6 +5,6 @@ DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c
 EBUILD pelican-3.6.0.ebuild 1219 BLAKE2B e21a02d18a47ee5d46409e35e09ae7f76fc969264560e856b165a25f6322bc3625e393b9df834c8d294e333dba60c6a45fc9500abd7d9838790620148abe12e1 SHA512 ed51abdea2e38145275804b672b34f5f1dca3b9675b84976b120ddaa6b2b150b06bbc0f5e7be15210d8d656089c7a5d23dbed0fb666d17c1affe839f3c4aab28
 EBUILD pelican-3.6.3.ebuild 1542 BLAKE2B ff3c6bb148c000677a9d322e23cc4a94d192598e7cfdac029a88a7b43a0a33fd75da616f7ed1887494eb48a434e5201884034d97bd756b88699707cbc9701764 SHA512 f52d04c4d7c1660d034fe4ebeef6bb99dc0853463afc812cae53ef755ac1f7eae35404a852570fd82685c865bf63eb2a8e6ad896e4bb6ccd7471b5020bf7f401
 EBUILD pelican-3.7.0.ebuild 1471 BLAKE2B 3c456e5348ec3e8de5b4cd0cf08266f525cabc42c98fcc206550c7f11d1f7a950daed077fda5f5cb2a25d87bbc78a93da01cd2563a3a0189e48e7609f0e8d9d7 SHA512 03823597ac2356e0c2946c15c18ab5dc544bc6f789797c6044d7c2b0aafea03954ca5f6697274b31df1e5c7020f2bf95e6a7217025a5da1a23622e7e72e827f7
-EBUILD pelican-3.7.1.ebuild 1473 BLAKE2B 90258414711ed15b27f67c1eeb5e4b20901a441eec06c82d12a382f63eff80454b2cd8ac690e05517883b2fd64bcd3c9f22f535e9cf68329a5943defab266ee0 SHA512 0ba4d178c17d99bc130ba6578ee0e938264ff1eca78ed6ebbb9399280c83fb278948622aa33edc5a0efc51010797f8010738185c66b350b256a299d361a88b9b
-EBUILD pelican-9999.ebuild 1548 BLAKE2B d79dd4263809b70a2486158e2e908440256d9bb456abc0cd9b42f4cd17bbf6382ba458c04c3b3eba6c3fa8d40f78fbdf72f739527da3529e1a1017fab45a9add SHA512 ee80b8b740dce111785fd7829958c659b7d53b846af095453d72ef1c804d6e65f684fc3da47f9e3258d08db596b140db098c8d073ade6446def5476e8ba1d747
+EBUILD pelican-3.7.1.ebuild 1475 BLAKE2B 9d2de4c9d95c66c4f58fec74ef8b8ed5d804539edf66684c53c00a2b668316fb0752ff612eea3dca024f7192a91d6d99a4ffa4b99b2dd00f532e7bab133d898c SHA512 4df5e139aec385af52f994e83ea8250eb73625b24fcf17a7dc344c0a57f87733d15cd0e5ae53fd1c8ce62e28e84c1e2c0960537cd524780382e17d9b5179f268
+EBUILD pelican-9999.ebuild 1552 BLAKE2B e2ef90c3d6eb63e1e7e11f62b0605ed4d93a4d654a1ba3c0fe7a8a07134dac21e60f11059802346512419188e013cd141d887f08150166d55f6e4132270d5e42 SHA512 666fad2f7b97bbb8ec69b1b56cc1d5d1da1113af11588696e9ef35b1a375341c7bf89e49c1a01ca640d3ffd54fcaf60040c2372b4eb7f6f4346680b9eca7d7db
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
index a2d838d99469..2ef91da11647 100644
--- a/app-text/pelican/pelican-3.7.1.ebuild
+++ b/app-text/pelican/pelican-3.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples markdown test"
 
 DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
index 2e5e1b867c25..e2ca3d7b95b5 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 3424cfdf9d5b..2325414669df 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -2,5 +2,5 @@ AUX pytextile-2.1.8-sanitizer.patch 606 BLAKE2B c916c46156ae5f01b7d6714b7c9acd07
 DIST pytextile-2.3.3.tar.gz 42277 BLAKE2B a6e6e1d96695f3ada03f5da9bd8bd19b99da345d83c62b1d4f2e765303dfbbbee072da4611f1b29b46d28ed334373c809117940ff0c1238dea3b12fb9076656c SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60
 DIST textile-2.1.8.tar.gz 34002 BLAKE2B 0f4643da3cf47cd9b27e7b3237c6eac8b951caab9f6f36da929e159d582ae9e8ac04b835bd9006d7392ed935a875e169eef276caa52e25d618cdeafa27cef626 SHA512 b1675a131b482f4926efb45312b16c722ff158d9296704918b56316d470056f986ce18d495525a8e9f236bdd62e09ca6a17b443a7db8c8c36e5d05fcffce67da
 EBUILD pytextile-2.1.8.ebuild 924 BLAKE2B f30969b7afc0102a049e25f6943e37adead616a6d579f07754e351826d347320034895264457bfdaccb7ba388a370ea3c24bf11903c39562fba6df1cb0ad13bf SHA512 7a38a87b3459aeaf5af5c07db276d5b2bfa931d8fbd340b45d27e80aabbaab096e6dfdf2702c18416ae978015b2787b62ea4d1133234b842c40c8144ee389e73
-EBUILD pytextile-2.3.3.ebuild 1006 BLAKE2B fad699d0e990f8107721c1e2d0eeb1fa29facaea59cd30123e53800d6d5cb940f436ebe5a8b674e24b352d3f0a18968f4024bb84d77261cd6e8cf45214bedacc SHA512 87c996d122485723bd97e50b30a21633d599f57d3d6db16053ff2944a735b61539b68ceebab527a30de553a118abe2c1b80281a2bbc7105142ed049fe3a1fff1
+EBUILD pytextile-2.3.3.ebuild 1010 BLAKE2B 51a8857dacb5589ef8a296c8682acc1aea131e7f8f3d46b42c471c4348aa8cf3328f126c4e8dd6e1c35d2cc861e3601463b3f518dff1ae4104962e022755d533 SHA512 81bf94b7819e48bed1128e71c73b2e16cdedc339ed3ec8ee9f37fd33dfafe9ee152a995799d84cbc33002f10f0a062eac710819577e44ee3af25a2fe6f14dcdf
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/pytextile-2.3.3.ebuild b/app-text/pytextile/pytextile-2.3.3.ebuild
index 4641ee712126..3a17b6c192d4 100644
--- a/app-text/pytextile/pytextile-2.3.3.ebuild
+++ b/app-text/pytextile/pytextile-2.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 2c857f074f97..acac51261cfb 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,4 +1,4 @@
 AUX sigil-0.9.8-proper-gumbo-install.patch 1351 BLAKE2B d24d6e0be9b7c56c944aad2d97528ef38b3f96b4d81504b1169095112cc939a662101754ccc9f4d8e9303cd0e9d2ad084e8c86c32d73d43720d1a1736ec572d3 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89
 DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
-EBUILD sigil-0.9.8.ebuild 2243 BLAKE2B 15162b1409146781c53ba3270486745192d0b99173137b2725fbc4d8109ee34ec572828e3978a7104eea91228a725008fdf77e3911d97fce928bfba81a39d8c7 SHA512 602fdbcb111823fdd2f3447567d3cb02d1e3f089410c0c15453958f77775a56ca7282480b1c916a2499dca2a9665f7229f1edd471732ae7914aae50374efbbdf
+EBUILD sigil-0.9.8.ebuild 2239 BLAKE2B cdd30741e8baedcc5a3beafb84bdfdea692aa9ae149188c3142ff78b85cd694c3fc6335ba7552d4652b0fae92d4b787cee518c832fbe272aeef7854e8dc1e5eb SHA512 1363e6b342a3944559016cddfa52de131a2b7600a0f2699cbbf4e077683d48ba87ab0a0a222c9d279bf8bbbc7779327c048cd54e61fc1459f6997ec54551bf2b
 MISC metadata.xml 389 BLAKE2B 8f9988168470e8545fa0fa47e520d7019cb9cf1ba8af0c502fa0b66a8a6a4567feea882d0ddc44864aac2193b411010eee2bd7d5905c68b34a32550ba4f6e223 SHA512 0728fc5f14cceb331ea75a6231d176ecbd22defa77b6d90a6859ec6e001feb3cd1f9c57c779bdcf83f81a4f7dca06e120964d6c93e372e39584293addacb5929
diff --git a/app-text/sigil/sigil-0.9.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
index 533b009579dd..c033f4ff46fb 100644
--- a/app-text/sigil/sigil-0.9.8.ebuild
+++ b/app-text/sigil/sigil-0.9.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index f056e3273577..561648f3ef2e 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,4 +1,4 @@
 AUX teckit-2.5.1-mixcflagscxxflags.patch 534 BLAKE2B 98c7ec0325821d6fc8ed4952cce4ec38233302c25e0b6e4157c357693c16ee756c553347cf70aa1381315e0bb1c721e3e423ec6855a5c80fd2a5a298eaeb62d2 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87
 DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
-EBUILD teckit-2.5.6.ebuild 1144 BLAKE2B 25f5a9c36f867af0f0ff569a819759be220c061c8758daf673861a79abc33ddd10539d60896b12a316d466ccd055c9f30e38ac13bc933cc9f071cf77f6c09701 SHA512 5c513708c5641db73d1d7cb478df5a6b6474115a1f60f91e299de3c61f29978530176cfa907e93e0eb67afd6630fb97a369e0b8fe4cb681bde480b16cf585dcc
+EBUILD teckit-2.5.6.ebuild 1143 BLAKE2B d2baeade44a8f6d86f546f6936f6d31643e7309d1df69fe38a0b054b32a845b68eadab935afd0bf8b255296c474ce12880ea1a740bb493d5d426f325aca54caa SHA512 90f8c074eb690fce1a80a3ad51dd29c2a39bfde540958cb7be05521e139ba3dbb0e6a2f1dffb363a9c13b10747c063b21b363d3519c4f8f8e43778c3f7b14973
 MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild
index 607a5a9834f2..045beae1707b 100644
--- a/app-text/teckit/teckit-2.5.6.ebuild
+++ b/app-text/teckit/teckit-2.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 02c2a975e754..8255df3614c4 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -320,5 +320,5 @@ DIST texlive-module-web.doc-2016.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 EBUILD texlive-core-2016-r6.ebuild 11521 BLAKE2B 0ee71aaf90d8803d9f125ea694268fe9e4ff50e5affdeaa3d7b2a9e2b014028eee543c3fcf0131e5ac86c36328d983023304118813e7244ff353ad2bef7b182e SHA512 1d78173f44f67d97f389256573aad38cb43eb87e4f202480bbe2aa30f9a27b626056aaa50b791e939f09652d031d2a23406597f96cef55ad928c37ed973e49b7
 EBUILD texlive-core-2017-r3.ebuild 11616 BLAKE2B 1285fa47a8f24b7f055728e71e83208e21687491063b3edba33fbc254f92f5d5c20e899ded68ec8b4fd9200025bb4c88ab3c24e3e3c5a3bfc68dcdb33fc42af2 SHA512 0f2f0d97ff0933bb680a5a591d34b63b9c898dda27e908e7404ab0ffe7190d620b70a9900945c556cd5269944f46986681bdb94ebef8ece7dede2679651eae73
-EBUILD texlive-core-2017-r4.ebuild 11820 BLAKE2B 45c785077cb15ae9f771deaad2d9139ac24447e4692c11c0af7083d1bded2c15583c0ba7ae5f22536ca6d75e9c7d5ea9d2215c7f5d179e269956b7740ab1a4e3 SHA512 21618e4f6243b34c0cc88b87084fcd09f35227697d89580d3fbf7c1885d35e76ad0ff659a143a74ee6f713c42b8d36ab24a260e4e4bc2a1b322b3b90ed837278
+EBUILD texlive-core-2017-r4.ebuild 11813 BLAKE2B a988e1fca308e63a244c9025ce1adb2b09ce0ef7ab0e0f301f067eb4cb2258d3f4adee250e214af5cac454d67075d930c030e0d96b7c1d7a7c8d90200e4c78d6 SHA512 c8f71ba9cac6efb3cc0ee56bdead9be2f06213e9a9689707b2d649f9fe24ea1ac277992b32f913b905633c87efac940066777f4dbf7273c41c3ee6f41ce30392
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index 53455753c23f..870f6d46c44e 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -76,7 +76,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/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
index 9fa15aed287d..002d815dd987 100644
--- a/app-text/wiki2beamer/Manifest
+++ b/app-text/wiki2beamer/Manifest
@@ -1,3 +1,3 @@
 DIST wiki2beamer-0.9.5.zip 443288 BLAKE2B a0263ba7044966ff45c892e9f0f78f6916346c051bf57cc8445f4127019cc4cd031719b1b5b61fc7d41a85b42439fa20cdf8fc35fbed43feb28d6d9797c781c7 SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7
-EBUILD wiki2beamer-0.9.5-r1.ebuild 797 BLAKE2B 07d20b120411e1db70b4e9c02d903b3dd26658ce69a21e1a64806cd7af696dae84d6d1f3a7ac250b059c40eaa17b52382a937d1217664c39fb305537699a3407 SHA512 cf5726a45ba7e1ef97b0bf9abf4d0adf83b89409bd9702645ad8c4f525dfbb0837e6b1590c0181567a18cf8340728996044f6a086af78728d57a855344ea1694
+EBUILD wiki2beamer-0.9.5-r1.ebuild 801 BLAKE2B bc3fe07c1ed3f1a94abd81f9cb47f49c5db7fc2e998ff6bb5998d247b68a8b275549b3bf988c1a344d252efa0fd711878c012243c56f33d32e332c3f620129bb SHA512 05d00595fda2c119f3c5be98d9a15b7dc9359a7155d0f57bb120e8814a88ef16d489effc61e0c7d4db74687904dfe22ed0b64ffab1b81eac68c0a9cd117df505
 MISC metadata.xml 330 BLAKE2B 27059ed0cbe2bf10ad3b028d1f0e12b0617c0e2146432e375ccae5d570d8b1c1860bb9b9f36021a588ce859b7b30dfc04fb1f841890c549093687f3b6ad8addb SHA512 27c93b4ed84b734c1d8b6a7dc86a4d25f18694c0c096351afd35acf378e823dca63d692e853571e9d98e1e7dade682eb3802add4a7088f432279dbf890636cc1
diff --git a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
index 40614670ffab..1b54b904be80 100644
--- a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
+++ b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit python-single-r1
 
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index b4ade9c1bd6f..7ececd4b2629 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -5,5 +5,5 @@ DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde254
 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
+EBUILD xapian-omega-1.4.5.ebuild 1156 BLAKE2B b6bc04593812fbcb8a0abd6d5748fba8cfd5c3197f54713994ce28e01674c88157f57ceb40e194a63b28c2439d51ee8a4139b14a1498d2e803f2aaa56681da76 SHA512 3ab186e01422042f34b6eeeb9accc8d1fa7e249fa3f6b699b96366b061eb7c334d536b0050f7d4037002170fee3d1c3dc3d56c45a99903567303adc61a516cc3
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
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 69bb116aaa81..b7b4540c7f84 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 57be557ec0e3..74b90265eda7 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 677 BLAKE2B fd7675927525ae1e757335865eec743ff7491a35df9488552aba88466dfb6a0d4c8cf0b48bb8a649d6b00876e2d95c08a8b83ba3db79b98457d4ccb8e3db6aa9 SHA512 74f1b77433bb14b613ad37014b24de0106f1ce32c3d5f6cf1a025b66ca6a14cb2fa9821cc77e12a2f1c8cc04d38ba5a949b722c042be707ba098077e3816b8c2
+EBUILD yelp-tools-3.18.0.ebuild 676 BLAKE2B 3b61711246d66e63716f0eb89cee32dd2aa10bf08c2d110b5a93d9fd2acc83e45b0fea8b7eed2666a58b14ff4615e54fa4f776e5d9251af12ebe09d7d2d7b685 SHA512 2c1ad45aac535e45e939a9fe99ea124b4973a00ce37bd7c89c021d40a92c0a6ffadfae3afddae61126046e9261b2ee9a2265d3e828b0eb43d1c957545e79b4a5
 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 d69aa378bec6..5763df6d82b6 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 ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-30 08:49:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-30 08:49:38 +0100
commit	b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree	c66442ced2011c5ca81c3114cc51041e314c6d33 /app-text
parent	e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)