diff options
author | 2010-06-20 15:25:25 +0000 | |
---|---|---|
committer | 2010-06-20 15:25:25 +0000 | |
commit | 718314b457a841a7b341ee0e55a1a3d861e0eb6f (patch) | |
tree | e20c5babd522b59f96ddd4a598e0b6819bcb8d5a /app-misc/sphinx | |
parent | Stable on amd64 wrt bug #322855 (diff) | |
download | historical-718314b457a841a7b341ee0e55a1a3d861e0eb6f.tar.gz historical-718314b457a841a7b341ee0e55a1a3d861e0eb6f.tar.bz2 historical-718314b457a841a7b341ee0e55a1a3d861e0eb6f.zip |
Restrict tests in 0.9.9, and add a revision bump to install the test files and indicate that they need a live database. Fixes bug 323903.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'app-misc/sphinx')
-rw-r--r-- | app-misc/sphinx/ChangeLog | 9 | ||||
-rw-r--r-- | app-misc/sphinx/Manifest | 15 | ||||
-rw-r--r-- | app-misc/sphinx/sphinx-0.9.9-r1.ebuild | 76 | ||||
-rw-r--r-- | app-misc/sphinx/sphinx-0.9.9.ebuild | 5 |
4 files changed, 101 insertions, 4 deletions
diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog index 47ffe54f002f..51aace91ec4a 100644 --- a/app-misc/sphinx/ChangeLog +++ b/app-misc/sphinx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/sphinx # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.26 2010/06/17 20:03:36 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.27 2010/06/20 15:25:25 graaff Exp $ + +*sphinx-0.9.9-r1 (20 Jun 2010) + + 20 Jun 2010; Hans de Graaff <graaff@gentoo.org> sphinx-0.9.9.ebuild, + +sphinx-0.9.9-r1.ebuild: + Restrict tests in 0.9.9, and add a revision bump to install the test files + and indicate that they need a live database. Fixes bug 323903. 17 Jun 2010; Patrick Lauer <patrick@gentoo.org> sphinx-0.9.8.1.ebuild, sphinx-0.9.9.ebuild: diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest index 5ed9cf7760c4..e6ff6fe9efdc 100644 --- a/app-misc/sphinx/Manifest +++ b/app-misc/sphinx/Manifest @@ -1,9 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX searchd.rc 762 RMD160 b607d99b0b3f279b2669f593deead434a7e6b352 SHA1 d1a056df1819ea9acc0b182189d501b01e6609cb SHA256 6aa55b4761ce78e1e6e5153022797ffedc912638b965aeeab084e1246db5d70e DIST libstemmer_c-20091122.tgz 129207 RMD160 af69a8008c69422f0ddc3c30f54a336f21718853 SHA1 3a5605d507582770d496c3b0ada4ae7df378834e SHA256 ad4e152379214480d599c86dd19421a36fce78cedd20fc324520c5bba0a512e7 DIST libstemmer_c.tgz 129195 RMD160 3d255f174b462704a615f9c7871f2d86fce8c2dd SHA1 2d0ef03ea0fbf68580c141ac7ac3e49e84e1df17 SHA256 4f2749ea3ecd2a4ac7a1a1dc4f914a9797860a92118789da070365565143b272 DIST sphinx-0.9.8.1.tar.gz 949660 RMD160 ab2bfee4cad552217e132449c7dd6b1071ed5bc9 SHA1 eed4c6f5b314f965c19cca8aebd0b6d847cd35f9 SHA256 ef69b2b52381173da92bf2df79dfc8c5271c4b3f156c356bb4ef82ca035dc013 DIST sphinx-0.9.9.tar.gz 1218359 RMD160 ed3cd1a9328114c1d2a6325cce5520065076c275 SHA1 8c739b96d756a50972c27c7004488b55d7458015 SHA256 bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4 EBUILD sphinx-0.9.8.1.ebuild 1256 RMD160 bd3c011e1202870c9514f81099cfc21b00c6c180 SHA1 fa4c08816fefa9878faf5f7b2018586b15cf8cff SHA256 ac58fa534b8ce45a4b8f78c8d6f410250292aa48aad99f8d572f5e2f231d11b0 -EBUILD sphinx-0.9.9.ebuild 1504 RMD160 ad68cb39a470bdb0e1eab6c201eecdbbe81d45cf SHA1 1eb0079894300b20ea9690bfe62738bac07d6ac2 SHA256 5cebc334eaee5bc4c4bf2565fe7bb88d71f2c3043b9a151f5771dad686d9103f -MISC ChangeLog 4510 RMD160 6504c2be4526919dc87f758b8c3482d5882e94b6 SHA1 4975eac218ab4df534ebb87156116978e04163ef SHA256 80f39e392a38d6c953d74d0cbb462a67a24eb6ef1a12dfea7ce9ae8af9697b61 +EBUILD sphinx-0.9.9-r1.ebuild 1796 RMD160 80493afdc360e8f7fc5b0275f0c9f16f12320a6c SHA1 853c5c3afc1b3495fcd29cd0789ec1d99796a02e SHA256 ab3208efda8350e7e8fbcc42cb7c1c3b9e0b0a16dd9dc6dcddf34ca68163957e +EBUILD sphinx-0.9.9.ebuild 1553 RMD160 0c5835bffe56bea53ea6fedadb63a079dc9aebef SHA1 fc9c9ee5cde81a815aa5c994218c82dc41dc610d SHA256 f3887ac8dea54659d6d4080c447ea99aac2972b7c5a4741f0a434e473e2f7b14 +MISC ChangeLog 4782 RMD160 f424d253d6254dab184872bccd998bd038406b34 SHA1 62e1e7c33417c1c7905736608fd616f76c6f2f7c SHA256 0f0c67ff78ba5e8235d058327029267ef09484afefdc5dd7fb483ba8d7779749 MISC metadata.xml 358 RMD160 756ddce7322eb8b7cde365ca96c7997b26f6fa42 SHA1 2c8c1f55e21e904d6336f486a07eff8bbfdd03af SHA256 77a4da29239cfbdb02772dcabd0b233515790a6703b30b76ded71269a4e658de +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iF4EAREIAAYFAkweMvAACgkQZihJkut28StrhwD9EsV15UDSC9viTmW9+xZCV3Bo +D4HBiN+Dkz4hWvBeU44A/3OPGRPVeGUfVYvIhVE8St3EW6yQp7JqZREIiXhTIkzN +=uXDT +-----END PGP SIGNATURE----- diff --git a/app-misc/sphinx/sphinx-0.9.9-r1.ebuild b/app-misc/sphinx/sphinx-0.9.9-r1.ebuild new file mode 100644 index 000000000000..126d492a2184 --- /dev/null +++ b/app-misc/sphinx/sphinx-0.9.9-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/06/20 15:25:25 graaff Exp $ + +EAPI=2 +inherit eutils autotools + +MY_P=${P/_/-} + +# This has been added by Gentoo, to explicitly version libstemmer. +# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was +# fetched. +STEMMER_PV="20091122" +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? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug id64 mysql postgres stemmer test" + +RDEPEND="mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-base )" +DEPEND="${RDEPEND} + test? ( dev-lang/php )" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${MY_P}.tar.gz + if use stemmer; then + cd "${S}" + unpack libstemmer_c-${STEMMER_PV}.tgz + fi +} + +src_prepare() { + eautoreconf +} + +src_configure() { + econf \ + --sysconfdir="/etc/${PN}" \ + $(use_enable id64) \ + $(use_with debug) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with stemmer libstemmer) +} + +src_compile() { + emake || die "emake failed" +} + +src_test() { + elog "Tests require access to a live MySQL database and may require configuration." + elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php" +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + dodoc doc/* + + dodir /var/lib/sphinx + dodir /var/log/sphinx + dodir /var/run/sphinx + + newinitd "${FILESDIR}"/searchd.rc searchd + + if use test; then + insinto /usr/share/${PN} + doins -r test || die "install of test files failed." + fi +} diff --git a/app-misc/sphinx/sphinx-0.9.9.ebuild b/app-misc/sphinx/sphinx-0.9.9.ebuild index c53cae41a58d..601452b97f74 100644 --- a/app-misc/sphinx/sphinx-0.9.9.ebuild +++ b/app-misc/sphinx/sphinx-0.9.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.ebuild,v 1.3 2010/06/17 20:03:36 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9.ebuild,v 1.4 2010/06/20 15:25:25 graaff Exp $ EAPI=2 inherit eutils autotools @@ -26,6 +26,9 @@ RDEPEND="mysql? ( virtual/mysql ) DEPEND="${RDEPEND} test? ( dev-lang/php )" +# Tests require a live database. +RESTRICT="test" + S=${WORKDIR}/${MY_P} src_unpack() { |