Revert "dev-libs/xapian: add slot/subslot to latest 1.2 and 1.3 series"

This reverts commit a85d6d44d9e9e3a78ba2ad19a9e757031c9a9e05.

This was pushed to the wrong remote.

4 files changed, 66 insertions, 2 deletions

diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 5c584a2cfd41..55d595c709f2 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,3 +1,4 @@
 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.3.tar.xz 2543260 SHA256 2d273ca0df6af208c4b6904542a9dffed8a9520376522d650e1a2885b476a280 SHA512 8b0d0fce532748efc1c2705e3f6f45ff83ec97be7c1f5b54846a9ff94b9d416b67491262a157afdc40497c52e1c4aa94bd11a78b4494db4a1fb45ba6d18f7099 WHIRLPOOL bf9c2f1606ba72469f2306cc6edfff63834c58831ee75063e39445392460b85478c9c44ef7d2ec1fdfd63bad113544f8c1ba3eb01ee178abf63da3a7ae2d5b3b
diff --git a/dev-libs/xapian/xapian-1.2.20.ebuild b/dev-libs/xapian/xapian-1.2.20.ebuild
new file mode 100644
index 000000000000..9d8afd537991
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.2.20.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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=
+}
diff --git a/dev-libs/xapian/xapian-1.2.21.ebuild b/dev-libs/xapian/xapian-1.2.21.ebuild
index e217d601d793..9d8afd537991 100644
--- a/dev-libs/xapian/xapian-1.2.21.ebuild
+++ b/dev-libs/xapian/xapian-1.2.21.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.xapian.org/"
 SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-SLOT="1.2/22"
+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"
 
diff --git a/dev-libs/xapian/xapian-1.3.3.ebuild b/dev-libs/xapian/xapian-1.3.3.ebuild
index e03bf95c6677..72c6720be03a 100644
--- a/dev-libs/xapian/xapian-1.3.3.ebuild
+++ b/dev-libs/xapian/xapian-1.3.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.xapian.org/"
 SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-SLOT="1.3/4"
+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"