gentoo resync : 07.07.2018

3 files changed, 46 insertions, 2 deletions

diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 7ececd4b2629..b5c831771805 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -2,8 +2,10 @@ DIST xapian-omega-1.2.24.tar.xz 438104 BLAKE2B d2b26ad007849ac7a0a8daea919fb215c
 DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
 DIST xapian-omega-1.4.4.tar.xz 501712 BLAKE2B d46a463c323bf75db6d426e0ac2057f4cd6ad16ea097eeb189f00356df484af52ba0c8b09d81a0262fe833b784d2bce9df20dd3d36b6f74c17c0e7337a30e2af SHA512 927c6afe24f8a13018fcc233e874c71c0912cb6200094f7246c12b4175bc48d752312e57128a314e7674a948a50ef092dd7f2dc8910db7df8f3ccf9c44f38533
 DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
+DIST xapian-omega-1.4.6.tar.xz 510012 BLAKE2B 2c6d3479fe02eb3b44ef0995b0dfc2ce47012104bc860532967f234ccb7bb2a3357337419fbf5b79b42d0f598608fe9a071edca2195e4f025fb69760091c78ec SHA512 9376145c9c7c728bf444f5891777fe946bc574a4c91ef65779aae4cd2f40c76b33cde1231f654f23de32df8a4eea4aa0c69868d269ec79fba3abad2567ffb80d
 EBUILD xapian-omega-1.2.24.ebuild 1265 BLAKE2B 3208b0fbbacfe32abde89176a4f4615a9cc848e7f37a9f23333309da9804b457713a9a7b774d62d97043701813996ce53abb689bf944ca1cec1262510f61156d SHA512 8f8902b4d7843bb2a70e1c673b6aa78e5fa17f248709a9c62d03ff65c3a47784b98110ac8c3f73dfc8772f58094b96ceea41b11c7ddac17744714fbde6c55674
 EBUILD xapian-omega-1.2.25.ebuild 1273 BLAKE2B f57b3917eb6e9f37879b55d1e759e529c84901b237c673a5093acd2ef5d5117ed279d310995f2709e066f2e6f03e9a3cd6b4cccb2bea2faaa5adcfd03da93277 SHA512 b9a29ac4b8bfdacc219d171a088e1a05e3b092744317d33f197ef77415007ee589d89ee3512a937b4a0c63c781d3a319e05cc3ea7ae89aa5770d6a258784bc38
 EBUILD xapian-omega-1.4.4.ebuild 1156 BLAKE2B 04daef4ad0d3cdac10fc657b54cb5d21c5fa445561a51b1add18db624ec97ad43531597ffce51648ec978fc39f57760c61e1b120cf660a1e8b452470311f2a97 SHA512 006fdcf2159d49895786895245f7236dda96d81fea5e6b80d707083a7cc17153aec1969c1a30a6677a0b67e39ee53376eb507a9a7efacc12057b8dba070fcb66
-EBUILD xapian-omega-1.4.5.ebuild 1156 BLAKE2B b6bc04593812fbcb8a0abd6d5748fba8cfd5c3197f54713994ce28e01674c88157f57ceb40e194a63b28c2439d51ee8a4139b14a1498d2e803f2aaa56681da76 SHA512 3ab186e01422042f34b6eeeb9accc8d1fa7e249fa3f6b699b96366b061eb7c334d536b0050f7d4037002170fee3d1c3dc3d56c45a99903567303adc61a516cc3
+EBUILD xapian-omega-1.4.5.ebuild 1155 BLAKE2B 6671be7b3f0b290a0576ed0818db81e3533d87f1cbc7a9329d9bb093e842f41a028d72157315ae040b8d118f5d3b2396ea1b670266a16319a1c09ee1253ff8a3 SHA512 d1f6125975790b2ef9f80f9b0e942c915444bd92fb08ac98858e30fd25eb973f618771dd35f62e792f75bdaa7fb127b47e0a08443d53ae4202cb1a135f6f4ae2
+EBUILD xapian-omega-1.4.6.ebuild 1159 BLAKE2B 20e6767964ec6e986b48c02758c2acabee7ad2d6ef27308f92fa2098d02a07b4a7266b217b46b746e37c210c5514d2541350c4fb813e7ae3f228ff6f6ea21aae SHA512 0c152b80fa9f8495290e8869888f93866de076498e0ac33471b10e520bec2b6a0149d0c6d4418ec25d450c4f815721291e08e090619feb1ae809bb4f1dbee732
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
index b7b4540c7f84..47d14797d720 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xapian-omega/xapian-omega-1.4.6.ebuild b/app-text/xapian-omega/xapian-omega-1.4.6.ebuild
new file mode 100644
index 000000000000..69bb116aaa81
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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="https://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/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
+}