Version bump 0.9.9_rc2, add id64 USE flag #268122, redigest libstemmer_c.tgz #276252, cleanup /etc #269514.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

7 files changed, 101 insertions, 47 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index bacc0e4ab01b..b02de41af705 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/sphinx
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.17 2008/12/22 20:34:48 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.18 2009/07/23 21:48:24 gengor Exp $
+
+*sphinx-0.9.9_rc2 (23 Jul 2009)
+
+  23 Jul 2009; Gordon Malm <gengor@gentoo.org> sphinx-0.9.8.ebuild,
+  sphinx-0.9.8.1.ebuild, sphinx-0.9.9_rc1.ebuild, +sphinx-0.9.9_rc2.ebuild,
+  metadata.xml:
+  Version bump 0.9.9_rc2, add id64 USE flag #268122, redigest
+  libstemmer_c.tgz #276252, cleanup /etc #269514.
 
   22 Dec 2008; Markus Meier <maekke@gentoo.org> sphinx-0.9.8.1.ebuild:
   amd64/x86 stable, bug #251894
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index dd1d50d7e64a..9c2b7b0380f0 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST libstemmer_c.tgz 129203 RMD160 9796feb2067ea7fe4001b211b9db35b2e996ffa7 SHA1 6645992e5a5023dfd7eecf99fbcc58ec8b41facf SHA256 e3203603e3ac8997ba8f5a803eb025d8bb368a630849689f197b97b44a7744fa
+DIST libstemmer_c.tgz 129206 RMD160 c095f4452f534e8eb05a2815b52ea1e88949525d SHA1 0ff25ac1c3adaf777d178f88491f4e7bf7a73e2d SHA256 6553e097c9b984c331e4029ade42502a173937c24da48a79d2787362de47e95e
 DIST sphinx-0.9.8.1.tar.gz 949660 RMD160 ab2bfee4cad552217e132449c7dd6b1071ed5bc9 SHA1 eed4c6f5b314f965c19cca8aebd0b6d847cd35f9 SHA256 ef69b2b52381173da92bf2df79dfc8c5271c4b3f156c356bb4ef82ca035dc013
 DIST sphinx-0.9.8.tar.gz 728864 RMD160 c572925f71fa80100a1c44eb46955e3a43215262 SHA1 0f82e56a9181b3aeaeef65e9ba82fbf6fbe632d6 SHA256 86de861550fc7b119b3cbe63a34bad32ac771f44c930d229775ac124c83571d9
 DIST sphinx-0.9.9-rc1.tar.gz 1093436 RMD160 d5a2ca9b31a70524b1c4c66f7e2340fc50636859 SHA1 2ac017b9f64cf7a8ca33db1703d149732cd57ff0 SHA256 05783cfd11e843035263d4a4f08d3dc66863b61ef1db9b930b2892b667f0e848
-EBUILD sphinx-0.9.8.1.ebuild 1296 RMD160 76e4ecd41f91f4d22257ab4a5e0847761176653d SHA1 af589d348593e2f4359594fc7077432c644e750d SHA256 41bcc130ab64ca78a39d8549a8cf8eba71452c955043f3e455f38458e4b9a007
-EBUILD sphinx-0.9.8.ebuild 1294 RMD160 221d413e230d03450dad9c6ce846d4aa8be0d3c7 SHA1 7d6d8469d04adc0f4cbcce1715bbb895c8332c86 SHA256 9051976d98ee6b1d6bcb6d084d6f8daf4a7203760870ad176a2cb890be2a40b2
-EBUILD sphinx-0.9.9_rc1.ebuild 1299 RMD160 efd1db21d39ebedad5218f3636424ee60accdad4 SHA1 9d907dc3f624e2e6430ced2ccfd082febdc5f118 SHA256 06fa8e53a9971931657f54f453a52dfcdaee769273ca053099f36952ba25405c
-MISC ChangeLog 2901 RMD160 53d8059113f890309ac7bdc380aa786917ec0812 SHA1 156d3d690ef0ff48aed27150c8e236aa79401e57 SHA256 cafc3d38db826ae32da34b55f283e97f2233561f0110311412211d894f6fd0c9
-MISC metadata.xml 325 RMD160 7d4bb6fa94507a33085dd755e431ce8805ae12cf SHA1 d05878cc49599c90cc75986d16bbadf044f9eb10 SHA256 acea86996ff576ee8ef38f99cd1f60473823a7a09f8079ab9a7ebb5510e472d8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEUEARECAAYFAklP+fwACgkQkKaRLQcq0GLqCgCdG9gNToAgQx7tObF228SprTOS
-pMQAmOk/xX0rG8B3CjRIQbTi5QUjGuc=
-=BHrL
------END PGP SIGNATURE-----
+DIST sphinx-0.9.9-rc2.tar.gz 1205937 RMD160 4e2481be8ce350dd7bfbe0eaf2c850f455391500 SHA1 a728375765acef6f73db7b44d80626621ebeae10 SHA256 b367291e8556c0fa07ecaf96917759dbff6e7e3487d44f703589bb7765f160e1
+EBUILD sphinx-0.9.8.1.ebuild 1256 RMD160 b5e0a47f408882f330be4f3df4f0ba9b9630d566 SHA1 ef67dbdae63808d4b146bb021858930df059ae2f SHA256 2fa83e15e6cb53c04b56dc89ae0550f24ca7e74964cb0ef43bfcd0a714a03d84
+EBUILD sphinx-0.9.8.ebuild 1255 RMD160 7661202ebfdf2a4d2c1b8517dfb22d371cbd19d3 SHA1 4285e7f38e1fbffe5f419f40242d853fe9036fb1 SHA256 351548243b5830b8712f4d8f253e020ee867f20a01a224f45ccf3afa9a708e63
+EBUILD sphinx-0.9.9_rc1.ebuild 1260 RMD160 bcbe983292620ef2b32cf28fb17036ae358a4f53 SHA1 5284662e39fe9d4ea10af9e1d7021f7d7169880c SHA256 5696cc32bed5782b34eeab8461a5b7329e4dd49693b2b5f250dfecc4deffd277
+EBUILD sphinx-0.9.9_rc2.ebuild 1260 RMD160 0d34a697fc1fbeccc0845b2f7fd504171c54192c SHA1 217e31bff59260e4aa87b3f6c0456a673edac14e SHA256 09a18a8fe4d250bb862be149e905616b1a3e4120ab7379e9497e9e96fbadb7ef
+MISC ChangeLog 3207 RMD160 a69b8b914259ac547625ab66b488e7fda6657ddb SHA1 ed04f8fbb93bc021ba8133d16959753cd0fb0c5e SHA256 786e2f562b80fb704c63ac631f5677bf86867b3013c7fdd14e3638f8e7ce6883
+MISC metadata.xml 385 RMD160 17ab17eaf132d99410444141036b9be4b6d5bd14 SHA1 8afaea1aaad349e18d4858d1e634fde7df4e3d4d SHA256 c1bcf5aa35367672db86b0f4f87f62318ceedfeafb6ad772efd2659e2abe4034
diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml
index 880bd13b51d7..e44be86b46e9 100644
--- a/app-misc/sphinx/metadata.xml
+++ b/app-misc/sphinx/metadata.xml
@@ -7,6 +7,7 @@
   <name>Caleb Tennis</name>
 </maintainer>
 <use>
+  <flag name='id64'>use 64-bit document and word IDs</flag>
   <flag name='stemmer'>Enable language stemming support</flag>
 </use>
 </pkgmetadata>
diff --git a/app-misc/sphinx/sphinx-0.9.8.1.ebuild b/app-misc/sphinx/sphinx-0.9.8.1.ebuild
index b3ce7928ef19..ba5871d66876 100644
--- a/app-misc/sphinx/sphinx-0.9.8.1.ebuild
+++ b/app-misc/sphinx/sphinx-0.9.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.8.1.ebuild,v 1.2 2008/12/22 20:34:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.8.1.ebuild,v 1.3 2009/07/23 21:48:24 gengor Exp $
 
 inherit eutils autotools
 
@@ -15,7 +15,7 @@ RESTRICT="mirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug mysql postgres stemmer test"
+IUSE="debug id64 mysql postgres stemmer test"
 
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-base )"
@@ -36,20 +36,19 @@ src_unpack() {
 
 src_compile() {
 	econf \
+		--sysconfdir="/etc/${PN}" \
+		$(use_enable id64) \
+		$(use_with debug) \
 		$(use_with mysql) \
 		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer) \
-		$(use_with debug) || die "econf failed"
+		$(use_with stemmer libstemmer)
 
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
-	dodoc doc/* example.sql
-	dodir /etc/sphinx
-	insinto /etc/sphinx
-	doins sphinx.conf.dist
+	dodoc doc/*
 
 	dodir /var/lib/sphinx
 	dodir /var/log/sphinx
diff --git a/app-misc/sphinx/sphinx-0.9.8.ebuild b/app-misc/sphinx/sphinx-0.9.8.ebuild
index c38704bb1743..5574f32e68e2 100644
--- a/app-misc/sphinx/sphinx-0.9.8.ebuild
+++ b/app-misc/sphinx/sphinx-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.8.ebuild,v 1.3 2008/10/25 20:27:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.8.ebuild,v 1.4 2009/07/23 21:48:24 gengor Exp $
 
 inherit eutils autotools
 
@@ -14,8 +14,8 @@ RESTRICT="mirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 amd64"
-IUSE="debug mysql postgres stemmer test"
+KEYWORDS="amd64 ~x86"
+IUSE="debug id64 mysql postgres stemmer test"
 
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-base )"
@@ -36,20 +36,19 @@ src_unpack() {
 
 src_compile() {
 	econf \
+		--sysconfdir="/etc/${PN}" \
+		$(use_enable id64) \
+		$(use_with debug) \
 		$(use_with mysql) \
 		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer) \
-		$(use_with debug) || die "econf failed"
+		$(use_with stemmer libstemmer)
 
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
-	dodoc doc/* example.sql
-	dodir /etc/sphinx
-	insinto /etc/sphinx
-	doins sphinx.conf.dist
+	dodoc doc/*
 
 	dodir /var/lib/sphinx
 	dodir /var/log/sphinx
diff --git a/app-misc/sphinx/sphinx-0.9.9_rc1.ebuild b/app-misc/sphinx/sphinx-0.9.9_rc1.ebuild
index 19af056a93f3..d815edae0037 100644
--- a/app-misc/sphinx/sphinx-0.9.9_rc1.ebuild
+++ b/app-misc/sphinx/sphinx-0.9.9_rc1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9_rc1.ebuild,v 1.1 2008/12/21 17:46:59 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9_rc1.ebuild,v 1.2 2009/07/23 21:48:24 gengor Exp $
 
 inherit eutils autotools
 
@@ -14,8 +14,8 @@ RESTRICT="mirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug mysql postgres stemmer test"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug id64 mysql postgres stemmer test"
 
 DEPEND="mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-base )"
@@ -36,20 +36,19 @@ src_unpack() {
 
 src_compile() {
 	econf \
+		--sysconfdir="/etc/${PN}" \
+		$(use_enable id64) \
+		$(use_with debug) \
 		$(use_with mysql) \
 		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer) \
-		$(use_with debug) || die "econf failed"
+		$(use_with stemmer libstemmer)
 
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
-	dodoc doc/* example.sql
-	dodir /etc/sphinx
-	insinto /etc/sphinx
-	doins sphinx.conf.dist
+	dodoc doc/*
 
 	dodir /var/lib/sphinx
 	dodir /var/log/sphinx
diff --git a/app-misc/sphinx/sphinx-0.9.9_rc2.ebuild b/app-misc/sphinx/sphinx-0.9.9_rc2.ebuild
new file mode 100644
index 000000000000..96617f57ee4f
--- /dev/null
+++ b/app-misc/sphinx/sphinx-0.9.9_rc2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9_rc2.ebuild,v 1.1 2009/07/23 21:48:24 gengor Exp $
+
+inherit eutils autotools
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
+HOMEPAGE="http://www.sphinxsearch.com/"
+SRC_URI="http://sphinxsearch.com/downloads/${MY_P}.tar.gz
+	stemmer? ( http://snowball.tartarus.org/dist/libstemmer_c.tgz )"
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug id64 mysql postgres stemmer test"
+
+DEPEND="mysql? ( virtual/mysql )
+	postgres? ( virtual/postgresql-base )"
+RDEPEND="${DEPEND}
+	test? ( dev-lang/php )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	if use stemmer; then
+		cd "${S}"
+		unpack libstemmer_c.tgz
+	fi
+	cd "${S}"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--sysconfdir="/etc/${PN}" \
+		$(use_enable id64) \
+		$(use_with debug) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with stemmer libstemmer)
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc doc/*
+
+	dodir /var/lib/sphinx
+	dodir /var/log/sphinx
+	dodir /var/run/sphinx
+}