gentoo resync : 19.10.2017

10 files changed, 95 insertions, 146 deletions

diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 8fad5cccba08..0ef5dea66989 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,8 +1,8 @@
 DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d
 EBUILD asciidoc-8.6.9-r2.ebuild 2194 SHA256 835d09e0de77cd9c3c7d11ff4f5452a0a94aa18b1dbfd728fc63919d82fc15fe SHA512 8800a9c0a0ffc8105315d468194b8c6aa0a23d2345b1a5aa4ba5950c3d2daca94f28ffd81f40e52c10d8de94d9f67306d69a3c00acf4008821ffb4c21625f190 WHIRLPOOL 13ce366a6bf41a82d7f95918d90b3fecd08be57132ca1bc3186865c8771886126a831a2bf417912590653e91035c7ba5ebf57146bda701444c0a44e5320976cb
 EBUILD asciidoc-8.6.9-r3.ebuild 2303 SHA256 e96f7fd6da782041c1e713215eec7e8e23be2dccf27b25ff424f2b17b58e57fa SHA512 2bec7c7ea7c879fd756ea4f47e375a52840f6f000047736a58a2f1df172ab46810263ad8e88cf3d7fbcfab18ed2be5927fb0fb39360d65bfc221df7aff010c46 WHIRLPOOL 8cace39c0d67dd076251b198e10faaea1317d803a7da8215bc401f98c1bf92c0d8360953c178b94077aa5d7c0de1aefb95120ebe21dad617791043f1e2b14445
-EBUILD asciidoc-8.6.9-r5.ebuild 2381 SHA256 07d5ff47533c31492ccc12677b13acd9265d09020abed96e177599391c07fa89 SHA512 90bcd4eda341780c682b3de57f2d25903d0f6990fba83cfaea43214f14553fdcb1095e456f301ad1c754fcd9f9a59e0a063efa6faaefa9d77da70b9f4c76df11 WHIRLPOOL f90c6613007408a942e312c81c112ebde1fb33e0d8e7ffde73bae9c8db2939d8fffa77d88835b5d93a953b67f779f34fede484ba606eb816bf97a59c7c852565
-EBUILD asciidoc-9999.ebuild 2825 SHA256 0463091f73a83241b12717b3cfacb9f6791af906231d80c8d75c9729e2983d09 SHA512 822c2100845e6d960910cdc1af3e10d83c3410b4b92995bcbc86e6e82b91ccc6a24a84575bc85ad831bc45d54cc2056e8281048dde291c043a6ad2fcc68afe21 WHIRLPOOL 6ae1e36dcd44f66e50c1807977026d0158aa4ba629a1f3acc911828c166114555065464da4facda2e3309f6b9ff94cd77a4f94bb59d68edd3f5efaa0ecc30102
+EBUILD asciidoc-8.6.9-r6.ebuild 2393 SHA256 7e0acb328c4862788ddddf78ee2b1ec648e72e8b9806bea687b4db78a7e25f25 SHA512 ef5cd7559f8c7a1a3de05a6ec2b81647b8b2bdb22efe6112d5136a36f83e32071a09febfe9a4310e437fdfa92b1e752bf0744010218653758fff5d39677a7e66 WHIRLPOOL e4daf52c05d9a81058b560d13f50bdb3bfecb95a419c3cf4f15e711013753304336e5e9659d23e243b3ba761590edc4256210c8c22493d259d32252970fd3a2b
+EBUILD asciidoc-9999.ebuild 3024 SHA256 63468200330bd85009b3a9e4a8028dd72b204f27faf21e33301f72c032d97d5a SHA512 a4f71cee5bdd91630d0e3be403666c0bd250f3425a15cdd863da3a429d8cab36304f07b463b2353c1296f8e89ddc28f5ce1e9e6aa0922577659c158f168e805d WHIRLPOOL d862ff60c6c4d956af1fc975dd9c7637eefc8bb99304570057fccfffcc0a137654250d76486e1b644abd4a6c281bb1fcd8e2a12b32ed0e5bc52b2bc9cb05acb5
 MISC ChangeLog 8762 SHA256 a65df8bab04bd07e80c0eecf86081fa5a7061daec43c4d1238143565f8391bca SHA512 a2a2f2961b82d23f1459c508af6aec923eef71d7408653f025a6beac20b9376b2d92774910276b123301e70f2f30d802cf03ddeb5869ef0a2cdccb4903299a0f WHIRLPOOL bf34214d3f4ef42e5156eeb7b0da45c5432be35654884dca44e459dd9dc91e6f496acb4af8a9c116d7d54c21cca30cccaebdb3f7470c78bb6c25f6a0c2ea486f
 MISC ChangeLog-2015 15568 SHA256 d7ba2f8295a1a51593f0394adbb65476298ea2aef511db8c101748a3ad0d59d2 SHA512 3fd8c898a19c9821c2a5cd949e62b5f0076b2d28864785d7f276b0f5eed477bd1980b4cff1731067d150086612d9b1a3844f6ab879873516ef2f7c0c2c43b2d4 WHIRLPOOL ceda16169a2d0f36b1b4ea3a91cded15ee8dcade4148502030e4511bd4fa9e8104ff4c2e0258fc0955e29bb0524b02819d6cd2e743e74b73acb7581777c442b0
 MISC metadata.xml 583 SHA256 745ad8106536c9e69d0697772abfd3a4366b01fa922e292c3b16831311e93e3c SHA512 cf654b12cae851d762b538926912ed626a5681033f9c579ca9e62d442345c8efe5a5373784c702994c2b97a0acf7f251d257da29dc3960a2dc8c1b84327f11af WHIRLPOOL 3c9119d5f49082d19e4d0fe1903fdf41d062ca9d5ab7c3befd1e19ac9e7e94ed6683b378bc7fa04b32b7060b6b64159502d15b92202f37344302971978cce58b
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
index 2c68badd971e..4b9175db95c7 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
@@ -68,7 +68,7 @@ src_install() {
 	python_fix_shebang "${ED%/}"/usr/bin/*.py
 
 	readme.gentoo_create_doc
-	dodoc CHANGELOG docbook-xsl/asciidoc-docbook-xsl.txt \
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
 		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 
 	# Below results in some files being installed twice in different locations, but they are
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index 39a4499e5458..8577a4a0e1a5 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -6,43 +6,47 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 pypy )
 
 [ "$PV" == "9999" ] && inherit git-r3 autotools
-inherit readme.gentoo-r1 python-single-r1
+inherit python-single-r1 readme.gentoo-r1
 
 DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+HOMEPAGE="http://asciidoc.org/"
 if [ "$PV" == "9999" ]; then
 	EGIT_REPO_URI="https://github.com/asciidoc/asciidoc.git"
 	SRC_URI=""
 	KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples graphviz highlight test"
-
-REQUIRED_USE="highlight? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-util/source-highlight \
-			dev-python/pygments[${PYTHON_USEDEP}] \
-			app-text/highlight )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+	graphviz? ( media-gfx/graphviz )
+	highlight? (
+		|| (
+			dev-util/source-highlight
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/highlight
 		)
+	)"
+DEPEND="
+	test? (
+		app-text/dvipng
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
 		${PYTHON_DEPS}
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz
-			${PYTHON_DEPS} )
-"
+	)"
 
 DOC_CONTENTS="
 If you are going to use a2x, please also look at a2x(1) under
@@ -51,13 +55,12 @@ REQUISITES for a list of runtime dependencies.
 
 if [ "$PV" == "9999" ]; then
 	DEPEND="${DEPEND}
-		www-client/lynx
-		dev-util/source-highlight"
+		dev-util/source-highlight
+		www-client/lynx"
 fi
 
 src_prepare() {
 	default
-
 	# Only needed for prefix - harmless (does nothing) otherwise
 	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
 		"${S}/asciidoc.py" || die
@@ -82,29 +85,28 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${EPYTHON}" tests/test${PN}.py update || die
+	"${EPYTHON}" tests/test${PN}.py run || die
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+	python_fix_shebang "${ED%/}"/usr/bin/*.py
 
-	python_fix_shebang "${ED}"/usr/bin/*.py
+	readme.gentoo_create_doc
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 
+	# Below results in some files being installed twice in different locations, but they are
+	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
 	if use examples; then
-		# This is a symlink to a directory
-		rm examples/website/images || die
-
-		dodoc -r examples
+		# examples/website is full of relative symlinks,
+		# deref them for copying, which dodoc doesn't do
+		cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
 		docompress -x /usr/share/doc/${PF}/examples
-		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
 	fi
-
-	readme.gentoo_create_doc
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-}
-
-src_test() {
-	local -x ASCIIDOC_PY=asciidoc.py
-	"${PYTHON}" tests/test${PN}.py update || die
-	"${PYTHON}" tests/test${PN}.py run || die
 }
 
 pkg_postinst() {
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 6a93e74c33a0..a5d2cd06b66a 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -4,7 +4,7 @@ DIST html-xml-utils-7.1.tar.gz 319559 SHA256 ec0efd2263b864bb7e0ae5c59f02c43c5d8
 EBUILD html-xml-utils-6.9-r1.ebuild 534 SHA256 97a6edec295d0d2e1925760b9f2946b29f6ab00d70405afa54bd99f030042ec6 SHA512 39cc174c62a8c96d16d00987ac39c4160b4c12804c4ddb0d21cc2bb49ddb5226c12c196416f7f9a0700667ab83f6a471a76b3dab95685f667aebae5add450cc0 WHIRLPOOL 44e518fa5c75c1514fd59360f87f7eb5d43f1835c70518365c59c2e8f88735ae87db5ff7472aa711d888dffc208f88543812407626bd8da9834d87fcd9a45ded
 EBUILD html-xml-utils-6.9.ebuild 521 SHA256 92b742074a280127ce69f1fb9112e2e9eae1922ae0ec6a714ae20b16b85af670 SHA512 624d91296ebae1488e978eef8c477da23d096a08ebb16a60c92d2862bbe09f0a80694a635870801c00e6e59cfe2f3c601eaac232e2ce76539d89149020f22d15 WHIRLPOOL 9f6949a8399f1123b70c2628c19654c507a457df5138aa5152f17dfa212a7019473cbd2a09a4f05219b164a4d3facc17a6c95771770076b88dca5bc68906d4ed
 EBUILD html-xml-utils-7.0.ebuild 715 SHA256 bccf4e0e923373c1d8f59e81ed3258a1b6f2b4417cea6878a1d0ad89233164ca SHA512 76c019ff9e14c846de543bff0720cec0302c358fc3987829a9aaf049c29d571436a1c31ccfd1f65d54315d9d0dab24856258964fc910e291ef9c8e59b754a2ea WHIRLPOOL 9f299c6ec0b18bad8e0ffa7366dc4f2268f58e283279bf550af42c6dd4215048c3d48ea8dd129fe6870edce039876db717efd338de0abdfaffcb39fcf672872a
-EBUILD html-xml-utils-7.1.ebuild 715 SHA256 bccf4e0e923373c1d8f59e81ed3258a1b6f2b4417cea6878a1d0ad89233164ca SHA512 76c019ff9e14c846de543bff0720cec0302c358fc3987829a9aaf049c29d571436a1c31ccfd1f65d54315d9d0dab24856258964fc910e291ef9c8e59b754a2ea WHIRLPOOL 9f299c6ec0b18bad8e0ffa7366dc4f2268f58e283279bf550af42c6dd4215048c3d48ea8dd129fe6870edce039876db717efd338de0abdfaffcb39fcf672872a
+EBUILD html-xml-utils-7.1.ebuild 724 SHA256 4be6ca2f970ff00118c96a8b2037c0a13054881a60c516ba6f05c4ea389ea82b SHA512 7ceedb6d8ce7288edf2582f37af8e6bf4d48421dcb740578c8666fadd0b4dd0dfbc1f3ab1e340c5bbb4825549fb87ecae7feb09672ab60f7acbd805e3242d15a WHIRLPOOL c2e53752b63c85ddfc31e1b4cff7fe8094e02d2c689f15183be77518deda9e0ca55f98732c3cd4b7f9e75015d3202a24c54b7217b3563dec27da0ebcadf56429
 MISC ChangeLog 3512 SHA256 816925977485274a4192d5eef75ef7365a28dd7bb18c254dcd67533eb907df2a SHA512 f5324420ac84e6e09b764662dfa1e1e7e66510bbec71840406568584987753468dc772bc1a8c3c58653fc3aa33dd8742f4efa2a0e737b876542eb1e312457149 WHIRLPOOL d28a3a06a12a325acabb059a22252ff6b81400bbe33a8acce194d9bd6092ead3484fa580b769fe1bdcf94c146d723a03c68d602626d9b35c601203e0aa9b3615
 MISC ChangeLog-2015 7768 SHA256 8dabacae0f327d94ac8db165bf67a7ac53096ecad39fd5e9d1eed30828dcd37c SHA512 f93490f9ad442c71e7cdde74e90557f23822b4b4e97d6dbf1ca5a97c8fbc0f2f17935fe7a0985c93b2c556d3d07ee7fdebf480068b8e16c630d334610a6301cd WHIRLPOOL eef546a4b7b9416b21edd65d41980877047b442c8a904a7e2a17f517733f30865b4563b89e0bd38acd4add6c2e57209fd602702f63ce18c314df60ab8af85e07
 MISC metadata.xml 220 SHA256 998ce4afb847c8594ee92e054f8a06ae3de375d38b2e400eebab911ebbad60a8 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc WHIRLPOOL 23c78e4c05afc8a04239236928ca26e539b0a969f44389b90a34fef3f4a57f18d9db2838d3df439c482cd4b89ce8b959dde5e83500c44ebd2af453629ef79a3d
diff --git a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
index 9d9c59066edf..080b0bdc12c5 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,8 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 LICENSE="W3C"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
+
+RESTRICT="test"
 
 RDEPEND="net-misc/curl"
 DEPEND="${RDEPEND}"
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 33dc36f93952..d939f1489da4 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -2,10 +2,12 @@ DIST xapian-omega-1.2.22.tar.xz 437556 SHA256 a7d4b00f6830d003490c0f727fc03584e7
 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 1148 SHA256 5a08c39379710a04347c4df411f7acc90a2315590439fa8c84edf3c99b85271d SHA512 234a6977f7760fc1b1e5ddb6104bd22a497b7bed0a52860b381c03f6b998edbcea6a026349955502837426f75e354b4e1c8e625c10c05e38935e888bde8f0f3e WHIRLPOOL fc071b7c4221b283fbc96f6c2a976e22915f3f6d4830d8054fb6fcbb18bb46ad1b96e8ee090f351053a3f2c8ccecab295659c873adaba290c4f0f3960c147c3d
+EBUILD xapian-omega-1.4.5.ebuild 1155 SHA256 b5dc12650b176a781a824969c1322bf933db8b63642788f737f61de384cc73a7 SHA512 1eee5772a12d4494edeee3a3cd9d1898d4ef5c8d49248e3e17b89da3d6fa5f5812227c8ad5329436259263be4a5b87da4f5748cead5e82600e2801d0079d5ca4 WHIRLPOOL 44d1acb1f230f0118edfbc47b6fa906cebbdaabe8fc45dff6d1c773baf9e8da3101d388a344efc8fb0691c2166203a5f500a8420a1eee8e1bd3185bb8c9a4fe3
 MISC ChangeLog 9843 SHA256 898ae8f6dd1cbd09301ff9d8c3eebaaa7a8c4db1e2c72e317ed1c3d8e0f8d82a SHA512 902d8678962a5c7c050f16f46cb0de7a948b1db8f6cf7ff602018886f7964f83bac6b00d31c83b20ca842aa02917e52d0d48ed36f01afdcd325f4fa2dd821675 WHIRLPOOL f43872445af68a193b91bd3dc44e7991dd95ba217ad7c1ee623e258d1e58349938c78b272f9d6df137bed6ba74377bd5bff217567c2e9059fd66a00f34fa171c
 MISC ChangeLog-2015 8456 SHA256 2a7ccfcb36e7792d7f423883c2094b106aa3955cc6d0551d2999557193eeb834 SHA512 a53026a24f108e1d4c673736ac88b3acaca2bf1725e139c1d4f1172b44e275865ad136a0df99aa370095a20932c82919eb7ff71025a1b309e33ed99d6d308b3f WHIRLPOOL f1568db0197cf41acd5fbacc6d816efb49f1ce2ede1d1f07f9f45f018b7a1d93df07bd274a5f8a47b9b58fa6cf455184e21db4f585f388fe5f2a4e5f7d9f5855
 MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
new file mode 100644
index 000000000000..36899fc06ac8
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index fbab8930a3cc..595a3ab9278c 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1,8 +1,4 @@
-DIST yodl-3.08.01.tar.gz 283634 SHA256 958497939d9f3d1c6d0e2e74f7592d5a98f9ddb6f95c50c1247e41600d2765b7 SHA512 a88ab79657661262f4ccce4fd307ba41a05bcefbb534a2b5ed84115ab592ddf3ce883747aad5c028e73142ec91815ee86e1ae16ab9d319fe2045a2b0a08ab42c WHIRLPOOL aa9d9c0d58da0d5dbda3acd4f4f5fe5867873a23fd0f133404a6be9965001c1326714fc05296fa2a91912fe011391dd51819a40d2ddecfd7d99cfd8ac833339d
-DIST yodl-3.08.02.tar.gz 283890 SHA256 19264d7a1ed00edaa896e41b5aeacb722a4ca79dd6958731229f1bd1d1dd91bc SHA512 adad9f6235288f0ae6990c0dbba3cd7c8461172ae83231ca8fa113275d04ad20d3722e70f6f0ffcf072a19b4816e556b9b09227123516fc4a0170bc053b48b8e WHIRLPOOL ed3b5e0cc141f6b0c84191791f86af361cddf1753c2080eb8bc7f43e0eae78d329fd00b16a98bb14f1f2d93d91aab9b3a7947e7e065fcf2b4706fbfde5d9f868
 DIST yodl-4.01.00.tar.gz 288932 SHA256 06dd62cfc5f2ff69fafee15b0c0923bf37e1f7546d27f32576489acbd2cfcf06 SHA512 f195dec8e03b83561b47f9bd00fbb0fe711bbc254c32413d748587d8bf3848e050b90a2140977bec5a335021b2ef49ec5a6b0ca89f1649def495d81c3e7b437f WHIRLPOOL d0d2c592e958849cb4d8a881b4dc459dc0181fc41dbf9de949930091225348fc7fde7c698f110b92e853db8727969b5d3fecbc9bea46e093071c16edc08e969f
-EBUILD yodl-3.08.01.ebuild 1136 SHA256 bb77c48a925c3429c728aff1fd1868e294be8b665f1237f8c0a6e04d58811780 SHA512 f727ad890409b4f8bb900d1e56a4bf21cc76162fbc6d2deecb664f0c37e3435415595e6b9a3f63442d16069009a2454e22cf8407bca4158740e38743141c49a0 WHIRLPOOL c52891aae1da8496ef9e9c7506bb08328669bd121d1d07fac65b31bfb21235ce3402fe7be2afce1d461d86a96851fadb8b1a011128b408aaed132889d10e1a7b
-EBUILD yodl-3.08.02.ebuild 1136 SHA256 920f9c785460dafff3f7c1039bc686d94ef7393975f3a19e4779843f8bd7ce43 SHA512 dbd05b7eab771c07e1d57d113d165f0bc54e47fd0762ae5dbcd908c8ced6b29000d3b5c241813126b1d0b33efbbfe2fb14cb98eb7ec5f2beff3afa5cd188b6c9 WHIRLPOOL c087453d615177307e03dfa5f00b5f8c8a8d06698ce8ee23b8e59cb2a2327d78fd6570790277e93fcc330f685a578172c73d9e3f96e6697f53ccc5f9f310a66e
 EBUILD yodl-4.01.00.ebuild 1136 SHA256 920f9c785460dafff3f7c1039bc686d94ef7393975f3a19e4779843f8bd7ce43 SHA512 dbd05b7eab771c07e1d57d113d165f0bc54e47fd0762ae5dbcd908c8ced6b29000d3b5c241813126b1d0b33efbbfe2fb14cb98eb7ec5f2beff3afa5cd188b6c9 WHIRLPOOL c087453d615177307e03dfa5f00b5f8c8a8d06698ce8ee23b8e59cb2a2327d78fd6570790277e93fcc330f685a578172c73d9e3f96e6697f53ccc5f9f310a66e
 MISC ChangeLog 2959 SHA256 4c228ff25ce720aad2a7c3346ff8ac042520103ccbe5aa4295cba4a2a2de272f SHA512 20dd280be03ee139828d24ba81b0e9928b69f64ff08e88165646f8b902502cdcaeaed6d998a171ad00de183df7b9c93da8929440a4e10015c00bf36488facabb WHIRLPOOL dcf9c4e0abef8d8a4c973967ddc3184c9201469a331ab3a4b652c6f3cac83ec2d52f4131c6ca71af8b2369b792577247c6d142740a62c71b8fb1e8ea608f0069
 MISC ChangeLog-2015 1231 SHA256 5cf6a60a159bc52fae16300ce1825cc95566e0d4e95046a638d623f04c6f988e SHA512 b195776eeca3c2e71d346e545aa3f02278c5555875b6b7e2268bd37526bc6778663f6d8e74f2b9c5d072c63aa2ce8143ce06c4295907857a9568d927b2cb6b7e WHIRLPOOL 496b230ebc2e9c7ed3c9c805211177437f4f9964652de17dcb88ee34b295781edcf7ab1b1ce82bc70afc26ebf8eefd97c1ee300fb05626fdcb8867c46b46159c
diff --git a/app-text/yodl/yodl-3.08.01.ebuild b/app-text/yodl/yodl-3.08.01.ebuild
deleted file mode 100644
index d47e55feb203..000000000000
--- a/app-text/yodl/yodl-3.08.01.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
-SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/icmake-8.00.00"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
-		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
-		-e "/CXX =/s/g++/$(tc-getCXX)/" \
-		-i INSTALL.im || die
-
-	sed -e "s/ar r /$(tc-getAR) r /" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		-i icmake/stdcompile || die
-
-	default
-}
-
-src_compile() {
-	./build programs || die
-	./build macros || die
-	./build man || die
-	use doc && { ./build manual || die ; }
-}
-
-src_install() {
-	./build install programs "${ED}" || die
-	./build install macros "${ED}" || die
-	./build install man "${ED}" || die
-	./build install docs "${ED}" || die
-	use doc && { ./build install manual "${ED}" || die ; }
-}
diff --git a/app-text/yodl/yodl-3.08.02.ebuild b/app-text/yodl/yodl-3.08.02.ebuild
deleted file mode 100644
index 8c697af720a1..000000000000
--- a/app-text/yodl/yodl-3.08.02.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
-SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/icmake-8.00.00"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
-		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
-		-e "/CXX =/s/g++/$(tc-getCXX)/" \
-		-i INSTALL.im || die
-
-	sed -e "s/ar r /$(tc-getAR) r /" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		-i icmake/stdcompile || die
-
-	default
-}
-
-src_compile() {
-	./build programs || die
-	./build macros || die
-	./build man || die
-	use doc && { ./build manual || die ; }
-}
-
-src_install() {
-	./build install programs "${ED}" || die
-	./build install macros "${ED}" || die
-	./build install man "${ED}" || die
-	./build install docs "${ED}" || die
-	use doc && { ./build install manual "${ED}" || die ; }
-}