gentoo resync : 20.11.2017

16 files changed, 52 insertions, 304 deletions

diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 52442f5f11bb..b1925b35f90b 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,10 +1,12 @@
 DIST dvisvgm-1.10.tar.gz 831654 SHA256 339f4dcef0916c1daaf1b65d966737279464ec6858b28fda7196d8030d7f3735 SHA512 2d3cb2e6b36d6a3b996347b6031f67bb89bc76d2bf0244347e512e66333536638caf855d9856771b10245387abae99a06d4c6fe33def814cae639810b4cfe906 WHIRLPOOL 398e5378ce6e84768b73f7d6e9776eb177619de785a70d8fa416fecb275903e49c065ec23d78881eede9d4944525ecfba44d34a5d1b74b87dc1ef6ecf127b869
 DIST dvisvgm-2.1.3.tar.gz 2802278 SHA256 553215051e85882ab4658c294ed0483cd5009d295f0a38dfccb480367abfd170 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2 WHIRLPOOL 0baf0fff0172f9ff7dc95a848b69af240d6008f9f6e306f613f73b02a54d1922407cd12560fe166fd758de5f6f4a04e00e5d50af8098d09d59be84d4353e6962
 DIST dvisvgm-2.2.1.tar.gz 2841744 SHA256 e8b0744efda775561f0ba638daa166d6c8c9e4b10d7b84f3cd8d779193f3d9d0 SHA512 82890cb15f66c88696ab15e15262e8f925e1db88b6b052dbe2408f876c9931d3d4a6b90f16bdac40213de7b7b794ea3b6499efcec3a039a6c92ff2fabfbf0691 WHIRLPOOL 96a575ed70af9fda2a1c5422cb06de405ba93c0831e86fd3d6f1d0e12cdc336ee50b1b569cf49301be9465c4952d3efe7df37b557c806cc89d4f53355a699446
+DIST dvisvgm-2.2.2.tar.gz 2848315 SHA256 76e70b81708f125ba2f6fbc687227e5eb28c6fc4a71e4a99ce58b1b39ff0bfca SHA512 e15384b4842a9c6963110b96b611f4f4beff301818972ef0aa77590b7aefdb488c3df16f93a5b786c97229df730c112db97770b612786fdff9011b5a2808d917 WHIRLPOOL 14942f8bfba83a8c239eb4bb96e9e546e1fa59276155a03c0996d80aa22204d638a3e7ad6f45345f164af49a9fd32c1ec2c76bf9ea9a238bfe16c8caf1a3eb11
 DIST dvisvgm-2.2.tar.gz 2841354 SHA256 8b3a1f12782c2d84afa595cd1952756ee9f74058bfd0fa98e4ac6a06276ef6ef SHA512 310b3272f41d3378ddfb5663d4b6906f7b1cd1dfbbcff0ad249b27c5c37290c5eb496ec84a536f3166a51de4708f6069da9c6811bb7fc9e667d00b1c3aaafd53 WHIRLPOOL eb59e83ff8ca32e1f74015ed3d019d4be128a92a912f503283cc951cf09b4359de29b6604bd908cddf0afda7aced7f9c63ff7adfb2179727f993c6521b7b9972
 EBUILD dvisvgm-1.10.ebuild 1090 SHA256 0abeb2e2aa9694b5f21e412da1881a94b66ba13314933db21bf24052f8fe443f SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc WHIRLPOOL cd3632ab3ac688531b67095213074baf79a22c1b4f3fd85faa5410ea87def6aa2da0dbd92cb982eb7de6d928b9cb2b0bacc1e23265c0efdb2ce62d72ea85f329
 EBUILD dvisvgm-2.1.3.ebuild 1145 SHA256 f5c3e052e00808044daa8d9a84234b7a4104cedb200523be5ef217865d9f54f8 SHA512 37c82be8f2bb33c19e0a82f8e6dc927973b727e9d406591a4774f12f1179ebfea4c04dd5c79bdd28869641afbb65c44bab0a8589ecca1ceaf62ca2da3c2f1b0b WHIRLPOOL 32faaa4de0bcaf71ab617bbe839f6cdebdb673feb7c0917924597585b130125b23dbc5028a50808f1d5314d98fc5e5613c555adc19fae8d64c15a4913d300f81
 EBUILD dvisvgm-2.2.1.ebuild 1153 SHA256 628d7a2ddf5048a9e0411b2212004250b22f8f1bcbcc56e77d0d3c4457817e4d SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc WHIRLPOOL d0176cf4e8d326cb1b9d69a296f3b32c3bce21dd9a56584e0b31223e98697ca79b2754c0c80a86a7b734f89bb1049f950f738542ac331946d524952469a725b9
+EBUILD dvisvgm-2.2.2.ebuild 1153 SHA256 628d7a2ddf5048a9e0411b2212004250b22f8f1bcbcc56e77d0d3c4457817e4d SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc WHIRLPOOL d0176cf4e8d326cb1b9d69a296f3b32c3bce21dd9a56584e0b31223e98697ca79b2754c0c80a86a7b734f89bb1049f950f738542ac331946d524952469a725b9
 EBUILD dvisvgm-2.2.ebuild 1153 SHA256 628d7a2ddf5048a9e0411b2212004250b22f8f1bcbcc56e77d0d3c4457817e4d SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc WHIRLPOOL d0176cf4e8d326cb1b9d69a296f3b32c3bce21dd9a56584e0b31223e98697ca79b2754c0c80a86a7b734f89bb1049f950f738542ac331946d524952469a725b9
 MISC ChangeLog 4695 SHA256 b982de63bec8e30ac538cb1f2376dec0a0f1546e8e80b77dde289e95dc5a9dc8 SHA512 8b504755170ee752702619e87b454c81355ba880602c93f302d873baea835e542b639e87b03c31a33e2f2d57f8b1d994554b874b0e98526f773122cc1f3edef6 WHIRLPOOL 798d1fccc8e3b41027d2a5197b14cf84b126ef1e20034518e142c0f9370374424b56cfda19ef59980ea37f8291dea8804d44d0e9b79776d1509552cad90c2b84
 MISC ChangeLog-2015 9647 SHA256 638cbf58bb9c77fdbabf46ea99d531fcd67995b110465e9bb7ce69d2b67c6b7c SHA512 b54d784e94fff9a96ad524265c57ec17eb9aa0057c795fc9008ae31bbb6e02942a7e449bd086e306ff4ab60e752699130faa45a496996cbbd690db593da0963c WHIRLPOOL 6641485f75337b83ef59fdfc89afd632a10b2638b6d0252826407e660c6500fceb04db41827f9f8bff536d154947c43a4967021fa24073ab229d280054789a71
diff --git a/app-text/dvisvgm/dvisvgm-2.2.2.ebuild b/app-text/dvisvgm/dvisvgm-2.2.2.ebuild
new file mode 100644
index 000000000000..4361100b9e29
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.2.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 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"
+
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	>=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() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	default
+}
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 0fd7cab4e8b2..2d0283a2f042 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,9 +1,6 @@
-AUX libmwaw-0.3.11-CVE-2017-9433.patch 792 SHA256 4bfe6e85cad2d9b5e8fcbc59c15d09cfbeab93fe310e05f6bf4c4a54a083044d SHA512 a5f2996dd2e2de6eec0c637ee9e9777a803a4f7386c38436ad59c0af972c0a2b0ababc90018e5ebf0a67453fd66f154c175b82a1fb7dc6ba82d16468f7aee696 WHIRLPOOL a90b6109af04787d923e4f5ffb0fde62e2aee201e59c4f29b6a0d76e9e9ff9e1bb174c0462831080e30c66f4be7741e5ee01b2c73a8e1d7377153641727a2f33
 AUX libmwaw-0.3.13-buildfix.patch 562 SHA256 f290d981f7f0751e2bc7b340d77b972d52dba722c543ed8417538930419c35b8 SHA512 c7a87b316308f4448988d70e07184bcad462b7286e3f690eec8f377dd63ba95653e010bac8c1e00aba821fbab72d9c22d67a859f3b6e9c1bc88b5ca56e3756f7 WHIRLPOOL 52aa8022b7a247ad896dbfe1fde6d2059bb29c033a918015304132f3bdfc7a519fdde256da01588b51b216ad38a77fc825bf8576188e3d41357e87a4de348a27
-DIST libmwaw-0.3.11.tar.xz 1254200 SHA256 4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a SHA512 d4a810c6066023608a15ece8a6bbc958e586d679fc4ad51156091ec88355292872f10198e723e28776b45e140a830fd4c698732cf6103743d6e80ad8e1d778ab WHIRLPOOL 2de11bde90937727372eb7e7d4d1af52b66e8ef2f14bd78ce1d26399aa6ee853dc1fe11000cfcf8a361698296866ced2f2da7848f75763a22458ae0504903b48
 DIST libmwaw-0.3.12.tar.xz 1258972 SHA256 7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7 SHA512 8af8477ff6fc251600f9a66059b20fd8b9fad8d599c01e847d7185944447b3a34567036daff4d4510934aa1462bd4810a39467e8ac0ec223147b3b53447220ec WHIRLPOOL 9dd39fc43c7b8cf3806889a1cabde4c1bbd4f21e5e1ea2dfa66a6ea69f28ab28c966e160d157f0ee4559e85b6b7fac07dfa314d2ef0597986c85660b3a5cc0f9
 DIST libmwaw-0.3.13.tar.xz 1258220 SHA256 db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea SHA512 3d6a5142cc45f6519ac29f935c01418278ed4cc1bdcb0ecb1a190309c43d3f7ee06deab519d29a3e2aec01ef091cb4f4c17809662640b54a8e4fe8d4bd8db5f3 WHIRLPOOL 34310e946e398f577c76f2eacda496b64417fe3f7bc5f02af7852f51fa94c46df6f4df397a02fe56c7585b19dc62b796723b878f7ed66adf3698c14261e01f73
-EBUILD libmwaw-0.3.11-r1.ebuild 1080 SHA256 0900891771d1ed67d8a028c295ec2993ec66cbf1fc20b5664c2af922d6118b57 SHA512 a044974bdc83a5d7ad63fd585596ff366cb3f1bcb16147b11e7813242a36ae3f983f05a49280a6cadf1468f658fbefb22fa0973fad03a80eeb740d317fe34163 WHIRLPOOL 74d385a364de0acdf748a4ecb1eaa4c4b05a02d194e80cdf92d710517489ec33905fd98e3da0db1e04965ac0cae88d2595d94b16ea3f67cf097b28d5e7282f75
 EBUILD libmwaw-0.3.12.ebuild 1035 SHA256 86d983b1e06be30606c910717afa49babbae02ab464995b88d73f6e216c1fe0a SHA512 7c53399cc2575b1859fb5bbeb9ea2b11b84066119d3966def2addf60991b7c8c21da225a43e00c48cf6cc2130b1f82e98453ac637d0ee4ce0bd6768498731478 WHIRLPOOL 879080328d9a8f90915eacb183df9c8715064284e39c7dba3d1c9a66c1acd9dbeeb59ecb1d9052a7a956fbcb79f6b906b1f34eae13488176fec8159006010f48
 EBUILD libmwaw-0.3.13.ebuild 1057 SHA256 e09eadc60698ffad276d98061675e0813069d190f19c723f0f6b3f9ba1e0786d SHA512 2b8dce5c0855e092848a9436630ca0fbefe23763093f1482de12c208651e592e2c619facf714165fc1e0d571421b1296652ce7a57d3448410decc4236161ebc8 WHIRLPOOL fe35b86418782318b8ffebcd28cb89cbcfd5f617d62b5af1abd89fa6a28bc2ab3ddc82d1212b7bc8ee64936f3bfc8236b25c31aba9791af280c57603ac15db2f
 EBUILD libmwaw-9999.ebuild 1010 SHA256 be6b21909def91af42f80e99998bda583abe7a74fd7a5dc0f9a1612e6b33d09c SHA512 6fe07afbf646c96d4bcf22264cf8bb4de3bda52aff57d379eccd43c376b9ae96c82eb0a95fea134ccfed7bfdd0cb1907735451aa7ca7926e6ffaa734776324ea WHIRLPOOL f24f2992e4be04f389f2f7d2b8a6a87f3abb241f4652bebe597165435dd9a695d3bd213a13ec821d15bd604b2443472f6bf53388fe1353fabf5164c30c29880e
diff --git a/app-text/libmwaw/files/libmwaw-0.3.11-CVE-2017-9433.patch b/app-text/libmwaw/files/libmwaw-0.3.11-CVE-2017-9433.patch
deleted file mode 100644
index 4918fd4b6516..000000000000
--- a/app-text/libmwaw/files/libmwaw-0.3.11-CVE-2017-9433.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 68b3b74569881248bfb6cbb4266177cc253b292f
-Author: David Tardon <dtardon@redhat.com>
-Date:   Sat Apr 8 14:03:29 2017 +0200
-
-    ofz#1037 resize vector correctly
-
-diff --git a/src/lib/MsWrd1Parser.cxx b/src/lib/MsWrd1Parser.cxx
-index 63547e6..3626064 100644
---- a/src/lib/MsWrd1Parser.cxx
-+++ b/src/lib/MsWrd1Parser.cxx
-@@ -902,7 +902,7 @@ bool MsWrd1Parser::readFootnoteCorrespondance(MWAWVec2i limits)
-     int id = fIt++->second;
-     fPos[1] = fIt==footnoteMap.end() ? m_state->m_eot : fIt->first;
-     if (id >= int(m_state->m_footnotesList.size()))
--      m_state->m_footnotesList.resize(size_t(id),MWAWVec2l(0,0));
-+      m_state->m_footnotesList.resize(size_t(id)+1,MWAWVec2l(0,0));
-     m_state->m_footnotesList[size_t(id)]=fPos;
-   }
-   ascii().addDelimiter(input->tell(),'|');
diff --git a/app-text/libmwaw/libmwaw-0.3.11-r1.ebuild b/app-text/libmwaw/libmwaw-0.3.11-r1.ebuild
deleted file mode 100644
index 3007843c6004..000000000000
--- a/app-text/libmwaw/libmwaw-0.3.11-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="doc static-libs tools"
-
-RDEPEND="
-	dev-libs/librevenge
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2017-9433.patch" )
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# zip is hard enabled as the zlib is dep on the rdeps anyway
-	econf \
-		--enable-zip \
-		--disable-werror \
-		--with-sharedptr=c++11 \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index f64f3185577c..1d516b08c14c 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,7 +1,4 @@
-AUX libwpd-0.10.1-CVE-2017-14226.patch 2247 SHA256 de7ecfd890a8d71aa9a944963b17d0aae65aef554bb2ea8412e7013b4399f50f SHA512 f817c9f962b8caf3919eea8faf8c9222515b909934f49efc9f3d0fdb406e680ce05d1407cdd74d4befbfee8d2db41520f0c6c756c6d050720cff7f5d16aae073 WHIRLPOOL be826095c13e44d10a13c5a4355f3a3de61f4042a5389283f414cf95fe3e99bbf74afa5f89818d4418e41d5c84cda2938e5a010dba8886cd9d16f81c70b55697
-DIST libwpd-0.10.1.tar.xz 524004 SHA256 09d3410bc770f9d9eedc8544b5c211771ea3322de3fee19b58ad7d40fb2984f6 SHA512 976694b5e02fd9eb0b3769d5071e9ae88505f491d8fa34473e5b99cd350060a85ddfad9b3c38e9b37a280e695e4571d353fd69fe7b69a627097587912b58ad2c WHIRLPOOL c6c1124a7124edda4dad6788794c46067ad21c8fde0765ff1b1ca6305c08139e86ac0667d6fd6ca53e4bed41ad0b7aa6b4803fad5f7f72c529cf0c3b22bc7b43
 DIST libwpd-0.10.2.tar.xz 536400 SHA256 323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610 SHA512 821dbc0535ebd4fa41bcf984e344e11176862676c66abebe45cf4284f8de6e6cc7629f8a605b169d034a5c2f3e2461513d61e11e549ca73b8328eb66ac3bdd79 WHIRLPOOL 9ac29bab74f6131966212b932601e397fb5f291aed78e5e1e9da1bafc3ac21329bf1f3b39fde4ed8e8b84918903bb5142624a44293631c515c96b8f9d3511cd6
-EBUILD libwpd-0.10.1-r1.ebuild 1357 SHA256 a01a046ab4f4bf3ec628026f38853a3fe8d81760ec1ea10a4b6be49c1e742172 SHA512 88614a13745eb1b594944ba6c4b68620fa4cf9c96f0d040e7e1a9b2e8f07733b6a93919086fd943818eedc0e29a877a682d19c3032a12c14aade9c96972f66b1 WHIRLPOOL a6937a87472fcf1e574f56ecfc15ec2c28f7a0bb81410928b5d3d75e97a6f6c90545d38cda4fe707380d05c6da752f77c5247e5a8c623db9374de7e3119f3b99
 EBUILD libwpd-0.10.2.ebuild 1304 SHA256 32efccc15b5e79e7efafa92a5e0b4c5e94e73995925495acc609481f87101d73 SHA512 3c2aef394fc4ddaeb66a437697c4cd5cc37f04d989f4e2a7d654b602b2c9ee13e2f3ce413ad61cac53567f8983326ae209323e989421977ae60b035182a0f48e WHIRLPOOL 0e3ad940238f9b43f108d038091f7252200990ebbf0e514206cca2b50c30ee29958820deb92ecea90dee66fd7fe9f7f8844dcb664d79d3fd1417fdbfa5c2c800
 MISC ChangeLog 3491 SHA256 9602eef0338576e65bcb7f493e9c270c2cb8a4081cfec334a667439cb27ac932 SHA512 115ff2b61759e6ab96d55acac00183b1f28108fddef5205ffa4db59b260b856ccbc8ff47b1e314a29ace1f39e70bd2c8597aa7c614893303a16b7a545775e292 WHIRLPOOL de14db0e27d620e6d3f3881daff03e2eefda3349251b274526c34af0efb4cfacf516b335ba7dfd7b94e1c48d43251161892917940f289da9ffe2ca41360a5efe
 MISC ChangeLog-2015 16613 SHA256 f97236f0af538975fa7a4271120f88560e7f39c1fadf6e070255642c995dcddc SHA512 e0004d6a76aaa241f534f71c542671b6ce278f8859d79a36f68d4a0a04c7cd5632b4c112ccc3f0a1f76403311c8961c0297559df7015910cf3fa0f33cf6911b6 WHIRLPOOL ceec052621b8c713fc0d14eeff309f1b6304db6172427cb1df14c6ea736a9fc3a9320fa6b9618956f0efbe811336e8cd78db474a7e86689578e786f3b4e3011a
diff --git a/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch b/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
deleted file mode 100644
index 4a5c0df922fa..000000000000
--- a/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Gentoo-bug: 630682 (CVE-2017-14226)
-
-Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1
-Reviewed-on: https://gerrit.libreoffice.org/42054
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
-
---- a/src/lib/WP5StylesListener.cpp
-+++ b/src/lib/WP5StylesListener.cpp
-@@ -85,8 +85,9 @@
- 		m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
- 		m_currentPage.setPageSpan(1);
- 
--		for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
--		        HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
-+		std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
-+		for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
-+		        HFiter != headerFooterList.end(); ++HFiter)
- 		{
- 			if ((*HFiter).getOccurrence() != NEVER)
- 			{
---- a/src/lib/WP42StylesListener.cpp
-+++ b/src/lib/WP42StylesListener.cpp
-@@ -84,8 +84,9 @@
- 			m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
- 			m_currentPage.setPageSpan(1);
- 
--			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
--			        HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
-+			std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
-+			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
-+			        HFiter != headerFooterList.end(); ++HFiter)
- 			{
- 				if ((*HFiter).getOccurrence() != NEVER)
- 				{
---- a/src/lib/WP1StylesListener.cpp
-+++ b/src/lib/WP1StylesListener.cpp
-@@ -83,8 +83,9 @@
- 			m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
- 			m_currentPage.setPageSpan(1);
- 
--			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
--			        HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
-+			std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
-+			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
-+			        HFiter != headerFooterList.end(); ++HFiter)
- 			{
- 				if ((*HFiter).getOccurrence() != NEVER)
- 				{
diff --git a/app-text/libwpd/libwpd-0.10.1-r1.ebuild b/app-text/libwpd/libwpd-0.10.1-r1.ebuild
deleted file mode 100644
index dbd2ea12c0ef..000000000000
--- a/app-text/libwpd/libwpd-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives
-
-DESCRIPTION="WordPerfect Document import/export library"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips x86 ~x86-fbsd"
-IUSE="doc +tools"
-
-RDEPEND="dev-libs/librevenge"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2017-14226.patch" )
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable tools) \
-		--program-suffix=-${SLOT}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if use tools; then
-		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
-	fi
-}
-
-pkg_postrm() {
-	if use tools; then
-		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
-	fi
-}
diff --git a/app-text/libwpg/Manifest b/app-text/libwpg/Manifest
index 0d30f00a8e17..0e662c640d2e 100644
--- a/app-text/libwpg/Manifest
+++ b/app-text/libwpg/Manifest
@@ -1,6 +1,4 @@
-DIST libwpg-0.3.1.tar.xz 316576 SHA256 620d888c10d7e1127d5123ff0065f1b62b86b91bac27d8ae10dcfbdb6bf4278f SHA512 5222609510857d32250e25b1108ecf4c0ce1e58fba280b7c15d400bc8963112adaa9fffa3c21087d4984ec52176d69b30bfc9460ffef978d6b0d7ccc400063b2 WHIRLPOOL c35c51b5098757a0de9a1288d185708775d4ecc2b69ad76e818df5308ec1cbcb870552d45edfe011f65aff141e12656bf98a8ce5207fc0f12ecbc9c705afb3e2
 DIST libwpg-0.3.2.tar.xz 326840 SHA256 57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33 SHA512 f3f76a17056274b2dfd11ce4eb451411d8458b00b3f7be4fae0a932a382f247adbaae1f4f8f6005e7b84f063e415ef5ab609015ba32f779c6ab2f0404b275f3f WHIRLPOOL 492ebc20d136ccd2525c9e1b1ac5613dc6dc74df140c1e190defa22fa5fdb2c04765c5121764c0452087ac9038446384634e61d04512046c22784c523791d911
-EBUILD libwpg-0.3.1.ebuild 1284 SHA256 cb0f1a1b494009382dd1565890ca5d1de166ea64a8a4258d9631ab82c867c3f5 SHA512 10c37c3bc9046758d110594f43182c5b0a95ea63febce3a5aac282940d8c26bc698dba5c08bfba5d7b18b2aa26291d44bd3707a1b60671a25c07d90912248d5b WHIRLPOOL 771fb7bc416131d791cbc948d4a42fabcef10c4605cc5966f30a45a13465b62407257aa710ef583397930cbda933f9217e14cfa767bab9205713d4e9db5f02e4
 EBUILD libwpg-0.3.2.ebuild 1284 SHA256 cb0f1a1b494009382dd1565890ca5d1de166ea64a8a4258d9631ab82c867c3f5 SHA512 10c37c3bc9046758d110594f43182c5b0a95ea63febce3a5aac282940d8c26bc698dba5c08bfba5d7b18b2aa26291d44bd3707a1b60671a25c07d90912248d5b WHIRLPOOL 771fb7bc416131d791cbc948d4a42fabcef10c4605cc5966f30a45a13465b62407257aa710ef583397930cbda933f9217e14cfa767bab9205713d4e9db5f02e4
 MISC ChangeLog 2904 SHA256 2070237e1d04337313d96ae6294f0189ffa5a5bb86c281c4d2415a33f3ede301 SHA512 6acaa78ea311cca014b2c5e8f2c9fa9ab8ad8fafccb9914f8d2dbf2f8c5d4b1ee1e6950551fb182206ae35ed73c7e14b08f72685592d9f91e4f7fb50b4810469 WHIRLPOOL 186287c0d8df8784a2e903a38b07042c67cb381e391b0e78291683c122f5bc6cc9d83402be23f87cf3f9c9337b0a970dbd2c256242de50444bf19ae1957b45f2
 MISC ChangeLog-2015 6547 SHA256 21c4a0c94bb8b435b55eb5452f782eae74b8e9567ff01358ab36c99e6a04ff95 SHA512 34623db3f0a6d2430112de405738c730b3bd3f2f5d464604f3053c0bf1c8a669bc3979dff5b9e4648bcdf1c8697fd6370407fa88810446a1b7776dd9d07e80ef WHIRLPOOL 48ff621ce5a002b09f8b4a798e5a5f38c68ece7c550c72b299ca45db3f6c027247632e92e0289ba6c81c2f309d02e90fd5069d7cae4301555e51ee601c1470a2
diff --git a/app-text/libwpg/libwpg-0.3.1.ebuild b/app-text/libwpg/libwpg-0.3.1.ebuild
deleted file mode 100644
index 46042da23141..000000000000
--- a/app-text/libwpg/libwpg-0.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives
-
-DESCRIPTION="C++ library to read and parse graphics in WPG"
-HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	app-text/libwpd:0.10[tools]
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf \
-		--disable-werror \
-		--program-suffix=-${SLOT} \
-		$(use_with doc docs) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
-	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
-	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
-}
-
-pkg_postrm() {
-	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
-	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
-	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
-}
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 2c7b30ea1e69..b28d96ac956e 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,6 +1,4 @@
-DIST libwps-0.4.6.tar.xz 592276 SHA256 e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0 SHA512 00d1d9108f405cb5eeb67985057f0c6a5d9dd8ef9c3daeebb6739e10a38a5db7cbf22a9e4d09684452376896009993ba08cb015ec0616b56c222244d87a3241e WHIRLPOOL 31198a1889148c87357c0411cd7c28c75de69048ed9c589e98c8a9f866a18295a6d572308966bc1173f207499616bcd1e87eb48bbbec5193fef36228a23ca5c5
 DIST libwps-0.4.7.tar.xz 595580 SHA256 2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217 SHA512 d38b778016f8ca6a44edba86177d28a3f0bcd338e57276a615eeb9d470def71aa9326c3077789129418b38e88ae6f6d1901d08f5716081ba2eb9847a133c96da WHIRLPOOL 8dd7cc93f9a9da8e1685ab40c9a8fbe92bc0b1ca1c2888c9d70681156fdaea918dcef2bc6ed31f8d0d6a1345009275cb5517cdb513bea8abd90c17b124aba5e7
-EBUILD libwps-0.4.6.ebuild 766 SHA256 a51f5d43bc7d49c107120ca2befeda68d3aae84faa116f507114310bcdac0fb2 SHA512 bbba2450fdfaf1afba70e24b111f901757a3424565df25db914fad9e56e559a1b5b6c386a47f89a5890ce8f9ef0217c18d66796bc7bade923bcc84384b3012f8 WHIRLPOOL f4bd60524482e21ff5af5936befa061cb99518641d2198bf22cf4d2d38201451aa4396c55527d3f50e7e2e0956b9a9c49944d74eb38cde191fba768ba6119a89
 EBUILD libwps-0.4.7.ebuild 773 SHA256 3317c53df188a62a5c3c34cbd3586863cee48e3c39764282efe9506dfdf838be SHA512 b3dc7813691615c354c9fa862e1e8c64a26719392c81a78ac7c2ed4e7954b41d2dfc115ca01fbda09bb54964a1bf79bfba5329ff97a9e0d7cefa87f9f7a45a1b WHIRLPOOL 9777c63ce8eec4c2a9e4c3f80079ed976d943ef191f404f8441ac68dd863eadfea020a90438f025cb2222018f5a68679ecd987ba6f7079de6fb2eebbcdb7d672
 MISC ChangeLog 5631 SHA256 ae6f5410bc0d2c239f3819bbd1c5a8394092ba30f5068590082bf06a713f82b7 SHA512 83f3217b2759dfce2e32913e85119a3c79c7f3163c8505cd17ba4fe89e2ba50a3c8bd3d190d9b2b851a2419047e1b0ed9266cb0504e1ff0cb6404f882e95565a WHIRLPOOL bf41a82f33f59b353a1cebb81fd0d1206766209200721b052ddfb685b60475fbc38b2a661568d6dcb7772408bd41011d714c558e48b7cb12160e6dfed17d0d26
 MISC ChangeLog-2015 7840 SHA256 65bddd4d5e189b67fde63332a26b0fe069eefbeeed88c8a76b394f278b8fdec2 SHA512 bfa05554c7acc0c1ad74f5be0937c310ae8a6a8de54902b0312536ecea39b0e8a7f4575ab5ff8fb829d02b1d83e446ec7456917c434861e2e4bd1ef0c8c3a32d WHIRLPOOL 53599a84f271e81723bff43e284a773ac0995c52914528ca0bb8450135fb3dbc30ebff72e20829e6d80dde3fbb46493b0da3e8e56a54f6b6ee13be57eeff2a95
diff --git a/app-text/libwps/libwps-0.4.6.ebuild b/app-text/libwps/libwps-0.4.6.ebuild
deleted file mode 100644
index c4509e0069c2..000000000000
--- a/app-text/libwps/libwps-0.4.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm x86"
-IUSE="doc debug static-libs tools"
-
-RDEPEND="
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf \
-		--disable-werror \
-		--with-sharedptr=c++11 \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index f68a732f50dc..3bd11cd6db3c 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -3,4 +3,4 @@ DIST tree-1.7.0.tgz 47082 SHA256 6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f51
 EBUILD tree-1.7.0.ebuild 1063 SHA256 b4c955c2beb5dad0a8fd4d79a2f623126c159d4db218e7c158a0a025e8ffa715 SHA512 f949ab05513709e1f2f1ac1ac16aa35b29de479dcb3077aeb1ac3ef3704a94fd769ef2bb06b57b0c031245e0defd8742e77a688cd33a2d80d51ecf2515c49cad WHIRLPOOL 495e06ee433c915d7d869c8d53ea132235bc09d3ff6b2b3f924d76e819c387acf6a1c9a5942df6aa3ecbbdd002a81a384ba35e40f1947c3969f364cb0525f733
 MISC ChangeLog 2189 SHA256 5a406b99611ce64a756ebd921351dacf027e40081007346f2d31b723d5f7829d SHA512 4f6aea0c0c0556cc7816807e1009ee647c1828a1137ab24d77afdf35e3fcfc6c23c22d5165c76b7afc13f04f72b7b3659efe97a7af8f1acfe89e8b0de6867da3 WHIRLPOOL 13571ee6d8b7c44a9d7b36b8acf6306aca3ced22268636ce03f016e1b336d66411b6232ea74d5148cb08b23c0ad5997e879f21e62024eaf7c2d2756bd9fdb084
 MISC ChangeLog-2015 12660 SHA256 50c4209b5392dec42818695fa16dedc65b9b2b951dd76057be0fe84000c9292a SHA512 bdc2630b80cf57a1dce3d0d574a470c37ee3c4ab604903e098ac64ba74b289d0baf22a01a3a15cd6ebb405d2e098f08df0745883069be98375cab37188835508 WHIRLPOOL 24e8e1db54157055677ce181d7afe42dd2687826ff4845a98697e7e34b898e35fa179e587cbc33a0f699ca83921a073cf5ec0650c79eecb89cecba974b91c127
-MISC metadata.xml 258 SHA256 ce7b013f070f6e21cfb6b314e4e389150d9e6516b6261d3c779f0aace3d28b34 SHA512 7cab321cbaf600074e669240c5db4a45a146d11bf6e568dc96c135447500d713a8eebc12d5fce5592b55eb36d79130d48b44e27756ad5a7ace097d915b9851d2 WHIRLPOOL 60198ed362a2e09f31b51427c7316266fcf220691cdfbb663af5557f70460cb3a8ae84d4535fdcb09eba85d848e86219030ef4a25bdeb279bd5951c360f36492
+MISC metadata.xml 581 SHA256 a6f1aeecaf8a62bf29012a730869a69e3bad33f6b00a1888088a93c76eeb4c59 SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42 WHIRLPOOL 6757e34f64772947389288c7c1efdf891a3c071724924733a8f97c4b2bc9b252f0bdd59cd4026f3c49b8bc753fc91192000ebb279fc6083b78b6b281dd0d7ebf
diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml
index b8a4550367f9..c30fee716df8 100644
--- a/app-text/tree/metadata.xml
+++ b/app-text/tree/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mr_bones_@gentoo.org</email>
-    <name>Michael Sterrett</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>jstein@gentoo.org</email>
+		<name>Jonas Stein</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://mama.indstate.edu/users/ice/tree/changes.html</changelog>
+	</upstream>
+	<longdescription>Tree is a recursive directory listing command that
+produces a depth indented listing of files, which is colorized ala 
+dircolors if the LS_COLORS environment variable is set and output is to tty.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index b68bab24f55c..b42fd4f4374a 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,9 +1,7 @@
-DIST xapian-omega-1.2.22.tar.xz 437556 SHA256 a7d4b00f6830d003490c0f727fc03584e703cd6e96738e03930f135cd966381b SHA512 c90ef3658cfb7f0337aa946ad04a7173d0aa89e5179c8b9edbfd78156c11d93d6a9ef6055142d26ecd95af8b0cbdf3b061e505c75f37f5e1e3b2ffc272fbaa3b WHIRLPOOL fa500c681fe1c8b82c3d469183ce987b38cd91f110ed1cd7b4e5372525a503c28e310abb15afc31892f2fa4fbd8e74bce07c1b618996541500b3f8d114b06920
 DIST xapian-omega-1.2.24.tar.xz 438104 SHA256 45fca431b812ddacbd592b522389474317af386b3ab554908edd36fc5918da53 SHA512 df483ed1410ca04df3b1ec4248442c91b03bd407737d022e494ffe3e14d62a41ee73b27114a979f59825e0ea2f2d16e0eea3c518a8db0094d697f0093e21f6a7 WHIRLPOOL af7a01659a48cf63a63dfe231cd39bc9d1dabb4e3e097262d21b73d3b99145ba3fe348c3126103dc3c91f4b9a2a1a61c1a4a80b0a0830580bcdf1b5a0cd8c393
 DIST xapian-omega-1.2.25.tar.xz 440224 SHA256 041ada3c22d5a5f1c10fd3681426377696924def75ea6cb6710a182016bc7482 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c WHIRLPOOL 2fbbcad9807e15013b2c570ca12d6b70bca9b13ceda234be92a149e71f329ea4062a0842f0be889395cca5f9e082031b9ad05460dae6ef45343243e0e159c011
 DIST xapian-omega-1.4.4.tar.xz 501712 SHA256 14dd790b94b828b457120439886bb5de59ccb5d7a8cefcdcf47daba5817e895e SHA512 927c6afe24f8a13018fcc233e874c71c0912cb6200094f7246c12b4175bc48d752312e57128a314e7674a948a50ef092dd7f2dc8910db7df8f3ccf9c44f38533 WHIRLPOOL ef061913e5997bab155979e75ffe3ada19384f58e2c75c8cd5957bfae0eada5b8f110b79f63e45b28499222395500d923828c43e3890e11bc248689e43d8ae85
 DIST xapian-omega-1.4.5.tar.xz 502820 SHA256 99c93ca908509daebbaa5c17486878810364e6a623c7c5856fbd40722743517e SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893 WHIRLPOOL 9577870aa3d0f0ad79a65520d4183c726ce8256a7c334f4bdb7c564e2d6bd4fc8ccfe78dbd05d3e484f4224ce7dce5cb7b7715c5f98584ef10e03da4d357f427
-EBUILD xapian-omega-1.2.22.ebuild 756 SHA256 c88a2ea6a669b735cba2d7ab584bb490c06c48b3d1cbb91b0dc1a5e6a47fdc0a SHA512 413a7b72ce7e4f05b84e4c8e798dde421decb286bb3dcb5ccd9b7f37596160cb41b8c35f7cd330971f0223b05aec9308950125d078be0810f2fb09bc77ee2406 WHIRLPOOL 5d34c10dceb36624463a3fc479fa6e631d899c24e72f45434a640169e938a01ac22db466081b664783da3e8aa150a516a9ae8e6fcb2e41dc6fa2da5a426ea88a
 EBUILD xapian-omega-1.2.24.ebuild 1268 SHA256 345ebaab05f6ff817324f3ad6df2b32acb8df0a60dd0d5ba1d6a908ee35f7044 SHA512 4d74b0bbb965db51bebbb241852024dd8ae720ac2d7cac8b52b888e0a4dadb400030be2e1a74f570cfa1ee1ca5ce8c4f0acae783e1c8ef1cb95a2988bfa49eee WHIRLPOOL 554983c4663c0056969fc2e40dad9715cc6a98334163ecb9bcf070c68afd5c7e2b3ca47e7f4f3843bfbf3902bfd4e6c42c14820bf9450793658d18e9b29b3b76
 EBUILD xapian-omega-1.2.25.ebuild 1276 SHA256 79cea03850a7a9e5f9fc7fd8aa9031964ac3957b993bfb2aa4b4f6170cf048ab SHA512 54d65e4d09a752db726595f652e07d3907f24c8b94ad47dc38890cff459a1861bd22f13263575b73295b3d21de1d60ce53ffb3b334e61ba3fe238a2c2c7fd0d4 WHIRLPOOL 97c975cc4c146bbea4b2e9930b5f3f2fb8ce3f6d31a6946d42ac5b6e9c1dd6ad8297fcb8ef48e96e7641ddde2b8f6419448d2f002090d699f9dc35e506dce6eb
 EBUILD xapian-omega-1.4.4.ebuild 1154 SHA256 3882c4d47d3b4bdafca061974f83c5e509bc83ba6416495440009b9cf3b027a1 SHA512 a51edfbd222af18f9214027cead0652ae17902c3d5935b682f207bd03c338df9a78d76b34ba3e11864bf23b917ba5507de0e6a41f149b26be80ef4a2bb8cf238 WHIRLPOOL 1ca864c7a4ac784c14aa35e8fb645133fb16068886692ad48356e0291ffee1eb85a4406fe307335e3b8bffce5e7bd4771023aa1d93bfa8316bf9cca100d1ee8c
diff --git a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
deleted file mode 100644
index 69bf8ca54f15..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/1.2.22
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	#move docs to /usr/share/doc/${PF}.
-	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}