Economize on sse/sse2 USE flags, eliminate nosse flag

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 74 insertions, 5 deletions

diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index 900792c385be..337090381214 100644
--- a/dev-libs/xapian/ChangeLog
+++ b/dev-libs/xapian/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xapian
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.65 2011/10/27 22:07:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.66 2011/11/06 22:26:04 blueness Exp $
+
+*xapian-1.2.7-r3 (06 Nov 2011)
+
+  06 Nov 2011; Anthony G. Basile <blueness@gentoo.org> +xapian-1.2.7-r3.ebuild:
+  Economize on sse/sse2 USE flags, eliminate nosse flag
 
 *xapian-1.2.7-r2 (27 Oct 2011)
 
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index a9a409a52919..71848d8d8a8e 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -6,12 +6,13 @@ DIST xapian-core-1.2.7.tar.gz 4069085 RMD160 fa2f5b376bc19bdbbeab28e5de718e2f627
 EBUILD xapian-1.2.5.ebuild 729 RMD160 fa1d4692231ad65ff4eb1c006a6bd83ffa1defae SHA1 9e93590ef4a41a839afb70fef9c804a2692c8d06 SHA256 710b8c5176de0c38eddfcd0ed41dadff19c15b305128bff40825bb2fab0db2da
 EBUILD xapian-1.2.7-r1.ebuild 837 RMD160 8068c7d9ca1d959631898a0c2032f522aa8bddc9 SHA1 bebbb81af43d2aaecbdaa70f2f5bc34c172055b0 SHA256 3d90f738c7d068f6d437b4c1ca2093a5c0e9f7ea220be7e32bebe71a8d318c83
 EBUILD xapian-1.2.7-r2.ebuild 2254 RMD160 6f5eeb10e83d77e9e474a053d56f9f204acfdd20 SHA1 99809a78889b1c11361eb21798162fb664747d89 SHA256 c0194cb00e205aaeca0c382094eb7c82f9bbc1e88fd1d841b3ccb6cef92ae76d
-MISC ChangeLog 8958 RMD160 a7e518b0fc79817b842e366de8b94e311a08158c SHA1 7df007940637849771739a1f10072897eeb4d76b SHA256 8023c2f92c5b31cc86c987a24487aecb2e82ff8350a3d8c55af6567c0b7e7059
+EBUILD xapian-1.2.7-r3.ebuild 1493 RMD160 0df4cc97dd996e6422c0b705279d1522638bfacf SHA1 9770c31b349b11e5b325224629624c0795fcc91e SHA256 a7d43c5169f6f847987db4b74348f6045c5f70e3e892c62f94f29312b84a619c
+MISC ChangeLog 9127 RMD160 234b5585b173aa67dcaabccd1098fbd9007382ae SHA1 627a09e06d4f3360e738272247ff22a31c87264a SHA256 519bd2633c67c3ce06ce41c0c03f2011f5f1544052bde7713475657903117f84
 MISC metadata.xml 1129 RMD160 e5fe84dfd274ccf5d4a58a307ef97ed80ec3261e SHA1 07d6480b50450a8c80da46172d8b2bf6daac6327 SHA256 63f9c0ebc7cc1b01f5cb7e643f3387f2db38db6b7a2141fdf58cb889f6fc726a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk6p1kYACgkQl5yvQNBFVTVVhACfTSeCjn5uB/tTVsHg5qNxhVlZ
-jOgAnRMhPI1MtSsxplg3jVj/tkJF9yuT
-=exSY
+iEYEAREIAAYFAk63CYgACgkQl5yvQNBFVTXmlwCgl3MZNZenjnyKuY0iT2Su81x8
+BmsAnR/8rPIjM9IaE5QyoFhsZZdV2XH/
+=NxcZ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian/xapian-1.2.7-r3.ebuild b/dev-libs/xapian/xapian-1.2.7-r3.ebuild
new file mode 100644
index 000000000000..bce6c07e9a52
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.2.7-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.7-r3.ebuild,v 1.1 2011/11/06 22:26:04 blueness Exp $
+
+EAPI=4
+
+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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs -sse +sse2 +brass +chert +flint +inmemory +remote"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myconf=""
+
+	ewarn
+	if use sse2; then
+		ewarn "Using sse2"
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use 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 flint || myconf="${myconf} --disable-backend-flint"
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+	use remote || myconf="${myconf} --disable-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 -fr "${D}usr/share/doc/${PF}"
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+}
+
+src_test() {
+	emake check VALGRIND=
+}