20 files changed, 147 insertions, 79 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 677a2897c094..3e9135c5d4e8 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cedilla/Manifest b/app-text/cedilla/Manifest
index 1ae2d82809fc..51db8cde98a5 100644
--- a/app-text/cedilla/Manifest
+++ b/app-text/cedilla/Manifest
@@ -1,4 +1,6 @@
 AUX cedilla-gentoo-r1.patch 645 BLAKE2B cedc4626df03c6706c5fee463cd2b662f1b5e297050cb3e67e585609319daa013d499f37fd6cff1ce2a10fcb21626e6b5178dc5545a02eef0778c404cd00f9fb SHA512 4a9d4c4f28509e2b527568a28a69dbcce0c4e7a8d6ae9a967dfb33ff639f12a5dae16a885b0f51686d3d444c9f651cf904bb5c93326308fc37e13d4ec8bb4162
 DIST cedilla-0.6.tar.gz 130676 BLAKE2B e316dff5ab9bb89dd350e9842847ed700846cfd57370be17198aa3c54f0562a4c26d23a49acccf8c7dc0b55f1765668dbfa24dbf57f50e568ac3039f7b5d662c SHA512 95d98fd4ab95b48023f635d61133ea1a8138a797cd1c414da0d4907531eb067ac147e8d612a528373da425d37fee7c1139dc7f0019308938c096e37caebf4e38
+DIST cedilla-0.7.tar.gz 114899 BLAKE2B 100c22be30ffed585a1eb44c96109dadab9cbf90c5c3432efd4ed8daa135fa0d9fb82374eda9f9f13126cc5d453ecb5933d8733a58e374ab3192ea7d5bd6d273 SHA512 a137bceee2c70e911922b17e823093dc37b19cce8dece99596003ae7b4bc8c02afbae164d7dfa4e4873b4f549f7d948faf1da9dc1d3ef89cde6d1f36ba91be77
 EBUILD cedilla-0.6.ebuild 697 BLAKE2B c1f1bcb2967e8c6068d3b6906dee9ca5279360689e4aa80836d72aeca426db5d94631ee8f541acd3b71c89084965e87919b9e2a64a7ed837ddcb93c25e9c2e04 SHA512 61c7d132115f2e255de5b1aad34397541f89fdaa1ebd24dab36e7b2d71bac7e592884a78d36bc3addd8108133091455bd0025c28c672787f0a995b0bba919fae
+EBUILD cedilla-0.7.ebuild 654 BLAKE2B b784971be122031e96b156d0cf2d2b6930bb97236101a931b92094c0860e817618654fbc42ca3828222daa1208065722b62ba1b60d13c13c7ec163f9b2d4f92f SHA512 66dc5955c4b7391b91fa8f0cf521b5f1a7b8962c2ba8ded1c379dc678ed197db3217bf661da9cfa55569161acf45f70af95955d44e092d703237bf7afb01ade3
 MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/app-text/cedilla/cedilla-0.7.ebuild b/app-text/cedilla/cedilla-0.7.ebuild
new file mode 100644
index 000000000000..d6e687479ec5
--- /dev/null
+++ b/app-text/cedilla/cedilla-0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="UTF-8 to postscript converter"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="dev-lisp/clisp"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/cedilla-gentoo-r1.patch )
+
+src_compile() {
+	./compile-cedilla || die "Compile failed."
+}
+
+src_install() {
+	sed "s#${ED%/}##g" -i cedilla || die "sed failed"
+	dodir /usr/share/man/man1/
+
+	./install-cedilla || die "Install failed."
+
+	einstalldocs
+}
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 017ad5ba351a..7131866eb256 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -4,6 +4,7 @@ DIST dvisvgm-2.2.1.tar.gz 2841744 BLAKE2B a9221bd927544249a30262f1916a1323efd3e5
 DIST dvisvgm-2.2.2.tar.gz 2848315 BLAKE2B 157237fcd7e61a9cf7978f3b595d1ac5fa7765dc1615721dc9812a27e26b20f077aa46535fc19f9fee28bc5714467f6176df6ab1ca094be2299d77ae4542a103 SHA512 e15384b4842a9c6963110b96b611f4f4beff301818972ef0aa77590b7aefdb488c3df16f93a5b786c97229df730c112db97770b612786fdff9011b5a2808d917
 DIST dvisvgm-2.2.3.tar.gz 2813537 BLAKE2B 0cc2625c779d22dceef8b26c0e977086601f246beed5610f722e2efe59ca617b29f27bf5de87c7b1aaf2b87ddb3320ede9852b39bd8633ca13594752e62869f0 SHA512 b3d17f13496a371914baa0a498e845b5c52dd74bf3d54cbd86fc91977f786d148f34145fee53272029ddf7507e468c827a41ef48ba2fb02212448858e868ad03
 DIST dvisvgm-2.2.tar.gz 2841354 BLAKE2B 713257347b258338b8ebf408ee6affddef4a53b51621496cb64638e295a27f90ea03f6d752b692f609429f1e5220363f866e4bbff3e82de1f4a03494ded3052e SHA512 310b3272f41d3378ddfb5663d4b6906f7b1cd1dfbbcff0ad249b27c5c37290c5eb496ec84a536f3166a51de4708f6069da9c6811bb7fc9e667d00b1c3aaafd53
+DIST dvisvgm-2.3.1.tar.gz 2854014 BLAKE2B 7df3090e53e5ea11338b5d439f52fad0aecb0658e048792565239fb6121ac05605dd992f9dcaefcc1cfad2c35d0194abdad66173d6c4b9199ab926bb02d93ad9 SHA512 ea105c343bc37b178afca41a20a167fac52341083881866585c12d965961cbbcd3f1580dcb5d5c8b42326c0872b2513bc9d5763942dd2631dd404097ea3b26a6
 DIST dvisvgm-2.3.tar.gz 2816291 BLAKE2B 3c804b49d9a5447063cd70646d0c6bdb56bf7f457aa84a4ef535341e2b5b9bea2b3dbb3209c3afebb5ebaea04300b5784b25ed244145a1afd6a8a4974326c914 SHA512 b1efc505db2c52471306eca099285c35685cf92d0f084a46daa476423d3706a2a3260584f9fdcc5722630a49b4178c9bd36d6cd8019a5b4c9f3759468e8e8313
 EBUILD dvisvgm-1.10.ebuild 1090 BLAKE2B b4c79de3986a2fba7881da8c2434f1678d7b367f8b13dea7bf7421dcf68f6250681562754100a081b42c9b7d9d3d02cbadc8e7658faf26b29b6c9d2c2a317843 SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc
 EBUILD dvisvgm-2.1.3.ebuild 1145 BLAKE2B e82da95f1e0ef36b946ed42c5ce02a2aa3ab6e30bb81d01ea6d59a664d524944dbdabcb4562cfefb5bb4d1c9b4f79dcae6405bf5b708a59a7c603914c882199b SHA512 37c82be8f2bb33c19e0a82f8e6dc927973b727e9d406591a4774f12f1179ebfea4c04dd5c79bdd28869641afbb65c44bab0a8589ecca1ceaf62ca2da3c2f1b0b
@@ -11,5 +12,6 @@ EBUILD dvisvgm-2.2.1.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d
 EBUILD dvisvgm-2.2.2.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
 EBUILD dvisvgm-2.2.3.ebuild 1185 BLAKE2B 0ae97decf87076b5faaefa67c17c01ddfc4e6811550d3dbbe3b25af423ab53a66c6035391ed59b3eed6e323ebff89eafaa5679b931077dad57deda3743941144 SHA512 af5c91311b75be4c344d94748c650ebc317db6e7ca961f0d4dd834f817870623ec2302ade85cb1f9e9597d4799eff2e7c40f5dd61b9ecafe95153047f4ac7443
 EBUILD dvisvgm-2.2.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
+EBUILD dvisvgm-2.3.1.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
 EBUILD dvisvgm-2.3.ebuild 1159 BLAKE2B 30ef40ab739050535e3741719be165a3342c9524a3384c9482e9381782fd22bdfd843e5010f2569466e11ed679405b1bb6ab3d2a910d390916cd7d0b648509ac SHA512 0ff07d7e87ef3bc17ff1883ac3fae3292b4232c441e04e0ffbf575ed729574896328a47055485a777209c9a637a0d3469c697bf8e4f7c044539ef6c6b72fce44
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.3.1.ebuild b/app-text/dvisvgm/dvisvgm-2.3.1.ebuild
new file mode 100644
index 000000000000..e2eec8fc99a8
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index a8a598ca0188..ebaea293f868 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,5 +1,5 @@
 AUX html401-decl.diff 469 BLAKE2B 7b7e98352b9650b06fa7c9e792e1538873827ffd8d7c043d45a3035c1c1099be9c2aed632717f959a92b2b5f0dc646104c81f13fe612cbcabb3531afcf3d4b9a SHA512 066d1c3672e2b8fd86a696c511c4eab92c8772f147503a986f6c89d1c33720325d15c22157c81d7f121ee441328b89f73a194d5e7e40af4408b0f9b8e0cc65d2
 DIST html40.tgz 369830 BLAKE2B c6fc0f65a9c65df34f534ce1db3cc53ba6ded4481df78f168c1b05b7e3b81fad7ddf3ee519ff1a901f0256af89285eefb39400ebc5b4089c1a16dfe935c6cf21 SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e
 EBUILD html401-19991224-r2.ebuild 751 BLAKE2B 88342ff6cbbeb2e0fcd389456bc469ab1c8470ffbad80cb6761f8bfd0a4a94884fbea9a3fb3e418944a08d353b59cc0bfdcc788001924a039b30acb7fc5df928 SHA512 48f9954963d403399bcb63dc18fa24ea36b28fa0d79f3612e504a37139cc3efe4a6a1537d349a9d2c62bef9c5f7542cb6f7359728747e90649145b71d14a494d
-EBUILD html401-19991224-r3.ebuild 770 BLAKE2B 179a7536508b34bbf0da36ad9f0257ada973087719fb0d99641180e41952f9fe61ce8ef5e88d1b3e796245f117766cd5291657d666cd9d20278e0209193a5c21 SHA512 dc50b833445d5901f5a18726cdebbd3c30584c738dbf6b5b00f45072b9dab856385ee9a6ab9ef0862818d132a3a0da17fedf4b4064e47d8e0f735868d0899471
+EBUILD html401-19991224-r3.ebuild 768 BLAKE2B fa0e8462702a729066e2e1f115909ef0a4ae442b19be0b428025d4a799ce0bf7276a5c1afe59d3feffe6707ccd9b1a7010e77f45ad6271c9e947790a5a91ebf2 SHA512 5bea14c5ff1dd2db7a9541cc0985d41279013a9ce6e0177be0b1439213cf0e9c583632513fa5813cf20e598ec6cdf018fd70d7b52cd804c949ca804c22c608de
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/html401/html401-19991224-r3.ebuild b/app-text/html401/html401-19991224-r3.ebuild
index c6742475dd1a..fe8aa9d173f9 100644
--- a/app-text/html401/html401-19991224-r3.ebuild
+++ b/app-text/html401/html401-19991224-r3.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="http://www.w3.org/TR/html401/html40.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 DEPEND="app-text/sgml-common"
 RDEPEND=""
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 1b9b5eb8df68..ac2e7473b4cb 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 EBUILD iso-codes-3.75.ebuild 2426 BLAKE2B e95562582a1d3db51a6d395ab95dd0c3ce2b41f1792b94554ca5aea406e5d44a0dc5e963e5b1b44f4f7e11fa1ec305f5d5337491458c39902599df675b798181 SHA512 51bae9c45a1aa31d5b94326a69f0391825ef558236589122725260e2d61b89bc8a72ebfb512d297bb0e8dca1af44a2aec3597d7ed86ed284d03b291d14aa6858
-EBUILD iso-codes-3.76.ebuild 2435 BLAKE2B 10b1b1595b45cc1a240e5f691d632a74477c82a8fe1c17afb848ac76edced88598501deefce3bbfe3d4d64caf447c58f2ade83c21567023b2e28436ba2ad26ba SHA512 c8e9ffe6e36ddd5c677f4e8730751eb35850641f83b63625d925bed88072e94bf5bf5055f4ddc4de25b2efd7ab181d5b3ae823b26a911b40a0446c94c9f12031
+EBUILD iso-codes-3.76.ebuild 2434 BLAKE2B 21a71e7fd1032e8fb7c701fdd5dc7f7866744a0eb2a269bd842dcb98daa59fbaa8ccec12cee2d95c6f4cf058dc8573c43675c80b814111cf6807f6c095cd7c01 SHA512 da2726bf72085b12a8a5cc9ce332464b43955d9c272af19323453aba78156929defb144eac86cc2875b955f22a26d6c856f8b46a002d1e87fdca22c317917b09
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index c2b562449314..6c517bfddf90 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 47130a9bf077..57abe714fb92 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -22,7 +22,7 @@ EBUILD jabref-bin-3.4.ebuild 864 BLAKE2B c698510211d73ecff97a4d16767c3a32f34273b
 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 948 BLAKE2B e259ffe8b873b9ff63ccca0c8ff7d6b94e10520e28d61a1a071a7839703ea39e82bc73658cc04b3a15b95bbc60ff84f3493124b466dd55295719924528463eb6 SHA512 efb238a6968f7179e77bc8a94fdda4922a312006ecce947eb8e8ca310b6285b282377bc9bafb7461b34cc846c85e0acfefe0b6c1b0e470cb5d121396f46618c8
+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
 EBUILD jabref-bin-4.1.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
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 64bd1c807cb1..bb4572b0046b 100644
--- a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/unzip"
 
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 9b593f936ad4..b674194d4b1d 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,6 +1,4 @@
-DIST nfoview-1.15.1.tar.xz 88400 BLAKE2B 4e0f2d6df179a25f7fbf9b762dab70f1331d31fc1fed018e71101171d6bbcce9b67f9c4f4a3c35fbf22ed3123e90934b035290d3fae5a4d396ddc6fdc04ce133 SHA512 e4cf86003b03ae57b8a4e76990df77c7e9e441abd8ab0440385405b0f600a85539a152de5893ebe75797bd96ecb811086c48b1439b9f8719050eb12315f67426
 DIST nfoview-1.23.tar.gz 83337 BLAKE2B d73cd6987bf7929c57e8acf0a24278272ea199bf980756ddb5da9a5eddf7760a8c05f0e48a287ee760d4bf4d2594fb08b43a77cef46d371a746629bf76955e91 SHA512 b94724e130cdf58b911634496c52361d008ebfafab3ac40a76612c4891737d4145596a6badc15fe4228c90c1cd7261e5a892e3e462070ebb55f71332b36345d7
-EBUILD nfoview-1.15.1.ebuild 842 BLAKE2B 7730db4262045788d0528425650fd3ea113616dce208e4432e4d9e8e1b371caf526bead621f6b2832598b5c70d93c125700f123cb4f1c377b65ea9503b7c6bbf SHA512 c84c7011845bcb522c33de62c70d1d02ef8709ed9902dd2d8dd1d13b9af9e559d974c090d7abbeda3672a76feb1948f06d78b3c688b2731631a134b7df40e841
 EBUILD nfoview-1.23.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
 EBUILD nfoview-9999.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
 MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.15.1.ebuild b/app-text/nfoview/nfoview-1.15.1.ebuild
deleted file mode 100644
index eacdccc7a4a3..000000000000
--- a/app-text/nfoview/nfoview-1.15.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
-	inherit git-r3
-else
-	SRC_URI="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="http://home.gna.org/nfoview/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index a4ec791a5d57..9deb636d0d1f 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -2,8 +2,10 @@ DIST qpdf-5.1.1.tar.gz 7662701 BLAKE2B b60c37227cf18c1f1787de3e7428f370d50a11532
 DIST qpdf-5.1.3.tar.gz 7681578 BLAKE2B f49762e7a92d0a638c998ab002bd3f83057fada59631e58e291e3548393419ff9b2050080d66028e2e14c59a2978e7a95045f144c8a61975c38784cacd04b635 SHA512 676cc6db27dcbcdece21cb427c6aae14646389f4000ff111feee8fdbbb03fe715035e5236a08db4137f275a09ed0dda5c80afbdc5093fe7f56b69a0e335ab73a
 DIST qpdf-6.0.0.tar.gz 8344860 BLAKE2B c041fd0a89dcce6275ccd51db62cc4fe37c2ee797d2d19c8924dc12f2a9166d7a918f220ed539045c81284544f061241f1783d6c25a0f63bed534fcef82370bc SHA512 303e3cc77ddb87b9494e26c35e0b45b42f73692054c56a00f2e4f1922633c6ebb45c8684992cd9bf32f03366fcc4cd7e7ec6fb9432d2dbba6e0b24395909b5bf
 DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
+DIST qpdf-7.1.0.tar.gz 7097479 BLAKE2B 0d363d9d0b3ca2873b21bacfb2002f3ffa431848402fef5abe0079c9373835d483de1fb10b2b21ad8c9c14bb16f30ee8eb34f2465142f491295cede0790c54a7 SHA512 28c00f0e7e1d89ab8165031b7e741297d472801fd115911b5f970e97f27fb0c463169dad2d59bb35885de5989984bc5f31a9c26be42015c0dba41105ae342726
 EBUILD qpdf-5.1.1-r1.ebuild 1316 BLAKE2B 843ad7e84eebd53fc18232207cc1701d928a69393a701b2fe5ecdade82942403d38146aab292ca96c2ec7873b604c37981c17bb8fe4e6dd6d4e982ad5d2bf259 SHA512 f8803fd52e6f7ee42f364cbde11465b95181350b3e1ab0f7378db844eb9f183723805350347d27a12071c4da6c3f4ab0a604430e5894a6ed0028b1794835a234
 EBUILD qpdf-5.1.3-r1.ebuild 1330 BLAKE2B e331790df4c0ec8e2491e77b1d304c064e23b222aff0a01c15dd06963e8071bf8d03a260773ad27307bf1c3dc84ddf217d5ca28a280b67ab1769500a0d0dcafe SHA512 8ba17da0d59e2fd3219d5edb02d778accd75a6588fda5d218d62755a5e54488c80f513566fec0091a85a19ea55c0e49f74ad17454d9128104f9724d343b27ff3
 EBUILD qpdf-6.0.0-r2.ebuild 1223 BLAKE2B 683ad52c39451760bf7a916c061710161488fbc25ee4e568901ea6e01d65938c39b0802f3859c4d5b8929dcb2df2be5143ebec5c4704d4f94ec11b90b637e9b7 SHA512 9d11d2921dc5a579e9099c33a1b6fb9b3dfc30f38e5c928e91758fb96be0a478f68abb9ed8d41878fca9e34e989c60a92429bdaa9da293fcd3f7f6bc291f1819
 EBUILD qpdf-7.0.0.ebuild 1243 BLAKE2B e0feddfe1ad56e218ec7b493c8885b237224380e43717742d5416a933d221a006e0b074d770759c63bd05e8f2442227bd885c801c1aa15eb16823beef9d25e88 SHA512 d5cafcfa976ec5dea186adef4a5bd1102cfb04dc0844dd2894119446a56a043688c2d341d7785748643150e62e24a7794c57e0817e041e192ee7cc136224924a
+EBUILD qpdf-7.1.0.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
 MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
diff --git a/app-text/qpdf/qpdf-7.1.0.ebuild b/app-text/qpdf/qpdf-7.1.0.ebuild
new file mode 100644
index 000000000000..df045305bb67
--- /dev/null
+++ b/app-text/qpdf/qpdf-7.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/18"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${CDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+	perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash econf \
+		$(use_enable static-libs static) \
+		$(use_enable test test-compare-images)
+}
+
+src_install() {
+	default
+
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/searchmonkey/Manifest b/app-text/searchmonkey/Manifest
index 2ec547a3265e..d279e0593510 100644
--- a/app-text/searchmonkey/Manifest
+++ b/app-text/searchmonkey/Manifest
@@ -4,6 +4,6 @@ AUX searchmonkey-2.0.0.desktop 181 BLAKE2B 43d22f668591663be327cf65ad89223cd35d0
 DIST searchmonkey-0.8.1.tar.gz 364824 BLAKE2B ed107203ee0e9cba1ebe25e84a3dd8ec4db15ba88cf3c9a46354f47c31e2f0b69fe63f171090ad33b440014d815e3ef51ac3f3a77f7bef5f5bf83f42d6b7772e SHA512 9a07031fe629ef3b910c252b179f0ba33e83750b25a632631bbd50531632f8d77b0943cef87ba0f854afb590274e45c9eaf45d3cb51dc55b2faffe1a45fe0d87
 DIST searchmonkey_v2.0.0.zip 491726 BLAKE2B 92f7995ebd4eb99411732c19954844a19541defe8e4fc1f03d88a70c702b22fe47953c23065184d93d9c433ae0f1fb62bb80a7e415f6bc9b2e598ec0798b486f SHA512 bde6560c58ed2b0295fdbdf778e947926c08ab9e70ab4fde4e4fc170353a7301d5c598669975654dede88faeb367627f05ee144a7ab18443db43b2f4f7396ba3
 EBUILD searchmonkey-0.8.1.ebuild 596 BLAKE2B 93df4ce68fe15c558935445d7f09ccce14c49cdfe1bd488f9f2cabd3f11046d8ba2c14a96f7334093f0d71a7507295eace55f5211505297edd2efb0593d0bbf7 SHA512 a786f6a20842e53f1cf5559239332c05bbf6dbc1e09787561b84c7b6d1e2e00a252f64362828af87525b78fc58a552ec9557138003f3d6593052c8fdc8da0bfa
-EBUILD searchmonkey-2.0.0-r1.ebuild 830 BLAKE2B 555a5b412674b5feb50eadfb102b28e79d9d84665f8fc3d49c9a6310c618641bb521732bcedc93fc50be57157bdceeca9cc8b4910687cd373958f18be1f2c08a SHA512 b8f9336a2e80ab7fb82300e2b8b1c7fc53cf8c8968bbd8b3aa06e134e1eb6ab0f4bded4c59036d9408b7c26fd4798c7f5e7fec2ac93b0c0717b1c5e579c32b94
+EBUILD searchmonkey-2.0.0-r1.ebuild 854 BLAKE2B 9e2495628cca16c9057ddccc112be2acefcb87000216f5a7a2b4cfa624b71ba79608e847f873b34b58bd061365458e1e392bd00ef5c1f52b549a2aca50b0089c SHA512 26a3e0c7816c7620fd1d24643188adc723bd958403951494b40272c6e512a219019e38402be30b1e3945c8412ffb7294ebfede86d30b367ecbad23e89ad7df79
 EBUILD searchmonkey-2.0.0.ebuild 788 BLAKE2B cf9ecf05aca4d1834ee9f256cf8ea33c23823c900642f847fef4fe99e2946af572b13d5cfed0e812cc14fd7369e244eebd6ff7de4dde4a46ee1e79fbbd4b94e6 SHA512 1b7da549c0daca9fe0011bf29a06541cb9a96e825ada079fc975943a2a698d18bbc70783738ccc982e56e59e850058f1ac11e63facb52ca02e1783eadbf5b7e7
 MISC metadata.xml 249 BLAKE2B b6668ba96cceeea8cf4167cffcc7f4990174935426c5b2b30652260baa0abc1bc2b9c2f7f13afedee9b94eed2addd7864100e6a67d4dfec5e2eb33a4043764b3 SHA512 0dcb7f72ef6733582eca7f8af4e2e7b2852c3f9a97035940d003b6edca4830cf59b469bc919ffd89e1c64270c0a73b51c9eb7e0c70c190c81ccf3fa994ad7bb2
diff --git a/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild
index 34061ebf5259..917331f46e39 100644
--- a/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild
+++ b/app-text/searchmonkey/searchmonkey-2.0.0-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
 
-inherit eutils qmake-utils
+inherit desktop qmake-utils
 
 MY_PN=${PN}2
 MY_P=${PN}_v${PV}
@@ -31,8 +31,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 )
 
-src_compile() {
-	eqmake4
+src_configure() {
+	eqmake4 searchmonkey_2_0.pro
 }
 
 src_install() {
diff --git a/app-text/ttf2pt1/Manifest b/app-text/ttf2pt1/Manifest
index c36bae30414b..e8d08ed13ade 100644
--- a/app-text/ttf2pt1/Manifest
+++ b/app-text/ttf2pt1/Manifest
@@ -1,8 +1,7 @@
 AUX ttf2pt1-3.4.0-man-pages.diff 1441 BLAKE2B 20257cf4dc9499641378ed32494577eb0a09dfe485acd7ff92d6e1f620651f07b5ad6fc928158a1bd9935fbae470f673b0acefb1ced83f29911982ddd32109e2 SHA512 af4d6a11db15fc7113bcd3872682899400de01cc97169d0027fe4457c8c9abf02c8b7f93c0ae5783ab05964c4816087118686f3e8195a0ff4d6b5eae41df3b0f
 AUX ttf2pt1-3.4.4-LDFLAGS.patch 933 BLAKE2B 278e8baf471727bb191b4cea97691982f454e978dc1d8533ba35d10cb979c107bba8665f21123a3cd8ab75db0e7efd76032ce60045dc05abcc4219569608d0d5 SHA512 b0d292828a71a3f4668e7ce3d177b45030fd7739b9a10fc37ab6788f2a34e4bfdcb2730086592ca5b17071c34b1b3e448642e6fcdc721e5f6e8c0b67511859bf
 AUX ttf2pt1-3.4.4-Makefile.patch 2911 BLAKE2B f155d19c1a60a524c18f33b09a0c1c73b2cf7b0d2ded90eaa8b23cbc861cb7eb888f77ee6a1217ae2f6043835ebb3bdaab7bc67238d5d6504e6c412738340891 SHA512 a1bb5f9f2b7517d09bf093b12ac99bfcc517546568fce395aad430de06128b3f3d62e153bdcef249738392676bc21a3e26cbdd1a42203093c56ce8ee035757eb
-AUX ttf2pt1-3.4.4-freetype-2.5.patch 626 BLAKE2B 4b380f2b05c9e72016cb6f76e7832fdf20256976e13ae7a365d330343be8f717c0b5374b457f9bdfc705f49121ecd9b399a92399ef7f571fe0c3786238c0f74b SHA512 41c137dc87a1c5c38469d6faf9cf5349a4ae8677ae9640ce7707df191acb91c85ad82eaf485238b1864c20556301436c5e0133af67529a9cf136285e09d344bc
 AUX ttf2pt1-3.4.4-freetype.patch 378 BLAKE2B 03adca507ae8b2556c20dd32c73a302bcb7d5793cb040c706a1e6d86de9f3eb55e8df85a578a2a9fa4cbb3216d50129d33548a7b3472bd7df5417e6a0f6b9b8c SHA512 93cdd2cb660a9416d30189e0ef1e14c97ca686efa2902d8617aec585040ff74b7bea6354296a99600096d1c73acda085217264d5d07e716f2d90a457ea4e9669
 DIST ttf2pt1-3.4.4.tgz 230547 BLAKE2B 58904765afad396692263d9f50017d299828ae847a254bf6a580a0a259dcd03da3d9a97fe370a53a936e70188dab3c96cf0f0ab9069474eef92b9fd31862e455 SHA512 ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014
-EBUILD ttf2pt1-3.4.4-r1.ebuild 1108 BLAKE2B 4209a42dc590ddcdc38244ddeff8f5f0d94940c857e4cccd4072d4805b60445788f3e78e5b10704661628650a626938e0721b8ca113fd48e8cee05056e53250c SHA512 85018e09079c1fccf23ad97287372d0a9faabd0229a8349b3761880ad8073c088945e2e51df8ba3cc0d5cc2623f2f9ded4decd803d3d90e8b941b0646cab38d0
+EBUILD ttf2pt1-3.4.4-r1.ebuild 1062 BLAKE2B 77f768d23a2b22649425a746d2b993a28951090569566a298fbd0b37bfaa0a1ea18c7ca2b540c0636f40fab385db85b8babb334ddedaae4521801643c38c640d SHA512 b57372e8fde2440219d85eae0898775c2f73115788a7f0e168dc4907b5aa97b45e10a88d80d1c1c883fff989b071fbe90b506d078d9546b9874ddb046ff77088
 MISC metadata.xml 315 BLAKE2B e2eecb62a8d7f8a509b9b09a251e32bf3129a9c5205ea5574271fb6660226d14f4a1870481b053690d9794cef6e239051a05075586ec7e38ff6bd5219e9d537b SHA512 2061dd88c2b81b9ac8c6f55bf10f39908f457741f14b4e949563b9195a3e5a09724ed585569acd5426bf0f95d740abdd1a4a61301f970814c7cf6e45f960a9e3
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch
deleted file mode 100644
index 613da6c7339b..000000000000
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
---- ttf2pt1-3.4.4.orig/ft.c	2014-07-02 14:19:32.000000000 -0700
-+++ ttf2pt1-3.4.4/ft.c	2014-07-02 14:20:22.794538869 -0700
-@@ -13,11 +13,11 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftsnames.h>
--#include <freetype/ttnameid.h>
--#include <freetype/ftoutln.h>
-+#include <freetype2/freetype.h>
-+#include <freetype2/ftglyph.h>
-+#include <freetype2/ftsnames.h>
-+#include <freetype2/ttnameid.h>
-+#include <freetype2/ftoutln.h>
- #include "pt1.h"
- #include "global.h"
- 
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
index 624146104adb..ed543c6808a4 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
 	epatch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff
 	epatch "${FILESDIR}"/${P}-freetype.patch
-	epatch "${FILESDIR}"/${P}-freetype-2.5.patch
 
 	sed -i -e "/^CC=/ { s:gcc:$(tc-getCC): }" Makefile
 	sed -i -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" Makefile