Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 85 insertions, 15 deletions

diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index 9cab5520d80a..4610e5e241e7 100644
--- a/dev-libs/xapian/ChangeLog
+++ b/dev-libs/xapian/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xapian
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.143 2015/04/20 23:58:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.144 2015/05/23 14:59:08 blueness Exp $
+
+*xapian-1.2.21 (23 May 2015)
+
+  23 May 2015; Anthony G. Basile <blueness@gentoo.org> +xapian-1.2.21.ebuild:
+  Version bump.
 
   21 Apr 2015; Anthony G. Basile <blueness@gentoo.org> -xapian-1.2.14.ebuild,
   -xapian-1.2.17.ebuild, -xapian-1.2.18.ebuild, -xapian-1.3.1-r1.ebuild:
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 32b5f1f6517e..370721728487 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 DIST xapian-core-1.2.19.tar.xz 3175384 SHA256 4a78260388ff1b042f0ab5d18afdd524a530ae609690d0339990ddc147a54785 SHA512 5cd29b8c278b4fa652f947cd6689945bbe239c95425344d0fedb445bf1534198333844d91e6e59cf870043066f4dc511cd0268071916002e96bd38b59aa91c1b WHIRLPOOL 5d65982d47145addc6585b72a99494bf6d14277df2c796925fbe6284ddd08b89fbc147c1a29575d573afebb2e2f6eb6dc73d58161260404be7e5ceefe1371ffb
 DIST xapian-core-1.2.20.tar.xz 3181788 SHA256 c4f8d5b9e393ea32912955a17e6b6ea3f6c052ae9133ded6fe48582c25b1aa8f SHA512 89b2b4dabd4ef5946a2fab95c0bc3786fe36172f4dc750713aa4f3fa5d9e1716ee598faca1385209c1a669f5b7fed1a88c038d1f9cc47522fa956d04ea86560a WHIRLPOOL ec5145306208ba2fa7b458033573ff526bc2ee12a89dfd8fb81e43d836c2d6ac44a573ccd0c336c358fc55e17c73452929ecef6eb8d8edc1eef2a6f3050008f5
+DIST xapian-core-1.2.21.tar.xz 3202560 SHA256 63f48758fbd13fa8456dd4cf9bf3ec35a096e4290f14a51ac7df23f78c162d3f SHA512 a821043ea1686a09178bb91b14ed6a8cf00c50dfb0f066e420a40395edd3be085d7f89abb8f6a1151c847272c13601274e645055ede3548b07d5e912f0a70f81 WHIRLPOOL 9de8b2b70252b87da16a2502a831b46857f48cca8623a6ac411291bb6607bd61968ddd64a77c8685f300818abcbf91149a3f43af849a7843f67a5ebcc5130963
 DIST xapian-core-1.3.2.tar.xz 2490944 SHA256 203624f292fd9a023d51cdba53b01c7132210866a34bdca79ba721a7dd3745e6 SHA512 712c19aa2416d1493dfb601e1abe7242bf8f893197a3d0c229e5cabaac446950dd4c71c23200ce8a568e3bfae60e0d987c0c2d9938b1d185af2d44df3627c1cf WHIRLPOOL a1e4d8840d2d62cc524d287110de2e4370b2f60c614b91bc4cc624f96a73cc6397d5125cdae877b6781df1cc8d4ac9b34ffdeb4892c20aac0099afd5ef28c46c
 EBUILD xapian-1.2.19.ebuild 1546 SHA256 5a501ec32a7ce030b331f635c9d9f16456bc41e57038a0c4314c048d25d4c509 SHA512 13bfc3aa77167c1665ce24488b6d69801cb3288d5e4b305207d94674b5ee391e1ceca6aa84c35affbea42e9d57011089692bf8dfc9beb3fdb866d711cc273cc1 WHIRLPOOL cf299d34865c82fda56d3a212bcbf163cd56565e2ebdb5cf3969839378ebbfe90c9e45affecf1cc2ebf70a437d97bea79c8b6c90dbfd541b7550632018b9433c
 EBUILD xapian-1.2.20.ebuild 1557 SHA256 b071b5c5b47180c20000c71151e30fb97feaa65678605bb5fd0b2fdf7468c191 SHA512 e80d442869e30bd4a1c2b1b3be2257818c2930ee1e237f8e4299c96f8e6e4ad0ce245d44f7fa85ba1f89369498a736fd849306ed827d65fe796ab15ce8acf258 WHIRLPOOL fbf0dce0a44fa11a6ab7ffd535ab5168e76132dcb8ef7313ee0b7cba14baf3cfc9369c5933e6ba72ec25ab562c2b17efd3dff05da8578a8fb7697288144c9255
+EBUILD xapian-1.2.21.ebuild 1557 SHA256 d316c5b887d72f0aed696020a7c7f3a4b5cce2351ce243c938004e7dc10b31e8 SHA512 e7224a4a5cf226c39519a23657491801397ebccebf36ee9cc912a0442e359da41abb97d9b2226e272972f9409dba79ef9f84c53651b8ae674b25f6766a9636ee WHIRLPOOL d73b45bb64eabc300e8ae30f139287d6626d35d1832947eebb41673078b46c0266cd8b1742932cdc98c2da1fc377373683804bbe84e3b8b375b4571bc0063237
 EBUILD xapian-1.3.2.ebuild 1551 SHA256 9b12820affc011fb455a571a21fafe4c5e944d5b0580ed7d8acab9ebe032a847 SHA512 ea65e726184dfc92d1cd869e386726e96cb2480354ef1cc01e904bafad588082288a685fc11bf4907e86dc8b39009356516b6186c35058df448d1d955be7219c WHIRLPOOL 1805d9600a8497d1dffbeff46ef23705cf212f5aea447d4280a5643e7db8e2de12288c2fa8685d12a0c9aec7cbd812b3f5ccc2c51f702a0cee7021d53c2dac7e
-MISC ChangeLog 18152 SHA256 9a930e78e3bc30600a41852d800591049d1592e67f9d77336f7018ce3c36b688 SHA512 9ca9b55855ee25672f2307a5daf996cdc190ae1911623e3085721f3758075df0d4b9c93d4b19c88d3f457af5531a82964bfa5692addc87c49002b09b2e287f59 WHIRLPOOL ff87301095a265561d4db9d015e7d927396ea38002721a057a59573e150ff1ff35b6cc8dd97f4243672067c8cd817bfc143d9a94caca94b9fa87d292b3a08435
+MISC ChangeLog 18277 SHA256 0d25636ca7434929a39859f6773ed699d996ac74ed8950e31f60ca82f8b9474c SHA512 e5943085d824a7e877b405213a9bb8775b7724156f67274bcde2ee18c92dd016ecea49494569a337e40beed1e58b9e3a6b9f290b7fef3189fc58b3779132d3f5 WHIRLPOOL 8861fbe77c3619c52e6ee60d0ccbc80ed6714a110f8fc28c024ca558dec7b7f210488a704fc5762243c8d55a4899cba1bc0c04e951c893c1283e06357c602725
 MISC metadata.xml 986 SHA256 a8edfccb5ff34bd1f0d096bb80a8d337ad9c47880ab5165039e23219cff52c84 SHA512 ab2b46cfa58c704291db4e87428acd82987c236bdf1ac8c7c3dbcc4c1fa6a0b84cdf5ba28c317d8442e16264b4af9dbb82a14a0b4a129e0d7189168b68862690 WHIRLPOOL 8b7a20305b22c87d82e3c5ec765d9bc18c4e9a5e772920f04e827f8ddad71ac1aec50a7389c1b84662ea30afe278cacdb277af546320240a616d7e8a84b76aed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVNZNBAAoJEJOE+m71LUu6XfAQAJRwKVZdoybP+5JQ0TnS+yGU
-Gbd7a0pYrBth0xSd9yRDZW/TS0tUSXv8b1dArvfj0M1ieAn4coOSRyx5Yw9TET+r
-4XNrdz3zI2or3mx3VbxeYM10I0JSlBQHcUIwnV5n1BzEGTjn4g43VBffexK1rZNk
-B1KgbBrEKV/KFqm4M+fRBGQwnMt7ms2JgJ97JE/axYW9vNKXECZ0QRtRkgN7Zp62
-QWlxfJPgbsVqeO4nbBpW49wAOM2mHJ1EdiW5fFQCqLcYrHeU38YX6lgF46PuVPAl
-qAkKlOC82RAOeyMs/nzJrHj3yX9xMPtztnjsn0XVoINA6pWqOivdNgBHBNlLzkFL
-v8UJbB2U8FugUzQU2BKvPxcgX5a9x8M4tCdQ6DgoCg6Q4jqb8uS6OWj90objz8Jm
-mdOhuHKEvTr5aUOOWpW6ZcT/pRUqFANMKgpu2g/334JMCF7At7pCEpR2QjWpv5Dk
-jVdGj1pLcNPiE3OIOY50zE4iNshXNECYC4kcrg2Lz6Y06FZlZEWdJXClRr6S7B9/
-dxKJQBVSd/AGaHAYFKqhZGRGoDAKQAA9z+uDoklp8+lKu6Jl22ExArjKCd5+JdVz
-AgnW0wsYJrKGzP1VoINnVgKjFFEbCjGuUbHa/97FOrml76xgXLLOkYyF5S6afgg1
-g0A31otim0pnaCBboZ2d
-=BKu5
+iQIcBAEBCAAGBQJVYJXuAAoJEJOE+m71LUu6564P/ReHfenDSooY2gzja6kQY+Dm
+/vX56fnuPHnCF3k0SArgu6IWu/f3cKGXykc7BcA7LWye0JMiVAN+EkmkCXCUN0+d
+93S4yPaTyg9eF+NB7nZZxV9HcKtd/hT0uBXUnCo5wzmK5hQdO+YWTt5/KQFn+yDr
+br+EDv3Z+DO+utF9yi1EH4x95E7Yz462OhXlG5BXSHzVnjN/cTCAw5/s6PMvRvg3
+JS+tF91NB99ViPj89xdA8NHTjx1Wf0hugp9biPRicbufDmPTK4zdvexVafIUXf8J
+47sDXxjN9pZya7h9ILCgqFQ18s7ZPJqxcBoH0KWe9EGoHLdWqqBqxmhLcvHZLyFF
+/DGrlsVqIeqgbKPNeBSChewkt7hz02ra6zDSsQq0rfR/VSSsq6RFF1PDiEgQEkD8
+Jr/CTs0Hj9TqwGmF+kwDgl38980T08mNPry0PYl5rEmmjY+tLmZcLpIB3tlKav2u
+g2nv57a1DPkbv3q6dw+ZARy1ZBuC+5CkNoC0+HVwLNbiL7YwbBl6mfJckf3HMa8r
+tTq5H/SktcXAX7pJtiuCUQfxKBU+I68juQi9n9AxQdplz7FXKTMwRGB7YSfdR4Ih
+5269/zunKhVUa3nCgUDR7cWTJi2X6Re1R/qdAkB8GIn365Lm4EK4BjWhcL7HRz1s
+3H6ufgEwVotxIGHogsoN
+=h5So
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian/xapian-1.2.21.ebuild b/dev-libs/xapian/xapian-1.2.21.ebuild
new file mode 100644
index 000000000000..d656e67069b5
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.2.21.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.21.ebuild,v 1.1 2015/05/23 14:59:08 blueness Exp $
+
+EAPI="5"
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myconf=""
+
+	ewarn
+	if use cpu_flags_x86_sse2; then
+		ewarn "Using sse2"
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			ewarn "Using sse"
+			myconf="${myconf} --enable-sse=sse"
+		else
+			ewarn "Disabling sse and sse2"
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+	ewarn
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use brass || myconf="${myconf} --disable-backend-brass"
+	use chert || myconf="${myconf} --disable-backend-chert"
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+
+	myconf="${myconf} --enable-backend-flint --enable-backend-remote"
+
+	econf $myconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}"
+	use doc || rm -rf "${D}usr/share/doc/${PF}"
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+}
+
+src_test() {
+	emake check VALGRIND=
+}