6 files changed, 32 insertions, 27 deletions
diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index 6664830927bb..9124a7338984 100644
--- a/dev-libs/xapian/ChangeLog
+++ b/dev-libs/xapian/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xapian
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.132 2014/12/26 10:18:21 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.133 2015/01/28 19:43:27 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> xapian-1.2.14.ebuild,
+  xapian-1.2.17.ebuild, xapian-1.2.18.ebuild, xapian-1.2.19.ebuild,
+  xapian-1.3.1-r1.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   26 Dec 2014; Jeroen Roovers <jer@gentoo.org> xapian-1.2.19.ebuild,
   xapian-1.3.1-r1.ebuild:
diff --git a/dev-libs/xapian/xapian-1.2.14.ebuild b/dev-libs/xapian/xapian-1.2.14.ebuild
index aa886909ce3e..18272fd5909e 100644
--- a/dev-libs/xapian/xapian-1.2.14.ebuild
+++ b/dev-libs/xapian/xapian-1.2.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.14.ebuild,v 1.9 2013/11/24 18:39:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.14.ebuild,v 1.10 2015/01/28 19:43:27 mgorny Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc static-libs -sse +sse2 +brass +chert +inmemory"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
@@ -24,11 +24,11 @@ src_configure() {
 	local myconf=""
 
 	ewarn
-	if use sse2; then
+	if use cpu_flags_x86_sse2; then
 		ewarn "Using sse2"
 		myconf="${myconf} --enable-sse=sse2"
 	else
-		if use sse; then
+		if use cpu_flags_x86_sse; then
 			ewarn "Using sse"
 			myconf="${myconf} --enable-sse=sse"
 		else
diff --git a/dev-libs/xapian/xapian-1.2.17.ebuild b/dev-libs/xapian/xapian-1.2.17.ebuild
index 3fb8f9d648b1..3df4225ab8fc 100644
--- a/dev-libs/xapian/xapian-1.2.17.ebuild
+++ b/dev-libs/xapian/xapian-1.2.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.17.ebuild,v 1.8 2014/08/19 07:44:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.17.ebuild,v 1.9 2015/01/28 19:43:27 mgorny Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc static-libs -sse +sse2 +brass +chert +inmemory"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
@@ -24,11 +24,11 @@ src_configure() {
 	local myconf=""
 
 	ewarn
-	if use sse2; then
+	if use cpu_flags_x86_sse2; then
 		ewarn "Using sse2"
 		myconf="${myconf} --enable-sse=sse2"
 	else
-		if use sse; then
+		if use cpu_flags_x86_sse; then
 			ewarn "Using sse"
 			myconf="${myconf} --enable-sse=sse"
 		else
diff --git a/dev-libs/xapian/xapian-1.2.18.ebuild b/dev-libs/xapian/xapian-1.2.18.ebuild
index f8297cea1603..4470dd21fb2f 100644
--- a/dev-libs/xapian/xapian-1.2.18.ebuild
+++ b/dev-libs/xapian/xapian-1.2.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.18.ebuild,v 1.9 2014/12/05 10:17:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.18.ebuild,v 1.10 2015/01/28 19:43:27 mgorny Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc static-libs -sse +sse2 +brass +chert +inmemory"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
@@ -24,11 +24,11 @@ src_configure() {
 	local myconf=""
 
 	ewarn
-	if use sse2; then
+	if use cpu_flags_x86_sse2; then
 		ewarn "Using sse2"
 		myconf="${myconf} --enable-sse=sse2"
 	else
-		if use sse; then
+		if use cpu_flags_x86_sse; then
 			ewarn "Using sse"
 			myconf="${myconf} --enable-sse=sse"
 		else
diff --git a/dev-libs/xapian/xapian-1.2.19.ebuild b/dev-libs/xapian/xapian-1.2.19.ebuild
index bf442b53bb9c..01de909f135b 100644
--- a/dev-libs/xapian/xapian-1.2.19.ebuild
+++ b/dev-libs/xapian/xapian-1.2.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.19.ebuild,v 1.2 2014/12/26 10:18:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.19.ebuild,v 1.3 2015/01/28 19:43:27 mgorny Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ 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 -sse +sse2 +brass +chert +inmemory"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
@@ -24,11 +24,11 @@ src_configure() {
 	local myconf=""
 
 	ewarn
-	if use sse2; then
+	if use cpu_flags_x86_sse2; then
 		ewarn "Using sse2"
 		myconf="${myconf} --enable-sse=sse2"
 	else
-		if use sse; then
+		if use cpu_flags_x86_sse; then
 			ewarn "Using sse"
 			myconf="${myconf} --enable-sse=sse"
 		else
diff --git a/dev-libs/xapian/xapian-1.3.1-r1.ebuild b/dev-libs/xapian/xapian-1.3.1-r1.ebuild
index 390fd9e8d9b1..de8e981702b8 100644
--- a/dev-libs/xapian/xapian-1.3.1-r1.ebuild
+++ b/dev-libs/xapian/xapian-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.3.1-r1.ebuild,v 1.2 2014/12/26 10:18:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.3.1-r1.ebuild,v 1.3 2015/01/28 19:43:27 mgorny Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs -sse +sse2 +brass +chert +inmemory"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
@@ -24,11 +24,11 @@ src_configure() {
 	local myconf=""
 
 	ewarn
-	if use sse2; then
+	if use cpu_flags_x86_sse2; then
 		ewarn "Using sse2"
 		myconf="${myconf} --enable-sse=sse2"
 	else
-		if use sse; then
+		if use cpu_flags_x86_sse; then
 			ewarn "Using sse"
 			myconf="${myconf} --enable-sse=sse"
 		else