gentoo resync : 23.06.2018

23 files changed, 374 insertions, 20 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index fae8da60483e..11d3411faf3c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index c5fec1588520..130abd5fb53d 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,3 +1,5 @@
 DIST bibletime-2.11.0.tar.xz 2403136 BLAKE2B fecf854a40ad0e188fde8ad3d047acf6274bfdf20f6a6211a6ff9d41e3de38f4d311db92e2b2fdf735e293163637cf4b553e722a05174d8c84201e94cf6e7b7c SHA512 41f0751db30b9001d04e1c4040dca022c83eb440987104e2c3465f4233f8c0ecb1c940eac0433409f97f78c89c00d0f880f822a51219eadcbf3fc6513cfa81e6
+DIST bibletime-2.11.2.tar.xz 2533472 BLAKE2B b116bbefaac8106d1f283d1c1a0c4d4c17e67d1cb41066c219ecca243914b0fa355748ebebb23ec88c1749548c853166d391764a454dd77b43c6617072a648a6 SHA512 99e2500e07797549e32ac28238c90a4db1cd98f74ea20f0161db7675127f42363006f20d859504be958bfdecf80a18a96229a1bbc105d332af97644fafc92d31
 EBUILD bibletime-2.11.0.ebuild 960 BLAKE2B 65bdcfeb1a85ac2ae4232f58c00b48b5453f310530da42b62a3380affdd9f6fa274aa87e1e764ef501467893f4b7dd899e55f615df6b11d961f28cd97a0281d8 SHA512 35dfdbdc5220a77856ad9d00ba93eb5b834a3f3bb00dea85d1f418af8a4212a959e09682f471b083e0cfff1e53a7dd3678dd55783e786f0adf39be16df786ec2
+EBUILD bibletime-2.11.2.ebuild 962 BLAKE2B e82a986d78a9f287b1c72dae5e525f4e61c4377af4f921455d588940f808edf766bcd69cddfb06e8c0f808e67cd6a0a8b1f78214863c2be7ff694849b9cea461 SHA512 fdbff40e6d53b358f1ed9ea15aa7171b743b24366d0000c2664406c9130bf8850fa1aa36f5dc257262eb3e46954156aec009d35b739c188905295803eed7509e
 MISC metadata.xml 658 BLAKE2B 0f4e1d9ffb30d6d0a9ca097739a4a58c9fdfd4d4b777f552c3bf3584a36e902d215f6757c83d449b17355b105076b231e775c9537337bc830f60d2a0799d475a SHA512 4d3e9dd30225ea7a354750d38bc4e4b9cac37a2cfe9e40d79835536b5ed9ae7c6704f1b12a32e0bf2926574378d6ec014ccdcc4a7af0b15f6e336d980060eeae
diff --git a/app-text/bibletime/bibletime-2.11.2.ebuild b/app-text/bibletime/bibletime-2.11.2.ebuild
new file mode 100644
index 000000000000..ebbcd684ed65
--- /dev/null
+++ b/app-text/bibletime/bibletime-2.11.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Qt Bible study application using the SWORD library"
+HOMEPAGE="http://www.bibletime.info/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# bug 313657
+RESTRICT="test"
+
+RDEPEND="
+	>=app-text/sword-1.7.0
+	dev-cpp/clucene
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	net-misc/curl
+	sys-libs/zlib
+"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 32b585bca1c1..9731b7ea538e 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX docbook-dsssl-stylesheets-1.77.Makefile 676 BLAKE2B e87e463a2fffd64e6633a2d1015660ebc341f089a2dd3cb5da9c743eaf9b98b8457a723040f871c350969445275a6eca705546e2d4ba7596c21994fc5069c540 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1623 BLAKE2B 28b2cff7920bc3474d10f880bb1faea8ea18d4de2fc475354728e33420adce0a6a6fc87196a547b8feb5c8560fc27c9ec3c7d4fe5d6730135c6fc66f88d3cba0 SHA512 787c1a2fba73e732dc5ec7f2d8764cc513e0857e6cd55006b4d59e7dfba78f7cd1383f0dbd3550a9cb8b3163e7801879c24e60edf0c5ea9b9016fa490bafdeb0
+EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1622 BLAKE2B 1d3a39700f1d767669319d7ecfff473ecd4849ae66918d070780f1e9bd327a82488a65a7744834a98572bc2685bbcb333dc5482316f232b6a1fbbe157f8a96bd SHA512 87e7ffd95e6e6ff0dd713f1246b80353a246736696fac03384ae906d1ed6a3438f9d74ac1526f7bd516e7d3110f2e76d76e90aa59fe9d17bbc7930ec9257124c
 MISC metadata.xml 244 BLAKE2B bb7b24c64c26a7f15cd94824d3dcced7f4680be7b408e344b8255ab4d2811a85e0b6941172dc28e10077d58c07d16788e8e42725526e51968fcb07f340af90f0 SHA512 bbbde89bd3a4d4e2071d840c10a83781a0950bf6e362bc4e69a24ac9da5ce216ec338a935519e8913df63db8b3ecd12f6ac3868519fd1b1378285c923fd234ec
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
index abb20d7cebc8..215efe89a67f 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-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 ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-text/sgml-common"
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index b56b56659ae1..b685cf807454 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 1205 BLAKE2B c9d5752cf6222f172279525c34bf8115175f48f179b9586574b8c1cab8800323836795ce09f3c24405e30c47f751a0c8ee5f7fa87a30f54caa67e8be71317bfd SHA512 8ed6c616d903d0d8414f95b40c8bcc2dbe6adf091edd3ee61596e560dcbcb850b7df220854f81b4a2c6312efb6a4d9cc51e2062d0e6c90b0152b181df5421fd6
+EBUILD gocr-0.50.ebuild 1204 BLAKE2B 32a2e739d6bbf38a4be93cff3d6a477d4ce279760649c174c081e18407fe230f2526eb8c2541c8907462930d2f2044236c2ddd9746b7b9677dee9cc895050b60 SHA512 263c081f8758fabea06b1dd89e834b9589f4581860729d798ad15f8d030241806b307a324d277625f79ef7ecbeceb16225e4c4f099e7708b746c14d6d79c3626
 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 5a67d28e8b0c..17055f00fc67 100644
--- a/app-text/gocr/gocr-0.50.ebuild
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -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/odt2txt/Manifest b/app-text/odt2txt/Manifest
index 05840044b673..a7ef1a4c462b 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 736 BLAKE2B 8d8c30f16f4fece6b38c1d2587c6babfccf5e8d0d80f4ffb24c213406b0f66db3c35419b9d9eade08eb1d061ec36e52cace9fcaf2437e211c2bfd4f1340c445b SHA512 09644e24b7d89ca87fa9152f1c82b6c897f4f419f57242c346a3648dfb662dc25ff9f6e1e9f3ca18ff4b512e4d5801b0c73fddf360aa4311f6500b81ea685214
+EBUILD odt2txt-0.5.ebuild 735 BLAKE2B ef0051bfe8979bce952e4f9bf2b5099cb5099c18066d973f2879533df026ba2f3157f2542093b4c84037204ad785ffc99e57e86e79acc29fd93501c9265fa0ac SHA512 84433e49a5688c6212755591287143d9c30f79c6f325d6ae374517550aeb8edc485c5a378d94db29189ba15cfbd7a069a72be6d8e3dc2ef75a1c1b777b3f79b6
 MISC metadata.xml 371 BLAKE2B 4d1aead738a47efd7e138ee8fa85db08b5aa64dafe7d06d64f8fcd093b741808a62fa541920a60fa120233f88dc5a5a92380e848db5ddc54be7152d813e4d174 SHA512 1fe5f8d199becebd4dc33c017d8e6f608f47f5770abde2424cc0517da49502624a8eeca6522d125bedef31c3f7aaefa6ce3a2a871ea46d28d2314bf0dededa35
diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5.ebuild
index be432c0d4faf..d9bcf722b1bf 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/openlp/Manifest b/app-text/openlp/Manifest
index f02b4ccd0109..1c8a4f6bc5cd 100644
--- a/app-text/openlp/Manifest
+++ b/app-text/openlp/Manifest
@@ -1,4 +1,4 @@
 AUX OpenLP-2.4.2-disable-tests.patch 795 BLAKE2B 0741116f289c1ec368e401d66a798f87124971c069921813f71518155e78f04b6fa097686899c809f8cab84084ab1fde2141d30ba74e4f940c2bd2647069c939 SHA512 ac67c675a4793be0194ccdc522737de0fd2b7b008707c19cfb5dd4fd1c17e88a59c0d38cdfebb02272774da81dbf06ca8b897504abe3d37b5eeaf40b8d0c63f9
-DIST OpenLP-2.4.2.tar.gz 7430438 BLAKE2B 81b64a20650b5907b8c0b8cac820db6bf1d6ec7df42f5ade856129d2b49273c84790019261f19a24bcb99c8d5b6aef80f50885c7bfb6fe4a2f25998709f81a4a SHA512 650662231a5ef23460162f794237f8ecf54c20f8514793aef1b1bada2912e82c3e1a8aaec36e56a88ed38b5c282393635f6345926362080f8101ef6285a5d317
-EBUILD openlp-2.4.2.ebuild 1190 BLAKE2B d654dc5317fdeeddcdd9639e1ab48a211a4ded69978abbf17c0781fc2fb9d63f35454593f6970a80bc4f3f855e329b09296c42eb87d90c6b54d2b1849e977395 SHA512 c00c3b14807971c6232ad6c2b92363338608707d305fbb2e4e794501e0df1a190e5fdf851a84670c8360bc7ca68e7488c62edf68895b9cfa195bdda274f9f849
+DIST OpenLP-2.4.6.tar.gz 7303683 BLAKE2B 4e5b1a60c8eb8772cdecf453e8277a69cfb1cdd51ab6478425332b58c52319713dd411027a108113485ee7fdc4c770cb6f94a626b23c6cca82231311a62df08a SHA512 071ca83c6969c5281213dea5efe6dfc60a3d22b56534b93e2fd1f8e43760ba5cab851b6f4dca485a31254d2090e26ce640359cb9f9797d84b9509426061dfb7a
+EBUILD openlp-2.4.6.ebuild 1194 BLAKE2B 424025d14382ea8d10ef848ef18a50742a32e61c8d0c73a5535833693a984b7c7ef0318c59cf9c860c232e79e7ab4a23f12ae00ae9188a54945c479b43baac2e SHA512 e2ecde641044717dfa88c142385999cca20ab24faa888f8703fbd2583170f340545041bd359eb57aeca8f659e62986e486e74e9daada2547b3fc27144b47362b
 MISC metadata.xml 294 BLAKE2B f31b24e7a16fb99a7d3952c69a2d4f4a75afc12fb5e91954b20b07d9e1a43acf08bba842e5e08c73272be9db317bc2e52c5bc5c5e4e8e2d4c95acc787ef3387c SHA512 c8a3971d0143dec3196e52b3bf877b4b3e29041ec6c3c78cc20415cc9fb9640bd0762a651c3f7fd8c12b27b60d0fcf99eb8f0761c10337a9cbcf84e7e78c37e6
diff --git a/app-text/openlp/openlp-2.4.2.ebuild b/app-text/openlp/openlp-2.4.6.ebuild
index bc37f2d34a1d..2e89fb61736a 100644
--- a/app-text/openlp/openlp-2.4.2.ebuild
+++ b/app-text/openlp/openlp-2.4.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE='sqlite'
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Free church presentation software"
 HOMEPAGE="https://openlp.org/"
-SRC_URI="https://get.openlp.org/${PV}/OpenLP-${PV}.tar.gz"
+SRC_URI="https://get.openlp.org/"${PV}"/OpenLP-"${PV}".tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/OpenLP-${PV}
 
-PATCHES=( "${FILESDIR}"/OpenLP-${PV}-disable-tests.patch )
+PATCHES=( "${FILESDIR}"/OpenLP-2.4.2-disable-tests.patch )
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/app-text/pdf2htmlEX/Manifest b/app-text/pdf2htmlEX/Manifest
index edd4586f5f50..89ca6ee317ec 100644
--- a/app-text/pdf2htmlEX/Manifest
+++ b/app-text/pdf2htmlEX/Manifest
@@ -1,4 +1,4 @@
 DIST pdf2htmlEX-0.14.6.2.tgz 9066685 BLAKE2B b139f72c806e432facce5472e55a23567e74204829956d06bd9ead0426cbadad4ce36c581fb1d39c96eeef27fb416b2c6387dff7b0ca08b10479de24b8ffdc9b SHA512 03d04437386b2eb83530551ff15ce9d21b7990127fa659d204a269405f0d49912c622687eb6920cc4e88be8e94ab41024b378663effb61d1eda905eeb98093d3
 EBUILD pdf2htmlEX-0.14.6.2.ebuild 1017 BLAKE2B a9dda802e28273f531e35b0cea8b7f23602f48f8dd024d6367841d745edb31c39cd9d284ddae57a0cd101f694cd4fb1f2c82571386cffb5749ce9d01d828e890 SHA512 4a2003bd64ad816714b3df3065ebee4158c6ea885ac997cc2f5de19f55f79f4c10f99c97aabdb1d313a9a95f459876b40a9685a7398bba383813cb7bd2707965
-EBUILD pdf2htmlEX-9999.ebuild 1065 BLAKE2B f34a94bdfa9bdbd7b9e1aa64c408c95907d7b4c3cc9df64381ae481a4d0473299b43a1dbe8e06b9daef03fb6124a3923ec19f1eb820601e0f052264510e043a6 SHA512 8b0459124a1eeb825e60b22c04b433d7c265b2e592ad303b7279c074060742c9974871771f2a4663b40f17367c285156b917d088dda73d8eda136a036194d853
+EBUILD pdf2htmlEX-9999.ebuild 1089 BLAKE2B 15e152292caa0565fd01ffd29f8d6340ed7cbb8b9f84f1bffbe87c757a502348822385531248e90f2e76a61d99a76a56d038017f1e521e928ecdf74aa2fa47b7 SHA512 473670a7611a2b3c1d7c6de1c8c418e38a226dacf5cdc26d77cbdb8ff19470c336cae24f511b204150717f0a96df58666cfe5d3cac454998b6d2ff96976bcb23
 MISC metadata.xml 355 BLAKE2B da386c9bf8cf6684e23a3bf7638d341b7f8872ecc7d733b946ae697e9e13096df65398f6d4b2d4594b47eba7ec1e482dc8ab14a69395ed1a32c00cdc7d91c2b5 SHA512 c416fe8d4c3edf1055170e0c4cd84fa9da19437c6eab58fde5198561048018ae6b9387d52017dfbc38db717ef370fc70a1dcc0eb37c8843b4e65cfa7e80314ff
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
index 4bba2c9ce1e4..f62c2e1f03ae 100644
--- a/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 CDEPEND="
 	>=app-text/poppler-0.61.1:=[jpeg,png]
 	app-text/poppler-data
-	~media-gfx/fontforge-20170731
+	~media-gfx/fontforge-20170731[cairo,png]
 	media-libs/freetype
 	x11-libs/cairo[svg]
 "
@@ -31,6 +31,7 @@ RDEPEND="${CDEPEND}
 "
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
+	virtual/jre
 "
 
 pkg_pretend() {
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index de6173adf35a..6282cf198539 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,7 +1,7 @@
 DIST poppler-data-0.4.7.tar.gz 4182339 BLAKE2B 85a731e738cce9b6adc7c236ee5183b6494b641a20e4c823900314bfec5bc3c327ae49e35511936c0f3a6f13e25be098b24bd6a91ae04815be6a02149a636563 SHA512 9a865f077f8760a106c6b28302357253c6d63a8f4f10a9506724d1f0ba42e3481bd790ca07e7ee245c63de3650a33c12e80e20e94415a0e37b05225cfe0efce2
 DIST poppler-data-0.4.8.tar.gz 4209901 BLAKE2B ed4dc809044240141db3ec483b7fb272d976eb61febf13b3f1297b27146f8597eb6d817a799da4729192f39873226f6eae6374b86bcf4dad8cde7d0bc9388b94 SHA512 c9435f557ca696fb1e94b6a0b42d401cc911a08f995e3494a7352b47bde5091226f2bb99792ff2b1ee02dfebee66f50f736daca72020a19217ce1c27bde92d54
 DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
-EBUILD poppler-data-0.4.7.ebuild 788 BLAKE2B a819c5ad946e1fa0c743d62c7528cd64ab709de1572e5da7e0dce0853229f4a44ccc38e5466823153805535b786eeb6703a4d9bc1daa68cb60de6d11fb8aea9b SHA512 016372353979ff7e03d739793bc84951367bc01d67bfda27248e17fe4065e31987c87d520eb039fc4c099107746542b6f07eed57cf51a4169d4e751606d02022
+EBUILD poppler-data-0.4.7.ebuild 787 BLAKE2B bff0b033eb916cd9a7b19f77f3b888047842cb9130a42e5f94e2cc6df42d3d4f5ac31338b427b1b8bf155d0f4de9b448b6f641d92978632df5aa317c28ed584f SHA512 57558ab6909cb93d40ac4193580c03a959949f27ad559f9200506af6f8e36ffb0e8c50bed1e8deefa548cd02391bd5097cbdcbcd42e6f30610a4536dd8fea485
 EBUILD poppler-data-0.4.8.ebuild 798 BLAKE2B 00a4ab43ff8962444ee45435eed5e578599083915867b0d29d7cb978319cab5e441179d405a07dd97d161c45ac7fbba08b1c06e4a69ca1ac036314eb2196bcb9 SHA512 9ff80bc42f0004e01901ded0db13c115282758692f48c6626ed1c4228f8be2ef20ca34552819f1ea80bf967e96147b59f09c7a0e504747b2ca77fcf729c5776f
 EBUILD poppler-data-0.4.9.ebuild 798 BLAKE2B 00a4ab43ff8962444ee45435eed5e578599083915867b0d29d7cb978319cab5e441179d405a07dd97d161c45ac7fbba08b1c06e4a69ca1ac036314eb2196bcb9 SHA512 9ff80bc42f0004e01901ded0db13c115282758692f48c6626ed1c4228f8be2ef20ca34552819f1ea80bf967e96147b59f09c7a0e504747b2ca77fcf729c5776f
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/poppler-data-0.4.7.ebuild b/app-text/poppler-data/poppler-data-0.4.7.ebuild
index 5da9e309d400..8583800548d5 100644
--- a/app-text/poppler-data/poppler-data-0.4.7.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.7.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
 SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 234b6fb6a76a..495fca4ab034 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,9 +8,11 @@ DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1def
 DIST poppler-0.63.0.tar.xz 1439552 BLAKE2B 9bf5cff7f5fec93ec7d49d1745aadb2b03a68d38216003e4bff54a5d264c9dda10265da79a755af1f31b582602d034cfefb16b807185d674a2cfe0d20e5de277 SHA512 a151d08480e9940a02191355ef5e7499d6494cff05f22f49de2bb8223512f5e5c9bb9b33651943ded30b4cd7096a2423fb7a01fa62228fbcd1d3a221b885cfe9
 DIST poppler-0.64.0.tar.xz 1449904 BLAKE2B 260bcc9c1b109b58b66057665d11c0685b525803206497ad0516998d93c132befd6b0ae28f187afd77dace6b35af6c08b8210ad05143d6d068109dc57caf5a4a SHA512 2799c3f628e63803eb11a25e54798a136aad91ea843d4bc1fb284af478f4a8cde87b7f95fc28cf23baf25975fbde6ca93f6ac91befb87af42e642c7650053f1c
 DIST poppler-0.65.0.tar.xz 1451720 BLAKE2B 8d8d785a2d2b9b501e2db0736e5256236eecd72e4cd4659d198db45b8a3f219e4949f6fe460bf2429cd5ea0a5ea26e1d5d5640d1e75b1443c38f43de9b17efc4 SHA512 4a2c31307ab703bd25e1b5ac1185a897e1c96de13daa4fc4849974f6ea6cec8066e8cd9ea061f65620c71ea56a09b2cd355c4e42e9a4eb9a674a11648e3ec977
-EBUILD poppler-0.62.0-r1.ebuild 3538 BLAKE2B 7af59ebba3ad33263ee8bfd949af496c1bd4ba2791f69a8ad02ebe22bc3e8196208ff664a7fc423862b9ada80d6d7557ace0746c791c188776dd2b7002275fd3 SHA512 597cd60e7313080c56da025e1659188b8fa13a6241ab77bcdb937796f1d59aaf34ace9be1c051adbe46951a1d24162522aa56f7bcbb080eef6a90ebb5116de06
+DIST poppler-0.66.0.tar.xz 1457420 BLAKE2B 55e2b6046920b7212b53adde309c9a2e1c10412b1278371b51679f4d20ae0cc4bfc359cef4865fa337a6f844c87533b9dcd13e8da0e6dce1514c0e2dacb95d47 SHA512 cf0ce3855d7cc28021685731308bfdeca0a7a764345432242887852d67fb4119b149ab7ba692e7031e2f0e79b9982e71446efbd75bb7886450d13ea6c5035b51
+EBUILD poppler-0.62.0-r1.ebuild 3537 BLAKE2B 9c5ade9d12bba01198417d35e63ae454cd0a5a2d2e68ccda8fcf90bcae83fab248b46e8178e651661b25385b6863bb250461d6995afa38dee88c5c0084da0541 SHA512 4075ffbe26bd13100e9d43f8b0d3768d9ab9d2f287364654f1b223b91e6ede835268b7ff7226c1e65c4ff27e9be43bf355d377d4de8d2f2a7eab27ad908a3e3d
 EBUILD poppler-0.63.0.ebuild 3517 BLAKE2B 1cde03a02078d671d3e8005ce3c38570ee118827360899bb6c4d972e242f4daad5c311580bc08db71318166f09134ce119d7bc772b0e56b31d16cefef4098b31 SHA512 050b9465a3382aff8188c9f9e30bbe3199d3b3abd5f9bb29e68cb19324a6015d66176eba4904f5b211916eb4e862a3c6ba962e176794b836981ee11776c4830a
 EBUILD poppler-0.64.0.ebuild 3517 BLAKE2B 6800d6285471d99283e8edcedcfa537eb2661403515707356fcdaa7b98835429c94d6c018ab1447c6cf6e6b571e157c5babb9f3a6203430e92893cc23082addf SHA512 0f5f33e19f6f309217992f27470eb4e93d7867dc299de6db68fa0cf4d2afb0923bdb31e160611b33458bf229194afc52483698d425184afd80034f769aa66cfe
 EBUILD poppler-0.65.0.ebuild 3517 BLAKE2B b50f15e427e79492d6101dbc6b71704236d1330e27a5e756d0637ddfee2d0f955b1147c1525624820be7faee3a0dc09f006f1fc533e7aebd4b5f7229b09ab34c SHA512 51c8e5db741b927c8ac68618f58cf306571185d33166cc87b615bbcb852590527cc0d06f1e1c86e65026bf9d7536a0949e9118d5729f63d2f4815a1e37badc8f
-EBUILD poppler-9999.ebuild 3517 BLAKE2B b50f15e427e79492d6101dbc6b71704236d1330e27a5e756d0637ddfee2d0f955b1147c1525624820be7faee3a0dc09f006f1fc533e7aebd4b5f7229b09ab34c SHA512 51c8e5db741b927c8ac68618f58cf306571185d33166cc87b615bbcb852590527cc0d06f1e1c86e65026bf9d7536a0949e9118d5729f63d2f4815a1e37badc8f
+EBUILD poppler-0.66.0.ebuild 3517 BLAKE2B e7d478e41f180fceb22aed9b2a2619cde055473d15ce76c6b1b6b0580e9bcf83b58e8838a84ebf7e7818f310887000b378555fd3eba2c1338c01840c273e3f91 SHA512 c5ba4a1f33ca1174a8633c14198d7237eb3481ca3b900185fd0e8e684a8b24f6333b5ca42b588e6e48539b9bf024b6daff6eef1df0ea71cc95f47bb4bb77b79f
+EBUILD poppler-9999.ebuild 3517 BLAKE2B e7d478e41f180fceb22aed9b2a2619cde055473d15ce76c6b1b6b0580e9bcf83b58e8838a84ebf7e7818f310887000b378555fd3eba2c1338c01840c273e3f91 SHA512 c5ba4a1f33ca1174a8633c14198d7237eb3481ca3b900185fd0e8e684a8b24f6333b5ca42b588e6e48539b9bf024b6daff6eef1df0ea71cc95f47bb4bb77b79f
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
index e643afbe71bc..568a800956bf 100644
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/73"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.66.0.ebuild b/app-text/poppler/poppler-0.66.0.ebuild
new file mode 100644
index 000000000000..5d2ce10f9354
--- /dev/null
+++ b/app-text/poppler/poppler-0.66.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/77"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_GObjectIntrospection=$(usex introspection)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index b15fbe7973ae..5d2ce10f9354 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/76"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/77"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 7c557710b8de..4c4556e39168 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,5 +1,7 @@
 AUX sword-1.7.4-configure.patch 816 BLAKE2B 6b1dc70d5146178be9e2e650b6a46f9a64dfbab2edfddeea7c4f3825c00ccf1af7fe328b86be90c3730ecb928ae9fe1c4558f3a0bcb6acfba6a207a48c32b3f6 SHA512 b6209e3a01a3408ca7d338ada40f3e9e2db93167b74274f29ea4a790a22b21d9e871037eb71875ec6d84f14477a78944a9ef2296fb623dbedfdfd3a849e44186
 AUX sword-1.7.4-gcc6.patch 626 BLAKE2B 69b56ed6152d07962d5941868925ac35825256e4db22cc435c7580694925694902eb6c322d143af7148ea4a60828e059409625e9415cbb5f8905d98b4a1d85c5 SHA512 8084f3ce8be27879a5b038c5c55ed6c0071e02c2f19ee390cdbc6eaf822fb5268c0f5f9450ba22dfc944b5a1d46f5e4feeebd81f3810532edc9f905921b95f04
 DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20 SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
+DIST sword-1.8.0.tar.gz 2444386 BLAKE2B dd74ca409cdc3e4563ec5f0ed225556cfc3d1c89e63b41df8335b4abdd4f36b1423a2953a86105d2efe8d57c0e57065f74e74629309bab93f2a0222b9a8fcc86 SHA512 c45f3135255322a77e955297997db2529f31b397c42cc4b9474dc6ec8d329b2233b292078979de5fbf33cad4a1a607aabb66f86501072a729d68e9fc840c8c8e
 EBUILD sword-1.7.4-r1.ebuild 1974 BLAKE2B cdccfbf2bc8cc2f6a22b1bf88a929faf3a6305f271956acf83f0e9d4383b02a6e74201bc0accb28becc05b5e979f4032dcd48d9addab74ca5563c0bcb4d008c4 SHA512 b9c272643badb68f6af83bdf7a50f070f3a0fa56ed21ecf9c1b1ae941e5bee671cc9674fc8fba3b6042bc111f19576fa3d731700b7a9c91fbc637558e74886f0
+EBUILD sword-1.8.0.ebuild 1924 BLAKE2B aeb08e11551a7a8e81acf4da0aa69530772a49334c75a14f74b63109c73d89115d4abc0e1c815a892182edbc907a3689e8387c2c045f3230763c71f7c39bfaa8 SHA512 7c880515213d6fb58091177351f799ea49d8633e7f3bd8da5e396555c456dc4796d3b8798b21c56ae8d44b4ebd5543bf2116786cce2065a651572431dbc54475
 MISC metadata.xml 564 BLAKE2B b7ed0b7e3e245079c82d4ebcb446a1e864e0f72610ac9c60d98fbfc73c7d078f12ddb7d1650fbc3816ac292c8c6b122990a71b0e99056eb21bdb4f3a8dc8b3ec SHA512 74ff38bf540aa48eb0195c7999adcf1226ede7ca4a6848a45b73913011f95e2bb7d84e0ca0534d2ee2610efee78234a52ae69f507704bb0ec80e4876a5d4aadc
diff --git a/app-text/sword/sword-1.8.0.ebuild b/app-text/sword/sword-1.8.0.ebuild
new file mode 100644
index 000000000000..bb6ed4a2b108
--- /dev/null
+++ b/app-text/sword/sword-1.8.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
+IUSE="clucene curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	clucene? ( dev-cpp/clucene )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS CODINGSTYLE ChangeLog README"
+
+RESTRICT="test"	#Restricting for now, see bug 313207
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
+		-e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
+		configure || die
+
+	sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
+	sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
+
+	cat <<-EOF > "${T}"/${PN}.conf
+	[Install]
+	DataPath=${EPREFIX}/usr/share/${PN}/
+	EOF
+	eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
+	eapply_user
+}
+
+src_configure() {
+	# TODO: Why is this here and can we remove it?
+	strip-flags
+
+	# bug 618776
+	append-cxxflags -std=c++14
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		--with-zlib \
+		$(use_with icu) \
+		--with-conf \
+		$(use_with curl) \
+		$(use_with clucene)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use doc; then
+		rm -rf examples/.cvsignore
+		rm -rf examples/cmdline/.cvsignore
+		rm -rf examples/cmdline/.deps
+		cp -R samples examples "${ED}"/usr/share/doc/${PF}/
+	fi
+
+	insinto /etc
+	doins "${T}"/${PN}.conf
+}
+
+pkg_postinst() {
+	elog "Check out http://www.crosswire.org/sword/modules/"
+	elog "to download modules that you would like to use with SWORD."
+	elog "Follow module installation instructions found on"
+	elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 6b0be365379a..e3b6df574586 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,3 +1,5 @@
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
+DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400
 EBUILD xiphos-4.0.6a.ebuild 2045 BLAKE2B 02426203620395f5a64438b0a7f97f41224a454fb8fcab01b61a6bb607bdda89ab0f47a1e4d44372db100abc8b8f28f0aa24dcff6cdb71f8e98412a589747d7d SHA512 e33b0410713e889a93febe02576e6a8213243be185c66b3b947fb0e7dc48c76178a05dc3e031f81bccf89668f9feb64f9db45fd59babaf263576ac58c3d85000
+EBUILD xiphos-4.1.0.ebuild 1998 BLAKE2B 4446b0796c9cc14c3f4cea5b7bef5b3773c7ad86cdfa8cb69f413494ba3fa161063373ffa3bbcf00e5bf68ead866675347f8ea92ed9b7a63edac679dbc4553a6 SHA512 24797cb338bce8906f6553e61f46d7eacab72ebb9540c3ee4465c1509e32884e56c5345388ff11ef0b2ca0a97542b47f63e383964439945726337d9a7b9cec2b
 MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/app-text/xiphos/xiphos-4.1.0.ebuild b/app-text/xiphos/xiphos-4.1.0.ebuild
new file mode 100644
index 000000000000..9824202606e8
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.8.0
+	>=dev-libs/glib-2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	gnome-base/gconf[${PYTHON_USEDEP}]
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
+	app-text/rarian
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/intltool
+	>=net-libs/biblesync-1.1.2-r1[-static]
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
+		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
+		wscript || die
+	default
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--enable-webkit2 \
+			--debug-level=$(use debug && echo debug || echo release) \
+			$(use dbus || echo --disable-dbus) \
+			configure || die
+}
+
+src_compile() {
+	./waf -v build || die
+}
+
+src_install() {
+	./waf -v --destdir="${D}" install || die
+
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
+
+	dodoc Xiphos.ogg
+	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
+
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }