Version bump.

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

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 23912ad04ab53fbc02af33ffd5040850d8b2e4c8..42754d0626907b8401fd98cbba041f05da560e39 100644 (file)
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/sphinx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.37 2011/09/28 10:40:10 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.38 2011/11/28 18:23:59 graaff Exp $
+
+*sphinx-2.0.2_beta (28 Nov 2011)
+
+  28 Nov 2011; Hans de Graaff <graaff@gentoo.org> +sphinx-2.0.2_beta.ebuild:
+  Version bump.
 
   28 Sep 2011; Fabian Groffen <grobian@gentoo.org> sphinx-2.0.1_beta.ebuild,
   +files/sphinx-2.0.1_beta-solaris.patch:

diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index a1e6986c18a4de2e7fcc117a846cae5c831f2cfe..6f906a911ec2701c165d8a2e379852c3b81c68e7 100644 (file)
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX searchd.rc 762 RMD160 b607d99b0b3f279b2669f593deead434a7e6b352 SHA1 d1a056df1819ea9acc0b182189d501b01e6609cb SHA256 6aa55b4761ce78e1e6e5153022797ffedc912638b965aeeab084e1246db5d70e
 AUX sphinx-1.10_beta-darwin8.patch 845 RMD160 d7ef965ebbadb9a1f56ffc5684120bff71e82dc5 SHA1 d05a997cf2d3cc6e89c2172fa27d4852c3f76965 SHA256 c79ac91fd1b2e0f6701556ceeee492946898333eff3aa28f17d6346ea7f8bf35
@@ -13,17 +13,19 @@ DIST sphinx-0.9.8.1.tar.gz 949660 RMD160 ab2bfee4cad552217e132449c7dd6b1071ed5bc
 DIST sphinx-0.9.9.tar.gz 1218359 RMD160 ed3cd1a9328114c1d2a6325cce5520065076c275 SHA1 8c739b96d756a50972c27c7004488b55d7458015 SHA256 bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4
 DIST sphinx-1.10-beta.tar.gz 1518778 RMD160 1d600289c76d412e96af611ec5c614fcfd3489e1 SHA1 28e84071e75d017f4e3403e5d22dbc1302a3c912 SHA256 51b3e5f3254b4d93d6dce91a44451486e5b0f82a1e44799481158e1f95fc1c60
 DIST sphinx-2.0.1-beta.tar.gz 1761313 RMD160 678ff846c82dff890f1e38daa524464cabf9e563 SHA1 7c1244ea95ab4fed1322c6e0cbbf88c2f7e97f9c SHA256 fe27152ee24224bcf2ab7293dabe826d8db69c35eca16edf1ca510e0a1f4bf81
+DIST sphinx-2.0.2-beta.tar.gz 1916158 RMD160 66816276ae0ce13703aaf39563e1aea405e074d3 SHA1 af0fcca27abbc3d73e04ce7265748350e6bb93b9 SHA256 7023b394e1f8a11f10db53cffe37782c7e5aa5cb69cfcbb15ac246a74d7edeb8
 EBUILD sphinx-0.9.8.1.ebuild 1256 RMD160 bd3c011e1202870c9514f81099cfc21b00c6c180 SHA1 fa4c08816fefa9878faf5f7b2018586b15cf8cff SHA256 ac58fa534b8ce45a4b8f78c8d6f410250292aa48aad99f8d572f5e2f231d11b0
 EBUILD sphinx-0.9.9-r2.ebuild 2435 RMD160 250c1ae6aa4a52d8f418c44125bc31ab2c6418a9 SHA1 82d5c1c9e7f9d04785816b29c0d382fcf3dcf4b5 SHA256 92e16762929ea63633798ca8d8e970f967aa4d9886bf933f9dcc457c9e19b06c
 EBUILD sphinx-0.9.9.ebuild 1552 RMD160 819efed6bf1df22a70be9a45355673e4c97c71aa SHA1 0ba7dc938577b9615d8e5974c978ccdc158d41e8 SHA256 b9ff793fbc25abd115bac22574f1762ecf0935e96a8ffe7783b79f9cdeba1e59
 EBUILD sphinx-1.10_beta-r1.ebuild 2512 RMD160 73ac8775312320d3f99dc19dbfadca7bbfbe42b5 SHA1 73cb28ea3e525fbe0ecd86882319c32fb800e551 SHA256 dc09f422e0a3c105b94951d1c8c27d69735d82f2cc1cac57081a4c051fb1ca0f
 EBUILD sphinx-2.0.1_beta.ebuild 2480 RMD160 6c812ff95aaaf9969a46be632e803b503934afa1 SHA1 f21722ee374d0567da2fffeb9ade17ebf91cc157 SHA256 5b7e69841ed503ec0b39dc84c4ad921d2c921522f57d780df629f6f0a6e6e0c9
-MISC ChangeLog 6750 RMD160 4b52351a46e56052e4fc84ebe55da51a27b5dc00 SHA1 a6a5d55bda10c030d2c13a7d977407529b9d1385 SHA256 da4ceaff2f821857bef8ab8ac7a8c20ebc2efd08ab04a3e13764e42b3e47478a
+EBUILD sphinx-2.0.2_beta.ebuild 2590 RMD160 3024d89b0cb0697ca306920b008caffd5984ecb3 SHA1 20e849fa5a90a2ef93914645869a958d8c06f03c SHA256 16f4b7c6ee12628b56dbf3e1c0579d94aa3d2a29d89e1bedceabbe427d2ecaee
+MISC ChangeLog 6877 RMD160 7b8a68dc562890c881f6a0b432eecc6d1d602a84 SHA1 d0c2402a4103c896c965bf087ca2b298fea5da80 SHA256 c7c8c1d2639e3d87ef709f2ab3bb8c979b0219266b97c800da18f31a06ec91d8
 MISC metadata.xml 337 RMD160 7c89f7f8e67273a4a7d4b79b3e6257a7622f570b SHA1 126d46d2da8c613c8ee0f1beb1de2652096313bc SHA256 14623eccba1198473356a1ba7a3558f38933f337088211ac45c647a15bcbebdd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6C+ZAACgkQX3X2B8XHTonUqgCeM+WfWIjSIYYV2TXAwump6bzc
-WFsAoIgJ6yI5xs4jUkukoRoQGpRYkjqS
-=fY0W
+iF4EAREIAAYFAk7T0ckACgkQiIP6VqMIqNctBgD/ZiwUV35zoM3tNbIz/fU+44tS
+H7TqQVth7y6rfrciJ+cA/36jpTW0ZNqD5aCzAMkRMr+I16I8q08zmwgfDGnXYP3+
+=M6YI
 -----END PGP SIGNATURE-----

diff --git a/app-misc/sphinx/sphinx-2.0.2_beta.ebuild b/app-misc/sphinx/sphinx-2.0.2_beta.ebuild
new file mode 100644 (file)
index 0000000..2c7e3eb
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.0.2_beta.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.2_beta.ebuild,v 1.1 2011/11/28 18:23:59 graaff Exp $
+
+EAPI=3
+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/files/${MY_P}.tar.gz
+       stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug id64 mysql odbc postgres stemmer test"
+
+RDEPEND="mysql? ( virtual/mysql )
+       postgres? ( dev-db/postgresql-base )
+       odbc? ( dev-db/unixODBC )
+       virtual/libiconv"
+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() {
+       epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+       # drop nasty hardcoded search path breaking Prefix
+       sed -i -e '/\/usr\/local\//d' configure.ac || die
+
+       # Regenerate autoconf files in the api directory first to avoid
+       # running elibtoolize twice, which results in a warning.
+       pushd api/libsphinxclient || die
+       eautoreconf
+       popd || die
+
+       eautoreconf
+}
+
+src_configure() {
+       # fix libiconv detection
+       use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+       econf \
+               --sysconfdir="${EPREFIX}/etc/${PN}" \
+               $(use_enable id64) \
+               $(use_with debug) \
+               $(use_with mysql) \
+               $(use_with odbc unixodbc) \
+               $(use_with postgres pgsql) \
+               $(use_with stemmer libstemmer)
+
+       cd api/libsphinxclient || die
+       econf STRIP=:
+}
+
+src_compile() {
+       emake || die "emake failed"
+
+       emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient 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"
+       emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient 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
+}