Removed version with bloated use flags

(Portage version: 2.1.10.11/cvs/Linux x86_64)

3 files changed, 5 insertions, 76 deletions

diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index 337090381214..60cab4afb5f6 100644
--- a/dev-libs/xapian/ChangeLog
+++ b/dev-libs/xapian/ChangeLog
@@ -1,6 +1,10 @@
 # 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.66 2011/11/06 22:26:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.67 2011/11/07 09:32:30 blueness Exp $
+
+  07 Nov 2011; Anthony G. Basile <blueness@gentoo.org> -xapian-1.2.7-r2.ebuild,
+  metadata.xml:
+  Removed version with bloated use flags
 
 *xapian-1.2.7-r3 (06 Nov 2011)
 
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index f9eab03379d3..1c5296d3378b 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -19,7 +19,6 @@
 		applications.
 	</longdescription>
 	<use>
-		<flag name='nosse'>Disable all sse support</flag>
 		<flag name='brass'>Enabled brass backend db support</flag>
 		<flag name='chert'>Enabled chert backend db support</flag>
 		<flag name='flint'>Enabled flint backend db support</flag>
diff --git a/dev-libs/xapian/xapian-1.2.7-r2.ebuild b/dev-libs/xapian/xapian-1.2.7-r2.ebuild
deleted file mode 100644
index 207785831ca6..000000000000
--- a/dev-libs/xapian/xapian-1.2.7-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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-r2.ebuild,v 1.1 2011/10/27 22:07:56 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 -nosse +brass +chert +flint +inmemory +remote"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local count=0
-	use nosse && count=$((count+1))
-	use sse && count=$((count+1))
-	use sse2 && count=$((count+1))
-
-	local myconf=""
-
-	if [ $count != 1 ] ; then
-		ewarn "\033[1;33m************************************************************\033[m"
-		ewarn "One and only one of 'nosse' or 'sse' or 'sse2' should be"
-		ewarn "enabled in your USE flags.  Note that sse2 is enabled by"
-		ewarn "default.  If you enable one then disable two using -flag."
-		ewarn
-		use nosse && ewarn "\tnosse\t\tenabled" || ewarn "\tnosse\t\tdisabled"
-		use sse && ewarn "\tsse\t\tenabled" || ewarn "\tsse\t\tdisabled"
-		use sse2 && ewarn "\tsse2\t\tenabled" || ewarn "\tsse2\t\tdisabled"
-		ewarn
-		ewarn "I'm assuming you meant USE='-nosse -sse sse2' ... I hope I'm right!"
-		ewarn "\033[1;33m************************************************************\033[m"
-
-		myconf="${myconf} --enable-sse=sse2"
-
-	else
-		use nosse && myconf="${myconf} --disable-sse"
-		use sse && myconf="${myconf} --enable-sse=sse"
-		use sse2 && myconf="${myconf} --enable-sse=sse2"
-	fi
-
-	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=
-}