Removed version with bloated use flags

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

diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index 33709038121417f6eb9ab1763df8037227422185..60cab4afb5f601f5490c40fbeafd5280f118745f 100644 (file)
--- 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/Manifest b/dev-libs/xapian/Manifest
index 71848d8d8a8e16089f8766bb407f0105f760e49a..100dba79e3e94409caf7dfb8352b6d7ea007d5d4 100644 (file)
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -5,14 +5,13 @@ DIST xapian-core-1.2.5.tar.gz 3935134 RMD160 0af83c4150487f61f9752ed01125b000b2c
 DIST xapian-core-1.2.7.tar.gz 4069085 RMD160 fa2f5b376bc19bdbbeab28e5de718e2f627f156d SHA1 c6c5c5b14d5d64481858ac2b181429a9b8bdc9a1 SHA256 6ce8cb3502f35245ec0cb0dcf579ce4f65c015a2f2e8d1b4c388c95f58278c89
 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
 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
+MISC ChangeLog 9265 RMD160 bb2418f87c682a32a1e7865360c6d99901f99600 SHA1 3b6cb796b9678aa8de05cabb8701eeecb9cbbd7f SHA256 323277e33caf56b44e2cae5241a943601eaabf8983ed6cb9f7f95bee5c014159
+MISC metadata.xml 1077 RMD160 8f251dc8f61c1f14907939da53ad88488427c806 SHA1 185b629bc6f09f6e6005bb34c38434fad12b8473 SHA256 797893144a240c317073bb1885ed2f8f40e648fe9b20050f339401e17232695c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk63CYgACgkQl5yvQNBFVTXmlwCgl3MZNZenjnyKuY0iT2Su81x8
-BmsAnR/8rPIjM9IaE5QyoFhsZZdV2XH/
-=NxcZ
+iEYEAREIAAYFAk63pboACgkQl5yvQNBFVTUqGwCgjZ5qnc61UWHEnUGbWggWtYSj
+4JUAoIR213PV7RiEnrDlV8JF4BgRDtJW
+=Cs8r
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index f9eab03379d359ba7e50fa987918ad5fd54aa01e..1c5296d3378be3682b98ac7bd9bb374f075a0d73 100644 (file)
--- 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 (file)
index 2077858..0000000
--- 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=
-}