Add USE flags for configure options, bug #388677

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

4 files changed, 95 insertions, 9 deletions

diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index b207f554b14d..900792c385be 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.64 2011/09/18 08:14:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.65 2011/10/27 22:07:56 blueness Exp $
+
+*xapian-1.2.7-r2 (27 Oct 2011)
+
+  27 Oct 2011; Anthony G. Basile <blueness@gentoo.org> +xapian-1.2.7-r2.ebuild:
+  Add USE flags for configure options, bug #388677
 
   18 Sep 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
   Added no-herd to metadata.xml
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 08b6ed89d997..a9a409a52919 100644
--- 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
-MISC ChangeLog 8794 RMD160 6380163f4344d334ff00038a92c2a0994170c7cc SHA1 9d4cbd3c4cc25046c5add0015c34590064e990e3 SHA256 f09975c904465ce6c9b5cefd42756d32c84d1f400ad3969d45106522936888ce
-MISC metadata.xml 750 RMD160 1f3972490b20faf2fe1f007b5eb3a950c41bfd01 SHA1 a7b3e9fa038de155adc5e66551c2f9dfaab87484 SHA256 7451951047d59705dc638634493c9b8ba0d14941549dee1af83fd4faaeacd1ef
+EBUILD xapian-1.2.7-r2.ebuild 2254 RMD160 6f5eeb10e83d77e9e474a053d56f9f204acfdd20 SHA1 99809a78889b1c11361eb21798162fb664747d89 SHA256 c0194cb00e205aaeca0c382094eb7c82f9bbc1e88fd1d841b3ccb6cef92ae76d
+MISC ChangeLog 8958 RMD160 a7e518b0fc79817b842e366de8b94e311a08158c SHA1 7df007940637849771739a1f10072897eeb4d76b SHA256 8023c2f92c5b31cc86c987a24487aecb2e82ff8350a3d8c55af6567c0b7e7059
+MISC metadata.xml 1129 RMD160 e5fe84dfd274ccf5d4a58a307ef97ed80ec3261e SHA1 07d6480b50450a8c80da46172d8b2bf6daac6327 SHA256 63f9c0ebc7cc1b01f5cb7e643f3387f2db38db6b7a2141fdf58cb889f6fc726a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59C6UACgkQfXuS5UK5QB3IhAQArfVLel+yd2Q8Uzt9iLCthd4Q
-UEgccwgIe4H9HG2uEUMhHqvfhyts0GO8NNbOwJsmBGLNZHnmnJdYc/C4CzSmtZA4
-Wz054yDk982dvP+R0mOV0Gk37cW4yyk7X06h2Kamv5RbjheliBZ24aVgz7PJ68pK
-Xwe79rsDv9BT0RyKcHk=
-=5DiC
+iEYEAREIAAYFAk6p1kYACgkQl5yvQNBFVTVVhACfTSeCjn5uB/tTVsHg5qNxhVlZ
+jOgAnRMhPI1MtSsxplg3jVj/tkJF9yuT
+=exSY
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index 7798bafa2522..f9eab03379d3 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -18,4 +18,12 @@
 		to easily add advanced indexing and search facilities to their own
 		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>
+		<flag name='inmemory'>Enabled inmemory backend db support</flag>
+		<flag name='remote'>Enabled remot backend db support</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/xapian/xapian-1.2.7-r2.ebuild b/dev-libs/xapian/xapian-1.2.7-r2.ebuild
new file mode 100644
index 000000000000..207785831ca6
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.2.7-r2.ebuild
@@ -0,0 +1,74 @@
+# 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=
+}