gentoo resync : 29.05.2018

39 files changed, 195 insertions, 183 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3bab3f710f41..8a2152b1402a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index 4635c2a957f1..93897e5f7cce 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -1,4 +1,4 @@
 AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
-EBUILD aiksaurus-1.2.1.ebuild 894 BLAKE2B 6f2538ccc17266124f1c3a581e998a5d8272917970418fd77c90433a7fcf9d5dba5a4236475366fe5f883ab421627f44b02bd3e772f82b0f306b053aa6390436 SHA512 1314ccb54ec11b65eac68eb753978633d7ff2479dbf65df3a335e4d4c9cf9f0bbbba25475990ee9522ae09c48bf0737487cba0f6b31e09e11dfd45dceb700a23
+EBUILD aiksaurus-1.2.1.ebuild 803 BLAKE2B 4ea59eb9cd6bb4513091a92c72d346ec18cda4690b0bc5d3903e84fe57063f9ac6b3bbfee731dc48d51d906b8b26b012f84af146d9f11011e6f30d8bf10d7a52 SHA512 f442673ae7806af431baa5d49c7eef26aabce69935b22e26255547e25737b03501e6096b82f80db49c07b78e43e45fcc65ecc6bb3eaa4daef52388d3a55cd9b4
 MISC metadata.xml 245 BLAKE2B 163eaf1f9854d0f7906920339f1ddf8321c4658b23e14d44bdc7e07ea3eba22d7cedb1cc63285aff307a1287555463807160d380836d63032637eacd5ce97f1d SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
index d359b259e030..e86e0fca8539 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.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=2
-inherit flag-o-matic eutils libtool
+EAPI=6
+inherit flag-o-matic libtool
 
 DESCRIPTION="A thesaurus lib, tool and database"
 HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
@@ -17,9 +17,10 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch #214248
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
 
+src_prepare() {
+	default
 	# Needed to make relink work on FreeBSD, without it won't install.
 	# Also needed for a sane .so versionning there.
 	elibtoolize
@@ -29,8 +30,3 @@ src_configure() {
 	filter-flags -fno-exceptions
 	econf $(use_with gtk)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README* ChangeLog
-}
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 2d5dee398727..c544671f7964 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,3 @@
 DIST ansifilter-2.10.tar.bz2 436180 BLAKE2B b00a76867c17c63fa457c6e3ff6a57cfaedb6218df240d8afb52ec4acb46745f02b785fdbde294deb606a77564b9e6deb52e652cc4fdff32ebbb4c3a2ffcc846 SHA512 b2b2f7ec9d3343701cb1de19a1a3cb678ca9a908cc72e26e0eaf1e4cdf61cf7237edb4221bcde3159299aee3c05a84c46cf5706ad4f74b96ccec41b161ad44ec
-DIST ansifilter-2.9.tar.bz2 455885 BLAKE2B 0865e17f45d16657e78444e65bcde07f74ee9d8605e100ef34354fc874210fa6cc4d01162e234bfca9c486fac3c41be0d1e0caa014d9702d4a90798b1fa85636 SHA512 9fd086d9b5fecb7c1d42f96baa728b2b6c155505bfb42f92c1a79ce59571abff541c7d55e14b159ad0e7890434fdbc1b383bc76ab4c22a16d835e270b6095005
-EBUILD ansifilter-2.10.ebuild 1002 BLAKE2B 41828a1c3ffe8bcd23a0e3cba784cd8e748d11624f80a30b5a7489ac0c6716f085b62539f627ff85ebb89cbefeafa245f0cf96ffc56a0e62fa90f0a85475a9f3 SHA512 77bacb65dde6fa079e7e287acfd6a7ff7c28d9a681a81ac1ff2b4da08d7f66f979ee02499214cf171f3a48ff480905cf8d124aa80cb10584fd5d03ec2feee7b0
-EBUILD ansifilter-2.9.ebuild 1000 BLAKE2B 06ba3ae0c29d11bd919576a98a01df3784354e97fe0ba8a2c3bbcee4af19b302f8b6f0680dbcaf5261a8019aa862d15b30a02c7e3c5add469306c750a5301bc5 SHA512 132461f3f691fcb2c3d4baa3101c03e04689095955b6391a77d12153aed9d2948c74a7ac4bdfca738b317a08d4621d9d465fdfeb82e6f188e1ac8740ba0a4b85
+EBUILD ansifilter-2.10.ebuild 1000 BLAKE2B 06ba3ae0c29d11bd919576a98a01df3784354e97fe0ba8a2c3bbcee4af19b302f8b6f0680dbcaf5261a8019aa862d15b30a02c7e3c5add469306c750a5301bc5 SHA512 132461f3f691fcb2c3d4baa3101c03e04689095955b6391a77d12153aed9d2948c74a7ac4bdfca738b317a08d4621d9d465fdfeb82e6f188e1ac8740ba0a4b85
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.10.ebuild b/app-text/ansifilter/ansifilter-2.10.ebuild
index 4e926331e979..05823fc22ef7 100644
--- a/app-text/ansifilter/ansifilter-2.10.ebuild
+++ b/app-text/ansifilter/ansifilter-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/ansifilter/ansifilter-2.9.ebuild b/app-text/ansifilter/ansifilter-2.9.ebuild
deleted file mode 100644
index 05823fc22ef7..000000000000
--- a/app-text/ansifilter/ansifilter-2.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs qmake-utils
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt5"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# bug 431452
-	rm src/qt-gui/moc_mydialog.cpp || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		eqmake5
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
-
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	dobin src/${PN}
-	use qt5 && dobin src/qt-gui/${PN}-gui
-
-	gunzip man/${PN}.1.gz
-	doman man/${PN}.1
-	einstalldocs
-}
diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest
index 4dce7ea8d991..a3c67e74a889 100644
--- a/app-text/bibclean/Manifest
+++ b/app-text/bibclean/Manifest
@@ -1,6 +1,3 @@
-AUX bibclean-2.11.4-ldflags.patch 545 BLAKE2B f90df2a07207fa37e08caad1f6464e5cff8a0495f07d5f74188c18b811a3ea56a0c2878d0e08faf290001d7d8b8552783600529760f9b787ecfce99a87f727bd SHA512 29640b1fd56da829c58d9643964bd5d556bc45c82d16370e7bb4cc24a5772bd76c8f8c8e817fbfb52b61846d4184f258c44cbac3011f897c4796648900374669
-DIST bibclean-2.11.4.tar.bz2 1244790 BLAKE2B d899753aa5c792f8713966e2d50f0658a0d3de8ba05cf4d490af30e9832dbe5d41e142dbc647ab046851822653e42bfdb7e64d23723ab81f2e285d345c708864 SHA512 e04f785ca017148600984a852e3093b86eb3ca1c67f41427556d2b08e57e11f05502db5a5beb868a33780a12ee06dc7f5eb9cf794c8f7346cfce582e4761ce14
 DIST bibclean-2.17.tar.bz2 2253830 BLAKE2B 4d707f8d07f04c45c44fbea2b12bfffc7636cef2a847d90e62f339cb8fdadbb416cd89c2ba1cb04b0fc9c736dd7ca8480a2cbd4dab9c27b1f6804ddd18fc5419 SHA512 5f0d6b315ecc98c47f48c1e5fe7bcbd374cf97dec5cc97ce4438300a7419e6b2f1efae313efdf9d21211e9cd658c1f4bac10aa3b0d55dfa8a5783d982b1dde0f
-EBUILD bibclean-2.11.4.ebuild 726 BLAKE2B b1923402370077c8e0a25c599d2db7c74f6f20d61357ee5490e90080a818bced84a59d767fbc405db26c2f2910a034ba2d3ff5255bd54a64d1aa373a999f17a3 SHA512 f509c9189b625b3f08e14e4633774899949af5583665cc4d9217a42b5ac62228e1be2fb0c2b4d6eac87e2547455b10e83f9da803168cc0fb9447abb50cb029b8
-EBUILD bibclean-2.17.ebuild 600 BLAKE2B 61d88453e0d7b421ce37c6b07c13625749fa7b6229416e3418b2139da9ad90252f38c12c47f44549faed068c0f65dd671918527c457d923618ec17aa70051f3d SHA512 165fc67decc61eab8ea889c9652933ed741f7ddec7cb0a7a6c166a51878d229143d3b77e950667da55a68f937ae4f68cbbd729528372b2732cddb7e88e85db68
+EBUILD bibclean-2.17.ebuild 593 BLAKE2B 01d318e8467d69d1d1cce3da545808b10e3c2717a61f4261526145e908b9e2e63200e0bc0af2061501ddfbf4c78c3b6f368cd018f1334420477b894c4827adc7 SHA512 d18ba47f1afefcae8711f1d450a26cbadef08c45a57f4ff971d10d15cd12afa342ccc17c0eda7fa3f3ff32a821ca7f83b61fd101494083857df72a2d18241ba6
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/bibclean/bibclean-2.11.4.ebuild b/app-text/bibclean/bibclean-2.11.4.ebuild
deleted file mode 100644
index d71a0f6dc5ca..000000000000
--- a/app-text/bibclean/bibclean-2.11.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
-SRC_URI="http://www.math.utah.edu/pub/bibclean/${P}.tar.bz2"
-HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
-
-# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	econf
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin bibclean
-	newman bibclean.man bibclean.1
-}
diff --git a/app-text/bibclean/bibclean-2.17.ebuild b/app-text/bibclean/bibclean-2.17.ebuild
index 5e81ffbd2ceb..fc8d456dd364 100644
--- a/app-text/bibclean/bibclean-2.17.ebuild
+++ b/app-text/bibclean/bibclean-2.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
 SRC_URI="http://www.math.utah.edu/pub/bibclean/${P}.tar.bz2"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
 
 # http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 SLOT="0"
diff --git a/app-text/bibclean/files/bibclean-2.11.4-ldflags.patch b/app-text/bibclean/files/bibclean-2.11.4-ldflags.patch
deleted file mode 100644
index e93c3be91030..000000000000
--- a/app-text/bibclean/files/bibclean-2.11.4-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: bibclean-2.11.4/Makefile.in
-===================================================================
---- bibclean-2.11.4.orig/Makefile.in
-+++ bibclean-2.11.4/Makefile.in
-@@ -343,7 +343,7 @@ BIBCLEAN-OBJS   = bibclean.o chek.o do.o
- 		  $(LIBOBJS)
- 
- bibclean:         $(BIBCLEAN-OBJS)
--	$(CC) -o bibclean $(CFLAGS) $(BIBCLEAN-OBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o bibclean $(CFLAGS) $(BIBCLEAN-OBJS) $(LIBS)
- 
- # This target converts the option descriptions from the manual pages
- # to C code for inclusion in bibclean.c.  The first awk command
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 2aafab4a3846..da85aff6a078 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,5 +3,5 @@ AUX hunspell-1.6.2-renameexes.patch 5104 BLAKE2B 83ea0ec81fdd5e8934c954bb2f2d07e
 DIST hunspell-1.6.1.tar.gz 706893 BLAKE2B 5e5047aceb7510c2cfaa05d540f8faad2fb844b51bf2d8e48793d588e3b9d31628ddac5d7f9c87078a3b2b8aadf64cd8d93fd4ef881b13451d52f10a1960e2fb SHA512 39b096ec1f5226f13eaf241647fc9b49a6dad04945ae0bcdc61ba845d66d67d64a72ba4287b6f376b5ad053b5d0e1d42a42415c30521c50693f0544718029458
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 EBUILD hunspell-1.6.1-r1.ebuild 2366 BLAKE2B d566bfed5c322566fdb30ff31f266020b1eb4ce9a0dd6920c5e340b2b922cb5bb3eba4a44dc458c0516c425b4c309cd13b6bf3225ef24b604b5c6d72245a2bc6 SHA512 c4e793a89c9ec4aad6bc2f7fb2036f5c251b329ec597976d07d607364df0de3c22a80903bbca5bfe03416b84bf3416a16691f78524cfc8f90c4519ecc3a89bb9
-EBUILD hunspell-1.6.2.ebuild 2416 BLAKE2B 200e0fb1b667f5655689b9f76dbad59a77c33498f45cfb98ce262a3343270714dd3fbbabad50301f2e3bbe5c8c5b8383acad4875fe75a7014af693b4fae93f76 SHA512 bf4510e5995f4902a8635544c14c85c88bb11d0984e2e6ba6867f60c29f0d8268a73869d8535cd4c289079cd78679e16f756553c82ce59d7831d56dd8a6e7427
+EBUILD hunspell-1.6.2-r1.ebuild 2395 BLAKE2B 49772d94f2806f8e6cdda15f68aa89e2dc2eefa307d363a05f5e16c6fcac8118587119c4142b87c467eec51e1a7b43e3731e942b8f03f9a8e55c2dda62e5debc SHA512 79637a9c568b35a50e218254e1a3531fb27b05e694c0cb42bf2470810698010709e31101f1f6da02c60dfb08356808109ab1505175ad193350de6284a33c3d9b
 MISC metadata.xml 274 BLAKE2B 6631c0f576279afaf4cd444df14acd118e393977058e957bd3e41103554a756c43860f75f7550346815f6d8a4320d3d86fb069c9451fbad268bedbde18ed5ec0 SHA512 09ac7c3282788aae9fe48dc86a3bec7d2a5b651b22d6ea06108f9ca5a86e96dddf9ab80433d0f16549649665d9a582d6c44217b73a000ee83995aad922f3caa8
diff --git a/app-text/hunspell/hunspell-1.6.2.ebuild b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
index f1690601d392..257fddabc455 100644
--- a/app-text/hunspell/hunspell-1.6.2.ebuild
+++ b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit ltprune multilib autotools flag-o-matic versionator
+inherit autotools flag-o-matic versionator
 
-MY_P=${PN}-${PV/_beta/b}
+MY_P="${PN}-${PV/_beta/b}"
 
 DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -17,15 +17,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )"
+	readline? ( sys-libs/readline:= )
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
 is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
 zu"
 
-PDEPEND="app-dicts/myspell-en"
+PDEPEND=""
 for lang in ${LANGS}; do
 	IUSE+=" l10n_${lang}"
 	case ${lang} in
@@ -74,10 +76,8 @@ src_configure() {
 
 src_install() {
 	default
-
 	einstalldocs
-
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 
 	#342449
 	pushd "${ED%/}"/usr/$(get_libdir)/ >/dev/null
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 4379562bfa87..1963ba8f6a00 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,5 @@
 DIST kbibtex-0.7.90.tar.xz 4059532 BLAKE2B 790cda2885e300c2f1701e1dccebce463275c439215a680c45954dc243d22b11168359c8d3dbb60a77e64d328ca62d6e11855b6cb1e44673e8173ba2a1b1d3b9 SHA512 d3aedff22f043608b99642c4332330d6472ea7cf960100ae0cdb2255e71702d1609333fee66918d5b276fdf3978cdbf91ef42512d7339b2245deb02e3c7279e2
 DIST kbibtex-0.8_pre20171110.tar.gz 11423893 BLAKE2B 78bcd72da35775d9927f35b865aba1e5ee88fd6391e5b354dd23d319a17a18c5aa521d32f58f1827a86bf33d1a42e7bef19940fdd1b83e67124b7335520bb1cd SHA512 719c40e78e22dc936a5395bf299962b4ec657df89877df78f17139dcd9b45a7ed98ff213a7c8a0cf0eeb4960a3b10cafaf7521e334a3269f96e2abdcdd67c913
-EBUILD kbibtex-0.8_pre20171110.ebuild 2020 BLAKE2B ca9745e19d3027331fdcbac79d82523f94ed68c4e54fc010893af630a3999d7649722bf1967429c31682c22cdced400f97e16436444abd9ca70226a5bd4efac7 SHA512 439f465078496bb6bbbc4b9c208af0e4f9cf8c45743e868b26a348275acc4754a9ee8920f6a70cdbfb06f166d6fc1cbdbf9f53bbd5bf79c009070d748f3ce274
-EBUILD kbibtex-0.8_pre20180504.ebuild 1991 BLAKE2B 7bc8c040b94a91dd6a2e78c4532f6693973449756e38ab7df9d82a23df35fefaa4abbe678a2bf0fe41625da6aeffdade9f2a31d4a1b6f72963b8c07ad08513c1 SHA512 b63afbee425a08e29bc343dcd244502da0c5e0e4030e96036945ec60fa236fe41071efa53414e1ace9a023b84fb5a6a896150374194f1bc58eb2d1c9782472cd
+EBUILD kbibtex-0.8_pre20171110-r1.ebuild 2023 BLAKE2B 034890e5745e0d58442f985ad50a6abb543cb83a3f18f77d18110bc9e83b0b893e3d2937836bc4d0437114ea343bde2e78325c4a6c250a33708b14e56ed67901 SHA512 11b1445ecde7738e4f8a1818b8c7772d460c08dbbf9b8925c6f2eba095e54b9b53bd075cb5a3c0b616d6bba74194bfe4c225dff8ebe530bcc3dd855762666de0
+EBUILD kbibtex-0.8_pre20180526.ebuild 1991 BLAKE2B 7bc8c040b94a91dd6a2e78c4532f6693973449756e38ab7df9d82a23df35fefaa4abbe678a2bf0fe41625da6aeffdade9f2a31d4a1b6f72963b8c07ad08513c1 SHA512 b63afbee425a08e29bc343dcd244502da0c5e0e4030e96036945ec60fa236fe41071efa53414e1ace9a023b84fb5a6a896150374194f1bc58eb2d1c9782472cd
 MISC metadata.xml 518 BLAKE2B e10a5e38918c43315c3804c787f80c6df00f7a37da896784a1ee932a90c7f6c15d8a1fc69313314dadaf01461b65e6be78b189226ccae9fda5422950a86edb63 SHA512 be7be6b52a067ed23384344706adaa13cd06667e768a9b5adc2d93b2edeb5feec426dc83395a226219a469bb5fbe99d378b5e1c87ea82e17a05c9751f03e12bb
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20171110.ebuild b/app-text/kbibtex/kbibtex-0.8_pre20171110-r1.ebuild
index bbe15b44b125..80b33afdabdd 100644
--- a/app-text/kbibtex/kbibtex-0.8_pre20171110.ebuild
+++ b/app-text/kbibtex/kbibtex-0.8_pre20171110-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,7 @@ DEPEND="
 	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	webkit? ( $(add_qt_dep qtwebkit) )
 	zotero? (
-		app-crypt/qca[qt5]
+		app-crypt/qca[qt5(+)]
 		dev-libs/qoauth:5
 	)
 "
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20180504.ebuild b/app-text/kbibtex/kbibtex-0.8_pre20180526.ebuild
index d5566c47efc8..d5566c47efc8 100644
--- a/app-text/kbibtex/kbibtex-0.8_pre20180504.ebuild
+++ b/app-text/kbibtex/kbibtex-0.8_pre20180526.ebuild
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index a014671ca342..c53294713ae8 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,3 @@
 DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
-EBUILD libepubgen-0.1.0.ebuild 674 BLAKE2B 563971c76c09a53136e140609726687a71ecdd2008a109b2a3ed4a502569ef9341955ee6136ca2815aca46cc1baaa9fa6930ba96bc178c1f473932031ef9912c SHA512 5b849eff3bd74fd9897ab7f6c910c228af46a22a2eee55497a79107b8109c9a44ee3c0c4d2075aa92a7e4ac2047231e462b14a2d9394e79c17c016d09ffbfac8
+EBUILD libepubgen-0.1.0.ebuild 726 BLAKE2B bb60b228faf6ff717939b896ef178ef3d8c67e539f464b14ea865e3ae534a0059d692d3234f05944e102fe225d2374e5d196357225e1d396149c145859b534b9 SHA512 4aff30cda11433fd675f975ea99a95f9c76380b6d6ddee4f1391d53740cd9101a8275e3cc48dfd1fd6d3808110e18dbbe8d322158ddcdcfba912422bb8b6d8ad
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.0.ebuild b/app-text/libepubgen/libepubgen-0.1.0.ebuild
index 5b922895aa50..d6ff7af29cad 100644
--- a/app-text/libepubgen/libepubgen-0.1.0.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.0.ebuild
@@ -19,6 +19,10 @@ DEPEND="${RDEPEND}
 	dev-libs/boost
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
+	test? (
+		dev-util/cppunit
+		dev-libs/libxml2:2
+	)
 "
 
 src_configure() {
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
new file mode 100644
index 000000000000..6ee50fb134bc
--- /dev/null
+++ b/app-text/libnumbertext/Manifest
@@ -0,0 +1,3 @@
+DIST libnumbertext-1.0_beta2.tar.gz 407135 BLAKE2B 6fecc6c885fbd9a2a701e5d3c10d38205e2d66a9e1e26609da8dd3ae92d2a954528ba011e7442fee0f4ffb3035ebe9381076a3eaac368e15a98a02508828997c SHA512 0db0e800495507b6173a134b1d2e681c326df56fc6fdaf5ae9e69e9f10ccfde1ad13b2150fb6120d15bd401c348a58570cbcad1b0be01fd80e24b67a67fd236a
+EBUILD libnumbertext-1.0_beta2.ebuild 637 BLAKE2B 1b6335304c3bc914c1812b309d08dab76b5bb26bd10417e75a998ab4001d4fad2d2e90c64bbb0e57783de67828a5643d75660f28d85e74157ae563350add01e4 SHA512 90cc918f849f81c0488fcca9adcccfc3c5e9a1b5d4d26cc2462b5b1011043320c1b31f1651579c737b8e2051106a29328b3343225e73dfbf5bc4574b995e46de
+MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0_beta2.ebuild b/app-text/libnumbertext/libnumbertext-1.0_beta2.ebuild
new file mode 100644
index 000000000000..9145fa33adb8
--- /dev/null
+++ b/app-text/libnumbertext/libnumbertext-1.0_beta2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Number to number name and money text conversion libraries"
+HOMEPAGE="https://github.com/Numbertext/libnumbertext"
+SRC_URI="https://github.com/Numbertext/${PN}/archive/${PV/_/.}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_/.}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libnumbertext/metadata.xml b/app-text/libnumbertext/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libnumbertext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index 7b9182635a82..05840044b673 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 737 BLAKE2B 6db11f6bf00aabc6bb29443fc6d1da60a638614c475e500148bc3fcc23d55e10a96afd169d07ba6ed2c24973fd543fdc85479cf8668de596baccad222390f8ac SHA512 066dcf6332365681d9cdcf64612e2997dec3b731445394a9187e62869588f48c51fbb2e013ce53cf38540400a1aebc8214c40ca2d320c2a2676fd3f7b8ca5817
+EBUILD odt2txt-0.5.ebuild 736 BLAKE2B 8d8c30f16f4fece6b38c1d2587c6babfccf5e8d0d80f4ffb24c213406b0f66db3c35419b9d9eade08eb1d061ec36e52cace9fcaf2437e211c2bfd4f1340c445b SHA512 09644e24b7d89ca87fa9152f1c82b6c897f4f419f57242c346a3648dfb662dc25ff9f6e1e9f3ca18ff4b512e4d5801b0c73fddf360aa4311f6500b81ea685214
 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 1e9be393bda1..be432c0d4faf 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/pspresent/Manifest b/app-text/pspresent/Manifest
index 6c979dde233e..c69f5cef37c9 100644
--- a/app-text/pspresent/Manifest
+++ b/app-text/pspresent/Manifest
@@ -1,3 +1,3 @@
 DIST pspresent-1.3.tar.gz 14357 BLAKE2B b15f288f2446ef0a9a00bcf454d9e55fc60a0547c534f0015695c6d2b23c5bd779acd2b423b01f6cd019cff419cdc79da8f8575804440c3f70bbeb29e5fa1b32 SHA512 cfca0b4758d03051cea95d077a45239103f6fd24dada775c3b7fb0b7f78863f6628b530a21834546546dc935596b6d93dbe45048a661fcc41152a4b97b8f21f3
-EBUILD pspresent-1.3-r1.ebuild 879 BLAKE2B f227aa42dc730fe5f8e9c37c12908dd021609e133c37881d04195c56072a54e189b32d0432a08198609f47db83119ea6009a4b8e2d45041cbbff36105fc9f41e SHA512 5f68653b64203fb04496f24664aadeea52f7196c7c48e69bb80765c1bb3e65c9d05d8922bc367f98d629a51e5b49d115420d8a455edaa47efff2db68249023d7
+EBUILD pspresent-1.3-r1.ebuild 861 BLAKE2B b0cd66024af91d76c1862eb7bf99afb7c7eff7115e6c2394aa51d48b905db07ef3d640d0085a74f37518f96a27975154f3f55f424105d06eb55d4a75454f4073 SHA512 fe62aa87d4b7acf113991fed91a39c12a2192c1e0d2dcaffe06b3d64ae546be7dbdcb4b71f72bea89e76cf38e78dad2111163eae7b2bf6df020ca770a31899bb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/pspresent/pspresent-1.3-r1.ebuild b/app-text/pspresent/pspresent-1.3-r1.ebuild
index c13ed4cddafe..20931af5b1d4 100644
--- a/app-text/pspresent/pspresent-1.3-r1.ebuild
+++ b/app-text/pspresent/pspresent-1.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -18,10 +18,10 @@ RDEPEND="x11-libs/libX11
 	xinerama? ( x11-libs/libXinerama )
 	app-text/ghostscript-gpl"
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	>=sys-apps/sed-4"
+	x11-base/xorg-proto"
 
 src_prepare() {
+	default
 	if ! use xinerama ; then
 		sed -i -e "/^XINERAMA/s/^/#/g" Makefile || die "sed Makefile"
 	fi
@@ -32,7 +32,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) || die
+	emake CC=$(tc-getCC)
 }
 
 src_install() {
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index c3d3a97820fc..ec1a0f0a45d5 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -318,7 +318,7 @@ DIST texlive-module-web-2016.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f3522
 DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
 DIST texlive-module-web.doc-2016.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
-EBUILD texlive-core-2016-r6.ebuild 11520 BLAKE2B 2899191b740ab54cc36f171bfc89e3b9084ac1c67c8c23d5cff7d9ed7c909ddc924872f026d0fc4290851146fa1c65dfc2732865f3c41c62b4a7252ca87381c4 SHA512 684240a46ac764bf5a567ea1fdce38db2e43589b8764afcb793c16f87fad5151163efcb6043ad704aef34b66beccd35afc0f8500252fc5cf70917280c6b23fd4
-EBUILD texlive-core-2017-r3.ebuild 11616 BLAKE2B f8b4714c8c31990b79fdb5af2ee82abada4053d49bbaa19260518bbc0e1f7f793e6d98090aa628bd33d87ea0382e86850f2e6a398041d9fd1e409bf87622c04d SHA512 2601aac905a30b54f49afa470b1d8d081ecf0598a7487899e24a4644a738b57730b51dcc3f5c8efc0eead4bb53a9bd0e5aaaf5e85bc199f72eb8176a4b7db824
-EBUILD texlive-core-2017-r4.ebuild 11820 BLAKE2B de1b219af28f8752c1ffd0ead9b365f463eee2833cf0b6efc573cc9b6e89ed70fea509fa721c9e00bb13f3a85d26d5670c2c8225bbfaba0befa58e7f73f84034 SHA512 2434d690a2a09e275a4ea10aa295e8d731a7be6cde8bbf7bfb557c3a0899eb2aa4254dbf42ab39791079fae022b2ad64f3b990ac6c92c1a09799019b916325db
+EBUILD texlive-core-2016-r6.ebuild 11521 BLAKE2B 0ee71aaf90d8803d9f125ea694268fe9e4ff50e5affdeaa3d7b2a9e2b014028eee543c3fcf0131e5ac86c36328d983023304118813e7244ff353ad2bef7b182e SHA512 1d78173f44f67d97f389256573aad38cb43eb87e4f202480bbe2aa30f9a27b626056aaa50b791e939f09652d031d2a23406597f96cef55ad928c37ed973e49b7
+EBUILD texlive-core-2017-r3.ebuild 11617 BLAKE2B bf43718d6880773265bf2a92fe7917e454eac57f971cedb9834567823248383c06e57728a911cff591ab5afde636a26b110ff42d762373d4cef395c1b79217b3 SHA512 c2bf5307f56da0e6fc81bedc2708e2c5e81216fd990bea46273ca013d87a5667dd6e94c85c98f1b0a77b428144c657fc1ede61ae3aecac9f83d7a8e1418232eb
+EBUILD texlive-core-2017-r4.ebuild 11821 BLAKE2B 62559c2b3c51c9bac7208e1021773307120c4edfc1b9a5c7d962b744807fadabe9054b1f2442d389fa5e0ada4e88bf62011f1878139293606831e3cdb6c310cd SHA512 e675228dc4887beb96649daed4cf3f11f193f4f2d617226949a417532bc7db21d158ae700136155ea579d106830cf7415dab2566dd75115c8a73fcadbc35c736
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2016-r6.ebuild b/app-text/texlive-core/texlive-core-2016-r6.ebuild
index b16827b3d88b..307aaf24b7a7 100644
--- a/app-text/texlive-core/texlive-core-2016-r6.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r6.ebuild
@@ -12,7 +12,7 @@ inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
 MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
 
 DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
+HOMEPAGE="https://tug.org/texlive/"
 SLOT="0"
 LICENSE="GPL-2 LPPL-1.3c TeX"
 
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index c303fed4a32e..adf3b9b004ec 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -12,7 +12,7 @@ inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
 MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
 
 DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
+HOMEPAGE="https://tug.org/texlive/"
 SLOT="0"
 LICENSE="GPL-2 LPPL-1.3c TeX"
 
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index edf3f3645c22..44ef1da83724 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -12,7 +12,7 @@ inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
 MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
 
 DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
+HOMEPAGE="https://tug.org/texlive/"
 SLOT="0"
 LICENSE="GPL-2 LPPL-1.3c TeX"
 
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 4416db767195..a4df2cea042f 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -3,5 +3,5 @@ DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 EBUILD ttf2pk2-2.0_p20150521.ebuild 1380 BLAKE2B 8a332fc015d1e328b342328096e173d90b4652b3e29ee5f235661741e350404edc9eebd919dbc7fb8d2607da798e333eec8b4dd714967296f96dbd51b2896872 SHA512 86c034a1d85d74894efb55ad7b6aca38606f8291d58d993dbe17c124e44cd71bce7b8aed5e4264e45ce4d8b43ce8e8e6108f42820d86e23448f62f7576219065
 EBUILD ttf2pk2-2.0_p20160523.ebuild 1251 BLAKE2B eb840feed846e552a3202b42db5872d26c19949be4444ec538470e02ce1da85a2a3e2f3cd03e0d1e81f0282978cb86b3282310ca8865b576c6be4eadb393e0b9 SHA512 aa1cfe98ed451aaa6066e4815698113ea0e925b4361eb50ebb51935089f26ac438e511eb06d74dc7c7737981422718a4e4fe67b5aaa839594d617f0c488296d8
-EBUILD ttf2pk2-2.0_p20170524.ebuild 1259 BLAKE2B c5843e95e6b173bfa0c42bb5354979ad1c748c632c96d6ff1cb9ebcd32f54721649c0dab9ebeee2a8b8dc5d492f5051af0dde0717eb53c4acd2fb5d7fef49fc0 SHA512 86e8c46293db8423998e0939e602a5ab98f960d502bc7ed9a314b040242673c4a8e2520ce3fd3f4f6fd13eda6c5bafba655394334e92aebc15ee926631baa5e1
+EBUILD ttf2pk2-2.0_p20170524.ebuild 1258 BLAKE2B 0b9a5df0cf464b4cbed18f288838f6336da5b97e1782cddb8f08033f5563b91a85a9dd5c9086731c7d0487f007e6ba4a14d9b8c59f851914c1046aa3ae54ff6b SHA512 f7835f1824b8a9550482e6a2d3ea59c7baa400067c68584a7e42b78ea06e4feb32884d634ed3416a28faf5ecf7cbc49704ed7b169d399d621ced3b3907ba2588
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
index 32c0ec660f3d..fd53f7c7ce9f 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 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=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/writerperfect/Manifest b/app-text/writerperfect/Manifest
index 36443b496cbd..3ec38d46ddae 100644
--- a/app-text/writerperfect/Manifest
+++ b/app-text/writerperfect/Manifest
@@ -1,3 +1,3 @@
 DIST writerperfect-0.9.5.tar.xz 302176 BLAKE2B 4ef8fd72f01e3c208a59c520440975f38dcf1edc353134721b7f06d042752adad9c825503f5756a74bede2307f7317c28e054dbcb6c5c1000a606822e97d2c8b SHA512 7467a798da362883101780b598e9a673c10f86f29c01ece1438ea524a0413a00928274f87895f3a8ae26f6784cdcc34e0e84039ca591dc3f75b2e25c53744ccc
-EBUILD writerperfect-0.9.5.ebuild 1696 BLAKE2B 00757bc67c2bd858e9a6196b34d5a471c4f173cf3fd369d25c96724ea778b86b92e91917d04212d03e8f05d5a25442f6cb4ab67d1aa4746bff46c70618540f34 SHA512 e19b284314264db7b16256dfac2bceec1812db0904b8897a04d7ffc788049b32430e4043e571242f69e75ca2480d4afe2f191ec895f024106514ec2a31c3c3e7
+EBUILD writerperfect-0.9.5.ebuild 1761 BLAKE2B ef4e87d22c7ab182cb1f3e9677bbfa12498f2fade4c353bf1ba0093a4c00ae4cb90d2926b99e799e2dc0304e60102f593126cb0da0f3ee2b4746ef43a6fc1e1b SHA512 95591cec04441b34a37e60460eab58ea69641c9876e7074bcdb1dcd25aa1b7fd438dc52c98f61674b151b82eacdc18cc42c6c844390c6f78ccbd299c07b04fd6
 MISC metadata.xml 1475 BLAKE2B 930b7d6e8f9204281ca5a01d55a66fa635b3ea7680405a16a55ef85dbe572fc82a6ea00dc9a0ba2b98ce2c854b738bff02dd4e99d62e923b42bce9069fce1070 SHA512 759c262d939b9d6aa57d7de21447492d3771f6af011de6a5de83dd81cc115df14a25e20b71ba5643d0089e2b62953312fcf17ca91d67f4b5c046ecd145747450
diff --git a/app-text/writerperfect/writerperfect-0.9.5.ebuild b/app-text/writerperfect/writerperfect-0.9.5.ebuild
index c5ac9ccae9df..ebcd8a970359 100644
--- a/app-text/writerperfect/writerperfect-0.9.5.ebuild
+++ b/app-text/writerperfect/writerperfect-0.9.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit flag-o-matic
+
 DESCRIPTION="Various formats to Open document format converter"
 HOMEPAGE="http://libwpd.sf.net"
 SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
@@ -41,6 +43,9 @@ REQUIRED_USE="
 # configure fails if no import library is selected...
 
 src_configure() {
+	# bug 651620
+	append-cxxflags -std=c++11
+
 	econf \
 		--disable-werror \
 		$(use_enable debug) \
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
index f0cc85e0f276..4cacd3eedbf9 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -1,5 +1,5 @@
-AUX wv2-0.4.2-glib.patch 308 BLAKE2B c75e7a2ea589a4a010110f47c12d21cbafccbdaad9a4d7737977529168ee5f3cc9e9f39b4d000e55f1f38a2cf45799b2c43d27594faa45ea7ce0660f8d28a279 SHA512 4d6aabb5857ccc16b93bc2e21469eaa85a3726f53035439da0c7fab8f86d0d5f4b56de41a7a693ece3af72527b3cddf155b6f6e798f562bb0af1cb0083003c86
-AUX wv2-0.4.2-libgsf.patch 421 BLAKE2B f24424964172016e806d589fdf5ee2b3e4c85bb97f70e58e181eb40382d8caf86998c2a4062911daa10bdc46126f9fce9f20f964b27817ba3c892fbdc76fa219 SHA512 ff42d9fb5191d1e384094f000380bf49cfde89a5f95c9962b0dc02ba226a58e7b47491af317cb2287fdb7d99587352e774a1f2ed8025fa708d0dac0649b6c8e1
+AUX wv2-0.4.2-glib.patch 312 BLAKE2B 7c68aff28688cf4ad7ee99c73d4509197e958bf05fc6dc8a556e2c2376cd586942778dcb8cbb1aa1a80cf24b1ab94415224b5af122756eeae02a316464eb6323 SHA512 0dfa6f75d9c117869eff3c4c5aadaf6096af8b2239626fc249a3df3ddb5437c417c3265a0a5d956af2241c9d7b3cc137b6c79598c38506fedd2964e85bcf54ea
+AUX wv2-0.4.2-libgsf.patch 425 BLAKE2B 417d6b340c34dffee0301308ee5a04f4468a5627670638399535f7336cca7515927392e66dd723e8a13742e71ccb1bf850c7b91608b7f280b545a707d6425a2d SHA512 634b1a336506777f8976b81cd906f8a896e2b777a3f04c5791277ed5ca2856dacb71adab807efecdf29d07c02e4c95b5d6fe143b1660be77e37ed9d7bd177143
 DIST wv2-0.4.2.tar.bz2 452759 BLAKE2B 6134739459617189f9d4e11a660dac25114b5d329b43d02fffe773d25bf62f2eb9f4ccb2712016e670c72f089a6d48f764e99b0ce5d44554d3e9d69ea9e14762 SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b
-EBUILD wv2-0.4.2-r2.ebuild 753 BLAKE2B 91de67ad22faa927ef5de81ae867bcbc1e58822a4ee4acf0f125f6595a4f76eaa0d437a5ae7ce117aa21ebdb447a8f213ccf2306995851b0542f7aa05e944300 SHA512 7a4d2a89d7cf2183d2ccc51f06516783d18f3397682261f24dbb3146aab43570dfadb67c69eeaed888082b8f488ce9f21a85790716ad3638b9f73678beba5d82
+EBUILD wv2-0.4.2-r2.ebuild 831 BLAKE2B a8829c7340d953d9b6329837956f2639936a5bf33c6f88b4937fda6bc0f115c24bf8ad96de3046a41b40db3bea124a2ea436944f07e504d352afc605536f6dd1 SHA512 ee2dc6db1c3302a6938157bccb9bddf3d77ef571a5e10907a2832af93fb6452d8668489c648a7d9b26705b01936f63113b52a69629c44ae4d03159ca70f2ae21
 MISC metadata.xml 394 BLAKE2B 33e5bd22439c91b6c6ae5f1cd67ed2419fd44f90a6f4dad26247d3b57ad3f46ff85a7dde13ecd1d4f859fdd08c87a8a836add617f05a8fe586579189c6df1c1f SHA512 abdccf92962c57c2c206a32eab8e855467874b3e17e8f1fc5db8d84b4c368fd005d3cee9e4bac28bd775aff4e9bd9319d61dc1c0e47492c2c531b41b33a4e4f2
diff --git a/app-text/wv2/files/wv2-0.4.2-glib.patch b/app-text/wv2/files/wv2-0.4.2-glib.patch
index 66fde790d0bc..eaa2a61fc66a 100644
--- a/app-text/wv2/files/wv2-0.4.2-glib.patch
+++ b/app-text/wv2/files/wv2-0.4.2-glib.patch
@@ -1,6 +1,6 @@
 From: https://sourceforge.net/tracker/?func=detail&aid=3544851&group_id=10501&atid=110501
---- src/olestream.h
-+++ src/olestream.h
+--- a/src/olestream.h
++++ b/src/olestream.h
 @@ -23,7 +23,7 @@
  #include "global.h"  // U8,... typedefs
  #include <stack>
diff --git a/app-text/wv2/files/wv2-0.4.2-libgsf.patch b/app-text/wv2/files/wv2-0.4.2-libgsf.patch
index 2367c24aad0b..efbf02f57525 100644
--- a/app-text/wv2/files/wv2-0.4.2-libgsf.patch
+++ b/app-text/wv2/files/wv2-0.4.2-libgsf.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/show_bug.cgi?id=465882
 
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -34,7 +34,7 @@
    FIND_PACKAGE( ZLIB REQUIRED )
  ENDIF( WITH_ZLIB )
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild
index b13fed4fecb8..5f5d76cee7ef 100644
--- a/app-text/wv2/wv2-0.4.2-r2.ebuild
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
 HOMEPAGE="http://wvware.sourceforge.net"
@@ -14,22 +14,26 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="zlib"
 
-RDEPEND="dev-libs/glib
+RDEPEND="
+	dev-libs/glib
 	>=gnome-extra/libgsf-1.8:=
 	virtual/libiconv
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
+	zlib? ( sys-libs/zlib )"
+DEPEND="
+	${RDEPEND}"
 
-DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )
 PATCHES=(
-	"${FILESDIR}/${P}-glib.patch"
-	"${FILESDIR}/${P}-libgsf.patch"
+	"${FILESDIR}"/${P}-glib.patch
+	"${FILESDIR}"/${P}-libgsf.patch
 )
+DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )
 
 src_configure() {
+	# due to ICU 59 requiring C++11 now
+	append-cxxflags -std=c++11
+
 	local mycmakeargs=(
-		$(cmake-utils_use_with zlib)
+		-DWITH_ZLIB=$(usex zlib)
 	)
 	cmake-utils_src_configure
 }
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 81d2b08c98f5..12947b98e102 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,6 +1,8 @@
 AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70
+DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e
 DIST xournal-0.4.8.tar.gz 641240 BLAKE2B cbf82f3ddb27854ce4a17fe80d1ed012f47529ee3f41eac0118f4948f4ca76488fb647c77ab21c99cf19de0016df4db31a448d4c626a42219b2b13b297b5d51e SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf
 EBUILD xournal-0.4.8-r1.ebuild 1202 BLAKE2B 7bd649419efc8c130d88e90303f7b1946a907c8737b1dde4cc5aaf3798e3fc54e7459dbb70abf4fc0539245b710f5b5e8f8a9f125452cd2e0a6d4109532c8c39 SHA512 f872b8b3c4b00a265ab0fc74f33f895c1fbfd676d39df4ebe2a1c2d5282b3265d13f741067ce6f417cc03f437db7e10768693bd9de758ec9b5ffc6d920d300e0
+EBUILD xournal-0.4.8.2016.ebuild 1185 BLAKE2B fb8edbf9bdf19cc7f450592c4addb81afa4369c865bb9a276f4c730079b789d12abe0036b3f5cc1d4b578b3cece037e4288d8c44aeff9b3b7436c5ef29d683cc SHA512 247f3963f18a8f4f96ee69e2497428eb424a11c800cadf7302405b9c192f8d32ee4f7ae5657bdc5d14c1c99c66d94361364beb70d3d5f6de23c2ef1f3a6012bb
 EBUILD xournal-0.4.8.ebuild 1069 BLAKE2B 26606ab4d9128be573c91e33025270ed832f71c9b8d6b27cb1fe80defa11936d3ea8d2643376e691aa365d5140e287cad109be3019de6bcf8f02baadbc45a168 SHA512 7f74070413631ace102df1bb34cc06023d17eb35a6da2e5fce6c09914e6afff101e49eff7cfdfcfb9afc7699b4345e07c7d3ad7c575685269d7050e136769eb6
-EBUILD xournal-9999.ebuild 1071 BLAKE2B 3fd299a2670fb915b6e9bc95f7a043c3a6cd916cfd02b9d754dd9eed6b1cda72196b0d7024ef093997dde7176bfb618d24850cfb7418479062a15feb0a08e5c3 SHA512 8d6d811f448f371fa312e0c27ad0d03a4c1df35451e94f2accce3300a3882da2d02ffb6a49fe9af04771d6197ac8799f579aff9d513629e216adc3e81e9eaf56
+EBUILD xournal-9999.ebuild 1185 BLAKE2B fb8edbf9bdf19cc7f450592c4addb81afa4369c865bb9a276f4c730079b789d12abe0036b3f5cc1d4b578b3cece037e4288d8c44aeff9b3b7436c5ef29d683cc SHA512 247f3963f18a8f4f96ee69e2497428eb424a11c800cadf7302405b9c192f8d32ee4f7ae5657bdc5d14c1c99c66d94361364beb70d3d5f6de23c2ef1f3a6012bb
 MISC metadata.xml 652 BLAKE2B 780548e075d6468df82b41e454b8d77c97eb7c9e4b4e4e286b7cd98a4f6c2d5489b355eb088602f414eeecd32b19b42d7c24aec6b1436aed3c818f60605d54f7 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648
diff --git a/app-text/xournal/xournal-0.4.8.2016.ebuild b/app-text/xournal/xournal-0.4.8.2016.ebuild
new file mode 100644
index 000000000000..50477f8a4537
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.8.2016.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
+inherit gnome2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
+HOMEPAGE="http://xournal.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+pdf vanilla"
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/atk
+	dev-libs/glib
+	gnome-base/libgnomecanvas
+	media-libs/freetype
+	media-libs/fontconfig
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+RDEPEND="${COMMONDEPEND}
+	pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default_src_prepare
+	if ! use vanilla; then
+		eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" desktop-install
+
+	dodoc ChangeLog AUTHORS README
+	dodoc -r html-doc/*
+}
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index 422842c0e82f..50477f8a4537 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-GCONF_DEBUG=no
+EAPI=6
 
 [[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
 
@@ -23,7 +21,7 @@ HOMEPAGE="http://xournal.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+pdf"
+IUSE="+pdf vanilla"
 
 COMMONDEPEND="
 	app-text/poppler[cairo]
@@ -45,10 +43,17 @@ DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	default_src_prepare
+	if ! use vanilla; then
+		eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
+	fi
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	emake DESTDIR="${D}" desktop-install
 
 	dodoc ChangeLog AUTHORS README
-	dohtml -r html-doc/*
+	dodoc -r html-doc/*
 }