[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 9bd7082dff404bb1031102adc1cf64ab0dc54c63
Author: Sam James gentoo org>
AuthorDate: Tue Mar 5 07:00:07 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 5 07:00:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd7082d
app-misc/sphinx: filter LTO, no SA
The codebase is very old and it's no longer being maintained upstream. Do
as we did in 1069c86e5578828a2640f2cc3510fe11c0ba804b.
Bug: https://bugs.gentoo.org/880923
Closes: https://bugs.gentoo.org/854738
Signed-off-by: Sam James gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r5.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index 8f12c090a21d..cd7ae1b4fc4a 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -58,6 +58,9 @@ src_prepare() {
}
src_configure() {
+ # bug #854738
+ append-flags -fno-strict-aliasing
+ filter-lto
# This code is no longer maintained and not compatible with modern
C/C++ standards, bug #880923
append-cflags -std=gnu89
append-cxxflags -std=c++11
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 0b73f48098727aea0c6a4fc275b34c69d571b0e9
Author: Hans de Graaff gentoo org>
AuthorDate: Fri Feb 9 13:19:27 2024 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri Feb 9 14:24:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b73f480
app-misc/sphinx: USE https for HOMEPAGE and SRC_URI
Signed-off-by: Hans de Graaff gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r5.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index 615f1e9602d0..8f12c090a21d 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,8 +9,8 @@ inherit autotools flag-o-matic toolchain-funcs
MY_P=${P}-release
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;
+HOMEPAGE="https://sphinxsearch.com/;
+SRC_URI="https://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 1069c86e5578828a2640f2cc3510fe11c0ba804b
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Nov 13 10:03:27 2022 +
Commit: Hans de Graaff gentoo org>
CommitDate: Mon Nov 14 06:42:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1069c86e
app-misc/sphinx: lock C/C++ to older versions of the standard
This code is no longer maintained and has compatibility issues with
newer C and C++ standards. Lock to older standards to avoid compilation
issues.
Closes: https://bugs.gentoo.org/880923
Signed-off-by: Hans de Graaff gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r5.ebuild | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index a12e8f50f0b2..462ddf809f44 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
#MY_P=${P/_/-}
MY_P=${P}-release
@@ -58,6 +58,10 @@ src_prepare() {
}
src_configure() {
+ # This code is no longer maintained and not compatible with modern
C/C++ standards, bug #880923
+ append-cflags -std=gnu89
+ append-cxxflags -std=c++11
+
# fix libiconv detection
use !elibc_glibc && export ac_cv_search_iconv=-liconv
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 6025a3cb3d7021c60ee064d3109520cc065650e8 Author: Sam James gentoo org> AuthorDate: Thu Jul 28 07:06:32 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jul 28 07:09:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6025a3cb app-misc/sphinx: add github upstream metadata Signed-off-by: Sam James gentoo.org> app-misc/sphinx/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml index ca1edada7df5..f0cbdf298a59 100644 --- a/app-misc/sphinx/metadata.xml +++ b/app-misc/sphinx/metadata.xml @@ -9,4 +9,7 @@ Add mariadb database support Enable language stemming support + + sphinxsearch/sphinx +
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 23cca873e8f02cb510e99e186f98f42ff6289a83 Author: Sam James gentoo org> AuthorDate: Sat Mar 26 01:33:03 2022 + Commit: Sam James gentoo org> CommitDate: Sat Mar 26 01:37:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23cca873 app-misc/sphinx: fix UnusedLocalUse Signed-off-by: Sam James gentoo.org> app-misc/sphinx/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml index 29ae2a06de69..ca1edada7df5 100644 --- a/app-misc/sphinx/metadata.xml +++ b/app-misc/sphinx/metadata.xml @@ -7,7 +7,6 @@ use 64-bit document and word IDs Add mariadb database support - use the dev-libs/re2 regular expression library Enable language stemming support
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 4e2200202a42a8bceca8acc33852b993df9349a5
Author: David Seifert gentoo org>
AuthorDate: Sun Mar 20 20:49:53 2022 +
Commit: David Seifert gentoo org>
CommitDate: Sun Mar 20 20:49:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e220020
app-misc/sphinx: drop 2.2.11-r4
* required for automake-1.15 cleanup
Signed-off-by: David Seifert gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r4.ebuild | 112
1 file changed, 112 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
deleted file mode 100644
index 0c4666a146d4..
--- a/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE=1.15
-
-inherit epatch autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-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;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
-
-REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
-
-RDEPEND="
- mysql? ( dev-db/mysql-connector-c:= )
- mariadb? ( dev-db/mariadb-connector-c:= )
- postgres? ( dev-db/postgresql:* )
- odbc? ( dev-db/unixODBC )
- re2? ( dev-libs/re2:= )
- stemmer? ( dev-libs/snowball-stemmer:= )
- xml? ( dev-libs/expat )
- virtual/libiconv"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
- # drop nasty hardcoded search path breaking Prefix
- # We patch configure directly since otherwise we need to run
- # eautoreconf twice and that causes problems, bug 425380
- sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
-
- if use mariadb ; then
- sed -i -e 's/mysql_config/mariadb_config/g' configure || die
- fi
-
- # Fix QA compilation warnings.
- sed -i -e '19i#include ' api/libsphinxclient/test.c || die
-
- eapply_user
-
- pushd api/libsphinxclient || die
- eautoreconf
- popd || die
-
- # Drop bundled code to ensure building against system versions. We
- # cannot remove libstemmer_c since configure updates its Makefile.
- rm -rf libexpat libre2 || die
-}
-
-src_configure() {
- # fix libiconv detection
- use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
- local mysql_with
- if use mysql || use mariadb ; then
- mysql_with="--with-mysql"
- else
- mysql_with="--without-mysql"
- fi
-
- econf \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- $(use_enable id64) \
- $(use_with debug) \
- ${mysql_with} \
- $(use_with odbc unixodbc) \
- $(use_with postgres pgsql) \
- $(use_with re2) \
- --with-re2-libs="${EPREFIX}/usr/$(get_libdir)/libre2.so" \
- $(use_with stemmer libstemmer) \
- $(use_with syslog syslog) \
- $(use_with xml libexpat )
-
- cd api/libsphinxclient || die
- econf STRIP=:
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-
- emake -j 1 -C api/libsphinxclient
-}
-
-src_test() {
- # Tests require a live database and only work from the source
- # directory.
- :
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" -C api/libsphinxclient install
-
- dodoc doc/*
-
- dodir /var/lib/sphinx
- dodir /var/log/sphinx
-
- newinitd "${FILESDIR}"/searchd.rc searchd
-}
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: ff31a198963a2e195b7c725894bfdbe0fa7eeff2
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Sep 22 06:57:52 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Sep 22 06:57:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff31a198
app-misc/sphinx: x86 stable wrt bug #811597
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index 1abe26037c0..a12e8f50f0b 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 84f366cf14c0248471fe4a43ff695fc04340fe44
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Sep 21 06:33:47 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Sep 21 06:35:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f366cf
app-misc/sphinx: amd64 stable wrt bug #811597
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index 66f738edfe4..1abe26037c0 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 60bec2d5a3b4fbb2b55609e61ff045b6dc8d4521
Author: Sam James gentoo org>
AuthorDate: Fri Aug 27 20:40:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Aug 27 20:45:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60bec2d5
app-misc/sphinx: subscribe to snowball-stemmer subslot
We need to be rebuilt when snowball-stemmer changes ABI.
Bug: https://bugs.gentoo.org/719402
Signed-off-by: Sam James gentoo.org>
.../sphinx/{sphinx-2.2.11-r2.ebuild => sphinx-2.2.11-r4.ebuild} | 8
.../sphinx/{sphinx-2.2.11-r3.ebuild => sphinx-2.2.11-r5.ebuild} | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
similarity index 94%
rename from app-misc/sphinx/sphinx-2.2.11-r2.ebuild
rename to app-misc/sphinx/sphinx-2.2.11-r4.ebuild
index 9b55c9c4720..0c4666a146d 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r4.ebuild
@@ -22,12 +22,12 @@ IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer
syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
RDEPEND="
- mysql? ( dev-db/mysql-connector-c )
- mariadb? ( dev-db/mariadb-connector-c )
+ mysql? ( dev-db/mysql-connector-c:= )
+ mariadb? ( dev-db/mariadb-connector-c:= )
postgres? ( dev-db/postgresql:* )
odbc? ( dev-db/unixODBC )
- re2? ( dev-libs/re2 )
- stemmer? ( dev-libs/snowball-stemmer )
+ re2? ( dev-libs/re2:= )
+ stemmer? ( dev-libs/snowball-stemmer:= )
xml? ( dev-libs/expat )
virtual/libiconv"
diff --git a/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
similarity index 95%
rename from app-misc/sphinx/sphinx-2.2.11-r3.ebuild
rename to app-misc/sphinx/sphinx-2.2.11-r5.ebuild
index 5ee036e6375..66f738edfe4 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild
@@ -20,11 +20,11 @@ IUSE="debug +id64 mariadb mysql odbc postgres stemmer
syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
RDEPEND="
- mysql? ( dev-db/mysql-connector-c )
- mariadb? ( dev-db/mariadb-connector-c )
+ mysql? ( dev-db/mysql-connector-c:= )
+ mariadb? ( dev-db/mariadb-connector-c:= )
postgres? ( dev-db/postgresql:* )
odbc? ( dev-db/unixODBC )
- stemmer? ( dev-libs/snowball-stemmer )
+ stemmer? ( dev-libs/snowball-stemmer:= )
xml? ( dev-libs/expat )
virtual/libiconv"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 76008390609d0801f2474225466648c23dd9db69
Author: Hans de Graaff gentoo org>
AuthorDate: Fri Aug 27 07:22:58 2021 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri Aug 27 07:23:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76008390
app-misc/sphinx: cleanup
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans de Graaff gentoo.org>
app-misc/sphinx/sphinx-2.2.11.ebuild | 94
1 file changed, 94 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild
b/app-misc/sphinx/sphinx-2.2.11.ebuild
deleted file mode 100644
index 7b6c533c457..000
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.15
-
-inherit epatch autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-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;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris"
-IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
-
-RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- odbc? ( dev-db/unixODBC )
- re2? ( dev-libs/re2 )
- stemmer? ( dev-libs/snowball-stemmer )
- xml? ( dev-libs/expat )
- virtual/libiconv"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
- # drop nasty hardcoded search path breaking Prefix
- # We patch configure directly since otherwise we need to run
- # eautoreconf twice and that causes problems, bug 425380
- sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
-
- # Fix QA compilation warnings.
- sed -i -e '19i#include ' api/libsphinxclient/test.c || die
-
- pushd api/libsphinxclient || die
- eautoreconf
- popd || die
-
- # Drop bundled code to ensure building against system versions. We
- # cannot remove libstemmer_c since configure updates its Makefile.
- rm -rf libexpat libre2 || die
-}
-
-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 re2) \
- $(use_with stemmer libstemmer) \
- $(use_with syslog syslog) \
- $(use_with xml libexpat )
-
- cd api/libsphinxclient || die
- econf STRIP=:
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-
- emake -j 1 -C api/libsphinxclient
-}
-
-src_test() {
- # Tests require a live database and only work from the source
- # directory.
- :
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" -C api/libsphinxclient install
-
- dodoc doc/*
-
- dodir /var/lib/sphinx
- dodir /var/log/sphinx
-
- newinitd "${FILESDIR}"/searchd.rc searchd
-}
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: c886a97ff3b8697cce137be45508be176197d0f2
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Aug 19 11:54:56 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Aug 19 11:54:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c886a97f
app-misc/sphinx: amd64 stable wrt bug #783645
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
index 9eae6cfef42..9b55c9c4720 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: bc59f95a9de5ad151c644b76b1b16be82e6b29e1
Author: Sam James gentoo org>
AuthorDate: Thu Aug 19 01:07:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Aug 19 01:07:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc59f95a
app-misc/sphinx: Stabilize 2.2.11-r2 x86, #783645
Signed-off-by: Sam James gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
index 4275fa3b36b..9eae6cfef42 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: d6f5654c4c0b74caf663cb9689d882af512d82cb
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Aug 15 05:38:42 2021 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Aug 15 07:41:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f5654c
app-misc/sphinx: cleanup
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans de Graaff gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r1.ebuild | 111
1 file changed, 111 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
deleted file mode 100644
index ae063ea14f8..000
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE=1.15
-
-inherit epatch autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-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;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
-
-REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
-
-RDEPEND="
- mysql? ( dev-db/mysql-connector-c )
- mariadb? ( dev-db/mariadb-connector-c )
- postgres? ( dev-db/postgresql:* )
- odbc? ( dev-db/unixODBC )
- re2? ( dev-libs/re2 )
- stemmer? ( dev-libs/snowball-stemmer )
- xml? ( dev-libs/expat )
- virtual/libiconv"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
- # drop nasty hardcoded search path breaking Prefix
- # We patch configure directly since otherwise we need to run
- # eautoreconf twice and that causes problems, bug 425380
- sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
-
- if use mariadb ; then
- sed -i -e 's/mysql_config/mariadb_config/g' configure || die
- fi
-
- # Fix QA compilation warnings.
- sed -i -e '19i#include ' api/libsphinxclient/test.c || die
-
- eapply_user
-
- pushd api/libsphinxclient || die
- eautoreconf
- popd || die
-
- # Drop bundled code to ensure building against system versions. We
- # cannot remove libstemmer_c since configure updates its Makefile.
- rm -rf libexpat libre2 || die
-}
-
-src_configure() {
- # fix libiconv detection
- use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
- local mysql_with
- if use mysql || use mariadb ; then
- mysql_with="--with-mysql"
- else
- mysql_with="--without-mysql"
- fi
-
- econf \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- $(use_enable id64) \
- $(use_with debug) \
- ${mysql_with} \
- $(use_with odbc unixodbc) \
- $(use_with postgres pgsql) \
- $(use_with re2) \
- $(use_with stemmer libstemmer) \
- $(use_with syslog syslog) \
- $(use_with xml libexpat )
-
- cd api/libsphinxclient || die
- econf STRIP=:
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-
- emake -j 1 -C api/libsphinxclient
-}
-
-src_test() {
- # Tests require a live database and only work from the source
- # directory.
- :
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" -C api/libsphinxclient install
-
- dodoc doc/*
-
- dodir /var/lib/sphinx
- dodir /var/log/sphinx
-
- newinitd "${FILESDIR}"/searchd.rc searchd
-}
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/, app-misc/sphinx/files/
commit: 2d4b7d5519ded98678c67fec32cfe250c0c96c47
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Aug 15 05:38:07 2021 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Aug 15 07:41:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4b7d55
app-misc/sphinx: modernize and fix issues
Drop re2 support since sphinx requires an obsolete version of re2.
Closes: https://bugs.gentoo.org/771069
Use EAPI 8 and support automake 1.16, thanks for Andrey Volkov.
Bug: https://bugs.gentoo.org/649120
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans de Graaff gentoo.org>
.../sphinx/files/sphinx-2.2.11-automake-1.16.patch | 10 ++
app-misc/sphinx/sphinx-2.2.11-r3.ebuild| 111 +
2 files changed, 121 insertions(+)
diff --git a/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch
b/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch
new file mode 100644
index 000..da556ef2ef6
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch
@@ -0,0 +1,10 @@
+diff --git a/api/libsphinxclient/Makefile.am b/api/libsphinxclient/Makefile.am
+index a4abfef..10d5914 100644
+--- a/api/libsphinxclient/Makefile.am
b/api/libsphinxclient/Makefile.am
+@@ -10,4 +10,4 @@ libsphinxclient_la_LIBADD = @LTLIBOBJS@
+ libsphinxclient_la_LDFLAGS = -release @VERSION@
+
+ include_HEADERS = sphinxclient.h
+-test_LDADD = .libs/libsphinxclient.a
++test_LDADD = $(lib_LTLIBRARIES)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
new file mode 100644
index 000..5ee036e6375
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+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;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml"
+
+REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
+
+RDEPEND="
+ mysql? ( dev-db/mysql-connector-c )
+ mariadb? ( dev-db/mariadb-connector-c )
+ postgres? ( dev-db/postgresql:* )
+ odbc? ( dev-db/unixODBC )
+ stemmer? ( dev-libs/snowball-stemmer )
+ xml? ( dev-libs/expat )
+ virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ eapply -p0 "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+ eapply "${FILESDIR}"/${P}-automake-1.16.patch
+
+ # drop nasty hardcoded search path breaking Prefix
+ # We patch configure directly since otherwise we need to run
+ # eautoreconf twice and that causes problems, bug 425380
+ sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
+
+ if use mariadb ; then
+ sed -i -e 's/mysql_config/mariadb_config/g' configure || die
+ fi
+
+ # Fix QA compilation warnings.
+ sed -i -e '19i#include ' api/libsphinxclient/test.c || die
+
+ eapply_user
+
+ pushd api/libsphinxclient || die
+ eautoreconf
+ popd || die
+
+ # Drop bundled code to ensure building against system versions. We
+ # cannot remove libstemmer_c since configure updates its Makefile.
+ rm -rf libexpat || die
+}
+
+src_configure() {
+ # fix libiconv detection
+ use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+ local mysql_with
+ if use mysql || use mariadb ; then
+ mysql_with="--with-mysql"
+ else
+ mysql_with="--without-mysql"
+ fi
+
+ econf \
+ --sysconfdir="${EPREFIX}/etc/${PN}" \
+ $(use_enable id64) \
+ $(use_with debug) \
+ ${mysql_with} \
+ $(use_with odbc unixodbc) \
+ $(use_with postgres pgsql) \
+ $(use_with stemmer libstemmer) \
+ $(use_with syslog syslog) \
+ $(use_with xml libexpat )
+
+ cd api/libsphinxclient || die
+ econf STRIP=:
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+
+ emake -j 1 -C api/libsphinxclient
+}
+
+src_test() {
+ # Tests require a live database and only work from the source
+ # directory.
+ :
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" -C api/libsphinxclient install
+
+ # Remove unneeded empty directories.
+ rmdir "${D}"/var/lib/{data,log}
+
+ dodoc doc/*
+
+ keepdir /var/lib/sphinx
+ keepdir /var/log/sphinx
+
+ newinitd "${FILESDIR}"/searchd.rc searchd
+}
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 3f424ce785035c99b4ec6cadb9e834d5deab0c5a
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Jan 6 13:18:50 2021 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Jan 6 13:18:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f424ce7
app-misc/sphinx: drop x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r1.ebuild | 4 ++--
app-misc/sphinx/sphinx-2.2.11-r2.ebuild | 4 ++--
app-misc/sphinx/sphinx-2.2.11.ebuild| 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index 5f45a59d12a..c19dc6ab4ee 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
index 459f921dc69..70c69baef6f 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild
b/app-misc/sphinx/sphinx-2.2.11.ebuild
index 3889473b157..59e47ea3505 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
RDEPEND="mysql? ( virtual/mysql )
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: a95f112eedd25b778f3eb9b9352009c488869f67
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Apr 5 09:09:04 2020 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Apr 5 09:09:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a95f112e
app-misc/sphinx: cleanup
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Hans de Graaff gentoo.org>
app-misc/sphinx/Manifest| 1 -
app-misc/sphinx/sphinx-2.1.9.ebuild | 93 -
2 files changed, 94 deletions(-)
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 311a7412d3d..85d38a93331 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,2 +1 @@
-DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B
d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8
SHA512
7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B
63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668
SHA512
cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild
b/app-misc/sphinx/sphinx-2.1.9.ebuild
deleted file mode 100644
index abc69c2f350..000
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.15
-
-inherit eutils autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-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;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux
~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- odbc? ( dev-db/unixODBC )
- stemmer? ( dev-libs/snowball-stemmer )
- xml? ( dev-libs/expat )
- virtual/libiconv"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
- # drop nasty hardcoded search path breaking Prefix
- # We patch configure directly since otherwise we need to run
- # eautoreconf twice and that causes problems, bug 425380
- sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
-
- # Fix QA compilation warnings.
- sed -i -e '19i#include ' api/libsphinxclient/test.c || die
-
- pushd api/libsphinxclient || die
- eautoreconf
- popd || die
-}
-
-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) \
- $(use_with syslog syslog) \
- $(use_with xml libexpat )
-
- cd api/libsphinxclient || die
- econf STRIP=:
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-
- emake -j 1 -C api/libsphinxclient
-}
-
-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
- emake DESTDIR="${D}" -C api/libsphinxclient install
-
- dodoc doc/*
-
- dodir /var/lib/sphinx
- dodir /var/log/sphinx
-
- newinitd "${FILESDIR}"/searchd.rc searchd
-
- if use test; then
- insinto /usr/share/${PN}
- doins -r test
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 077b497aac5fbac95896a329bcac929bbafea43e
Author: Matt Turner gentoo org>
AuthorDate: Mon Mar 16 06:25:59 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Mar 16 06:30:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077b497a
app-misc/sphinx: Drop alpha keywords
Signed-off-by: Matt Turner gentoo.org>
app-misc/sphinx/sphinx-2.1.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild
b/app-misc/sphinx/sphinx-2.1.9.ebuild
index 843e49c094e..abc69c2f350 100644
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux
~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 0c5dc98abd6c366045b4688a830369c1aec82d7c
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Thu Jan 24 20:52:26 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Jan 24 21:35:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5dc98a
app-misc/sphinx: keyworded 2.2.11-r2 for hppa, bug #563932
Signed-off-by: Rolf Eike Beer sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
index ed278ee1e82..7bbac2622e5 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 59d71e2c5d1c835eda84c1647a52687dec3f38b6
Author: Hans de Graaff gentoo org>
AuthorDate: Mon Jan 21 19:20:08 2019 +
Commit: Hans de Graaff gentoo org>
CommitDate: Mon Jan 21 19:20:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d71e2c
app-misc/sphinx: link against libre2 shared library
Explicitly provide the shared object to link against, since the build
system defaults to a static library and can't use normal linker
commands.
Fixes: https://bugs.gentoo.org/674308
Signed-off-by: Hans de Graaff gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-misc/sphinx/sphinx-2.2.11-r2.ebuild | 112
1 file changed, 112 insertions(+)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
new file mode 100644
index 000..ed278ee1e82
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.15
+
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+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;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
+
+REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
+
+RDEPEND="
+ mysql? ( dev-db/mysql-connector-c )
+ mariadb? ( dev-db/mariadb-connector-c )
+ postgres? ( dev-db/postgresql:* )
+ odbc? ( dev-db/unixODBC )
+ re2? ( dev-libs/re2 )
+ stemmer? ( dev-libs/snowball-stemmer )
+ xml? ( dev-libs/expat )
+ virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+ # drop nasty hardcoded search path breaking Prefix
+ # We patch configure directly since otherwise we need to run
+ # eautoreconf twice and that causes problems, bug 425380
+ sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
+
+ if use mariadb ; then
+ sed -i -e 's/mysql_config/mariadb_config/g' configure || die
+ fi
+
+ # Fix QA compilation warnings.
+ sed -i -e '19i#include ' api/libsphinxclient/test.c || die
+
+ eapply_user
+
+ pushd api/libsphinxclient || die
+ eautoreconf
+ popd || die
+
+ # Drop bundled code to ensure building against system versions. We
+ # cannot remove libstemmer_c since configure updates its Makefile.
+ rm -rf libexpat libre2 || die
+}
+
+src_configure() {
+ # fix libiconv detection
+ use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+ local mysql_with
+ if use mysql || use mariadb ; then
+ mysql_with="--with-mysql"
+ else
+ mysql_with="--without-mysql"
+ fi
+
+ econf \
+ --sysconfdir="${EPREFIX}/etc/${PN}" \
+ $(use_enable id64) \
+ $(use_with debug) \
+ ${mysql_with} \
+ $(use_with odbc unixodbc) \
+ $(use_with postgres pgsql) \
+ $(use_with re2) \
+ --with-re2-libs="${EPREFIX}/usr/$(get_libdir)/libre2.so" \
+ $(use_with stemmer libstemmer) \
+ $(use_with syslog syslog) \
+ $(use_with xml libexpat )
+
+ cd api/libsphinxclient || die
+ econf STRIP=:
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)" || die "emake failed"
+
+ emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+ # Tests require a live database and only work from the source
+ # directory.
+ :
+}
+
+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
+
+ newinitd "${FILESDIR}"/searchd.rc searchd
+}
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: ac782be48a30183d4d5e688937ddd9e548ef6431
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Jan 4 22:34:29 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Jan 4 22:41:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac782be4
app-misc/sphinx: Add ~s390 keyword wrt bug #563932
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-misc/sphinx/sphinx-2.2.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index b47e54a11ef..b3133ba92eb 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: ffc618208380a0bc13a96c550538305095ab1b91
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Jan 1 21:18:38 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Jan 1 21:18:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc61820
app-misc/sphinx: keyworded 2.2.11-r1 for sparc, bug #563932
Package-Manager: Portage-2.3.53, Repoman-2.3.12
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index 10d20cfd5fc..b47e54a11ef 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: e41e876d0d5fc2a3854cd73a90f97d395779df16
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Dec 26 20:05:51 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Dec 26 20:05:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41e876d
app-misc/sphinx: keyworded 2.2.11-r1 for ppc, bug #563932
Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index f5084f42c7f..10d20cfd5fc 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos
~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 531c5df8f860bf558f71053c5e1ea42d41c39c74
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Dec 26 20:03:26 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Dec 26 20:03:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531c5df8
app-misc/sphinx: keyworded 2.2.11-r1 for ppc64, bug #563932
Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index be43bca111b..f5084f42c7f 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos
~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 57a68f9b63701b5f552bf8641fcdb230f7eed0d3
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Dec 26 13:14:41 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Dec 26 13:14:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a68f9b
app-misc/sphinx: keyworded 2.2.11 for ia64, bug #563932
Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich gentoo.org>
app-misc/sphinx/sphinx-2.2.11.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild
b/app-misc/sphinx/sphinx-2.2.11.ebuild
index 7e54f96302d..c49c70b819b 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
RDEPEND="mysql? ( virtual/mysql )
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 13dba1178964f3143df26d5cc8802cb0c6b97275
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Dec 26 13:15:20 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Dec 26 13:15:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13dba117
app-misc/sphinx: keyworded 2.2.11-r1 for ia64, bug #563932
Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich gentoo.org>
app-misc/sphinx/sphinx-2.2.11-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index 32f06578cd7..be43bca111b 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 9221190bb5a3bd25e72facd428384abf98e9cf9f
Author: Hans de Graaff gentoo org>
AuthorDate: Fri Jul 27 04:25:57 2018 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri Jul 27 05:22:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9221190b
app-misc/sphinx: cleanup
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-misc/sphinx/Manifest | 2 -
app-misc/sphinx/sphinx-2.0.10.ebuild | 103 ---
2 files changed, 105 deletions(-)
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 2e5519e7a36..311a7412d3d 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,4 +1,2 @@
-DIST libstemmer_c-20091122.tgz 129207 BLAKE2B
8ebf49f4d2b7dd5d0e56e5a032f16e807cc7c400b4c4a0e73601ace17908b441789ceca87c0258c17b4201b43751df5fad890fecc3a1aaeba60f83c80beecf32
SHA512
d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d
-DIST sphinx-2.0.10-release.tar.gz 2016687 BLAKE2B
176a14c2e1ecc859f5499eab2b2ee9cb9047ec6d07b407c0dbd3a405a9ca6198e1480166a245f7f523e3c3555bf8fe7ad7f0733bce5371f1b35ce6894dfafa6c
SHA512
d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B
d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8
SHA512
7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B
63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668
SHA512
cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
diff --git a/app-misc/sphinx/sphinx-2.0.10.ebuild
b/app-misc/sphinx/sphinx-2.0.10.ebuild
deleted file mode 100644
index b33e16db846..000
--- a/app-misc/sphinx/sphinx-2.0.10.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.15
-
-inherit eutils autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-# 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="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc 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:* )
- 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
- # We patch configure directly since otherwise we need to run
- # eautoreconf twice and that causes problems, bug 425380
- sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
-
- # Fix QA compilation warnings.
- sed -i -e '19i#include ' api/libsphinxclient/test.c || die
-
- pushd api/libsphinxclient || die
- eautoreconf
- popd || die
-}
-
-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 AR="$(tc-getAR)" || 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
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 02951365a6fbefd3f05f64a8929c1588ff15d0e2
Author: Hans de Graaff gentoo org>
AuthorDate: Fri Jul 27 05:06:02 2018 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri Jul 27 05:22:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02951365
app-misc/sphinx: add mariadb USE flag
Update mysql dependency to use mysql-connector-c and add USE flag for
mariadb to use mariadb-connector-c. These options are mutually
exclusive.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-misc/sphinx/metadata.xml| 1 +
app-misc/sphinx/sphinx-2.2.11-r1.ebuild | 111
2 files changed, 112 insertions(+)
diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml
index 80a8842e3c9..397dd2466c7 100644
--- a/app-misc/sphinx/metadata.xml
+++ b/app-misc/sphinx/metadata.xml
@@ -6,6 +6,7 @@
use 64-bit document and word IDs
+ Add mariadb database support
use the dev-libs/re2 regular expression
library
Enable language stemming support
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
new file mode 100644
index 000..32f06578cd7
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.15
+
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+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;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
+
+REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
+
+RDEPEND="
+ mysql? ( dev-db/mysql-connector-c )
+ mariadb? ( dev-db/mariadb-connector-c )
+ postgres? ( dev-db/postgresql:* )
+ odbc? ( dev-db/unixODBC )
+ re2? ( dev-libs/re2 )
+ stemmer? ( dev-libs/snowball-stemmer )
+ xml? ( dev-libs/expat )
+ virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+ # drop nasty hardcoded search path breaking Prefix
+ # We patch configure directly since otherwise we need to run
+ # eautoreconf twice and that causes problems, bug 425380
+ sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
+
+ if use mariadb ; then
+ sed -i -e 's/mysql_config/mariadb_config/g' configure || die
+ fi
+
+ # Fix QA compilation warnings.
+ sed -i -e '19i#include ' api/libsphinxclient/test.c || die
+
+ eapply_user
+
+ pushd api/libsphinxclient || die
+ eautoreconf
+ popd || die
+
+ # Drop bundled code to ensure building against system versions. We
+ # cannot remove libstemmer_c since configure updates its Makefile.
+ rm -rf libexpat libre2 || die
+}
+
+src_configure() {
+ # fix libiconv detection
+ use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+ local mysql_with
+ if use mysql || use mariadb ; then
+ mysql_with="--with-mysql"
+ else
+ mysql_with="--without-mysql"
+ fi
+
+ econf \
+ --sysconfdir="${EPREFIX}/etc/${PN}" \
+ $(use_enable id64) \
+ $(use_with debug) \
+ ${mysql_with} \
+ $(use_with odbc unixodbc) \
+ $(use_with postgres pgsql) \
+ $(use_with re2) \
+ $(use_with stemmer libstemmer) \
+ $(use_with syslog syslog) \
+ $(use_with xml libexpat )
+
+ cd api/libsphinxclient || die
+ econf STRIP=:
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)" || die "emake failed"
+
+ emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+ # Tests require a live database and only work from the source
+ # directory.
+ :
+}
+
+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
+
+ newinitd "${FILESDIR}"/searchd.rc searchd
+}
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: bc6de71891150ada4e067fe6d642b0bc9a240be3
Author: Hans de Graaff gentoo org>
AuthorDate: Fri Jul 20 18:30:31 2018 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri Jul 20 18:32:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6de718
app-misc/sphinx: account for automake incompatibility
The build system is not compatible with automake 1.16.
Closes: https://bugs.gentoo.org/649120
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-misc/sphinx/sphinx-2.0.10.ebuild | 5 -
app-misc/sphinx/sphinx-2.1.9.ebuild | 5 -
app-misc/sphinx/sphinx-2.2.11.ebuild | 5 -
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.0.10.ebuild
b/app-misc/sphinx/sphinx-2.0.10.ebuild
index 8e0c6d4c856..b33e16db846 100644
--- a/app-misc/sphinx/sphinx-2.0.10.ebuild
+++ b/app-misc/sphinx/sphinx-2.0.10.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
+
+WANT_AUTOMAKE=1.15
+
inherit eutils autotools toolchain-funcs
#MY_P=${P/_/-}
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild
b/app-misc/sphinx/sphinx-2.1.9.ebuild
index 54eaa42baca..bf55eea2001 100644
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
+
+WANT_AUTOMAKE=1.15
+
inherit eutils autotools toolchain-funcs
#MY_P=${P/_/-}
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild
b/app-misc/sphinx/sphinx-2.2.11.ebuild
index 4284f2a9dab..7e54f96302d 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
+
+WANT_AUTOMAKE=1.15
+
inherit eutils autotools toolchain-funcs
#MY_P=${P/_/-}
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 9db658b87d8307581fd7d497b1a5e6da96fdbd3b
Author: David Seifert gentoo org>
AuthorDate: Sun Dec 10 14:11:54 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Dec 10 14:16:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db658b8
app-misc/sphinx: [QA] Fix dependency.missingslot
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-misc/sphinx/sphinx-2.0.10.ebuild | 4 ++--
app-misc/sphinx/sphinx-2.1.9.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.0.10.ebuild
b/app-misc/sphinx/sphinx-2.0.10.ebuild
index 1c327f6552d..8e0c6d4c856 100644
--- a/app-misc/sphinx/sphinx-2.0.10.ebuild
+++ b/app-misc/sphinx/sphinx-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,7 +22,7 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390
~sparc x86 ~amd64-linu
IUSE="debug id64 mysql odbc postgres stemmer test"
RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
+ postgres? ( dev-db/postgresql:* )
odbc? ( dev-db/unixODBC )
virtual/libiconv"
DEPEND="${RDEPEND}
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild
b/app-misc/sphinx/sphinx-2.1.9.ebuild
index b34fbf799e5..54eaa42baca 100644
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390
~sparc x86 ~amd64-linu
IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
+ postgres? ( dev-db/postgresql:* )
odbc? ( dev-db/unixODBC )
stemmer? ( dev-libs/snowball-stemmer )
xml? ( dev-libs/expat )
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 31979e96110a5ea83ddaa0e7572b271dbe6df788
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Oct 22 07:16:18 2017 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Oct 22 07:16:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31979e96
app-misc/sphinx: cleanup
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-misc/sphinx/Manifest| 1 -
app-misc/sphinx/sphinx-0.9.9.ebuild | 70 -
2 files changed, 71 deletions(-)
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 4ae0ec8b0bc..cff6015fc6e 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,5 +1,4 @@
DIST libstemmer_c-20091122.tgz 129207 SHA256
ad4e152379214480d599c86dd19421a36fce78cedd20fc324520c5bba0a512e7 SHA512
d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d
WHIRLPOOL
03baf5de80854a2726990d1f79e17a46342b0d8431a564805d78878bba1eba0c1aba6f4f53c64eb1a1946b50053632c32c9106305f0a53623068531f2b67b5c4
-DIST sphinx-0.9.9.tar.gz 1218359 SHA256
bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4 SHA512
bf1f6b3429beac9336ed975137b9cc582541357df487ae97f407589458fa4cc4f3a797c868fd505c6b4e97a73b30a0f7f9c7ab6b3d8685ba173fde6d1d5383c2
WHIRLPOOL
70a7db079e35671c17f1c29d71569c4b643462475b10dbed6342a74ed20304ea740e442fb97af874fb3acc3cb9eb8a07ff43aa90dc90c9cf477fb1d651ced021
DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256
efc9e90d1edec4f159846c8d4ca8839e7dcf9ef88c117d0d369aaead75809f0a SHA512
d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
WHIRLPOOL
46e17cc73225692e8ab73438547863ba78ef7c1be306bd46e393723220007b95d9a0ca62cbd8175423b62bf4599a68c4a4831ac6472d02249104ecdf0e3892ac
DIST sphinx-2.1.9-release.tar.gz 2443797 SHA256
6289aa0ac3e1456a0c9181ce6bce2287778b5a163f685a1376e181fc87eb7c03 SHA512
7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
WHIRLPOOL
fd9e6d31c8b9d88b8de7462ccd947aeb85d97ee4c23c64788653f732a5e47dad134c0f8cedc3b0ccc2d744eb0c4aaeb2d32fbdb02bae50be0d4ed8841a0683a1
DIST sphinx-2.2.11-release.tar.gz 3061998 SHA256
6662039f093314f896950519fa781bc87610f926f64b3d349229002f06ac41a9 SHA512
cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
WHIRLPOOL
34e4aeb41f1b8e352404792cb18149542e624fd739b5d11bee688f49c8be5067553414e9bf57b4352408ce3a6ffb16ece843af8bcf3625a75813a6adaf231e62
diff --git a/app-misc/sphinx/sphinx-0.9.9.ebuild
b/app-misc/sphinx/sphinx-0.9.9.ebuild
deleted file mode 100644
index 462fd872352..000
--- a/app-misc/sphinx/sphinx-0.9.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils autotools
-
-WANT_AUTOMAKE="1.11"
-
-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 )"
-DEPEND="${RDEPEND}
- test? ( dev-lang/php )"
-
-# Tests require a live database.
-RESTRICT="test"
-
-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_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
-}
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 2aa0b7233c2ddb8526e4d8929dee003a50309e9a
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Dec 21 22:17:30 2016 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Dec 21 22:54:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa0b723
app-misc/sphinx: x86 stable (bug #591276)
Package-Manager: Portage-2.3.2, Repoman-2.3.1
app-misc/sphinx/sphinx-2.2.11.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild
b/app-misc/sphinx/sphinx-2.2.11.ebuild
index 90da540..339d600 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
RDEPEND="mysql? ( virtual/mysql )
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: cd871dfecb683a8d34fa4a8db8733b7d42aa7dbd
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Sep 24 13:40:19 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Sep 24 13:40:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd871dfe
app-misc/sphinx: amd64 stable wrt bug #591276
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-misc/sphinx/sphinx-2.2.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild
b/app-misc/sphinx/sphinx-2.2.11.ebuild
index 10144bb..90da540 100644
--- a/app-misc/sphinx/sphinx-2.2.11.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
RDEPEND="mysql? ( virtual/mysql )
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 3ce90092e8a2228b9f0d5a01add5c18a57e088a0
Author: Hans de Graaff gentoo org>
AuthorDate: Mon Sep 5 17:44:48 2016 +
Commit: Hans de Graaff gentoo org>
CommitDate: Mon Sep 5 17:44:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce90092
app-misc/sphinx: cleanup
Package-Manager: portage-2.2.28
app-misc/sphinx/Manifest | 1 -
app-misc/sphinx/sphinx-2.2.10.ebuild | 92
2 files changed, 93 deletions(-)
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index d66ba1d..4ae0ec8 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -2,5 +2,4 @@ DIST libstemmer_c-20091122.tgz 129207 SHA256
ad4e152379214480d599c86dd19421a36fc
DIST sphinx-0.9.9.tar.gz 1218359 SHA256
bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4 SHA512
bf1f6b3429beac9336ed975137b9cc582541357df487ae97f407589458fa4cc4f3a797c868fd505c6b4e97a73b30a0f7f9c7ab6b3d8685ba173fde6d1d5383c2
WHIRLPOOL
70a7db079e35671c17f1c29d71569c4b643462475b10dbed6342a74ed20304ea740e442fb97af874fb3acc3cb9eb8a07ff43aa90dc90c9cf477fb1d651ced021
DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256
efc9e90d1edec4f159846c8d4ca8839e7dcf9ef88c117d0d369aaead75809f0a SHA512
d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
WHIRLPOOL
46e17cc73225692e8ab73438547863ba78ef7c1be306bd46e393723220007b95d9a0ca62cbd8175423b62bf4599a68c4a4831ac6472d02249104ecdf0e3892ac
DIST sphinx-2.1.9-release.tar.gz 2443797 SHA256
6289aa0ac3e1456a0c9181ce6bce2287778b5a163f685a1376e181fc87eb7c03 SHA512
7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
WHIRLPOOL
fd9e6d31c8b9d88b8de7462ccd947aeb85d97ee4c23c64788653f732a5e47dad134c0f8cedc3b0ccc2d744eb0c4aaeb2d32fbdb02bae50be0d4ed8841a0683a1
-DIST sphinx-2.2.10-release.tar.gz 3109250 SHA256
054cb86e64bd48997d89386e1224d4405063d9857b2d7c33dc6cc1b9ef6df440 SHA512
07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
WHIRLPOOL
b98f7c99d09d10cb4f3656da72acb6c986fe674ecb00347e69a979617253dcf3189aa7507fcabe3d932f6f5f1003b781f6d29bf8d94e777f54ec2588a14855ef
DIST sphinx-2.2.11-release.tar.gz 3061998 SHA256
6662039f093314f896950519fa781bc87610f926f64b3d349229002f06ac41a9 SHA512
cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
WHIRLPOOL
34e4aeb41f1b8e352404792cb18149542e624fd739b5d11bee688f49c8be5067553414e9bf57b4352408ce3a6ffb16ece843af8bcf3625a75813a6adaf231e62
diff --git a/app-misc/sphinx/sphinx-2.2.10.ebuild
b/app-misc/sphinx/sphinx-2.2.10.ebuild
deleted file mode 100644
index 10144bb..
--- a/app-misc/sphinx/sphinx-2.2.10.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-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;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
-IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
-
-RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- odbc? ( dev-db/unixODBC )
- re2? ( dev-libs/re2 )
- stemmer? ( dev-libs/snowball-stemmer )
- xml? ( dev-libs/expat )
- virtual/libiconv"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
- # drop nasty hardcoded search path breaking Prefix
- # We patch configure directly since otherwise we need to run
- # eautoreconf twice and that causes problems, bug 425380
- sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
-
- # Fix QA compilation warnings.
- sed -i -e '19i#include ' api/libsphinxclient/test.c || die
-
- pushd api/libsphinxclient || die
- eautoreconf
- popd || die
-
- # Drop bundled code to ensure building against system versions. We
- # cannot remove libstemmer_c since configure updates its Makefile.
- rm -rf libexpat libre2 || die
-}
-
-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 re2) \
- $(use_with stemmer
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/files/
commit: 29e66f501f0379affccb570892fba8bf251cb215
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Fri Jul 8 13:15:06 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Aug 11 08:07:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e66f50
app-misc/sphinx: remove unused patch
Signed-off-by: Patrice Clement gentoo.org>
.../sphinx/files/sphinx-1.10_beta-darwin8.patch| 23 --
.../sphinx-1.10_beta-libsphinxclient-darwin.patch | 22 --
.../sphinx/files/sphinx-1.10_beta-nosigpipe.patch | 26
.../sphinx/files/sphinx-2.0.1_beta-solaris.patch | 35 --
app-misc/sphinx/files/sphinx-2.0.4_gcc-4.7.patch | 29 --
5 files changed, 135 deletions(-)
diff --git a/app-misc/sphinx/files/sphinx-1.10_beta-darwin8.patch
b/app-misc/sphinx/files/sphinx-1.10_beta-darwin8.patch
deleted file mode 100644
index 73ddd55..000
--- a/app-misc/sphinx/files/sphinx-1.10_beta-darwin8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Darwin8 has no backtrace functionalities yet
-
src/searchd.cpp
-+++ src/searchd.cpp
-@@ -1291,6 +1291,10 @@
- __asm __volatile__ ( "movq
%%rbp,%0":"=r"(pFramePointer):"r"(pFramePointer) );
- #endif
-
-+#ifndef SIGRETURN_FRAME_OFFSET
-+ sphLogFatal ( "Cannot get stack frame pointer on this architecture" );
-+#else
-+
- if ( !pFramePointer )
- {
- sphLogFatal ( "Frame pointer is null. Unable to backtrace the
stack. Did you build the searchd with -fomit-frame-pointer?" );
-@@ -1329,6 +1333,7 @@
- if ( !bOk )
- sphWarning ( "Something wrong in frame pointers. BackTrace
failed (failed FP was %p)", pNewFP );
- else
-+#endif
- #endif // !HAVE_BACKTRACE
- sphInfo ( "Stack trace seems to be succesfull. Now you have to
resolve the numbers above and attach resolved values to the bugreport. See the
section about resolving in the documentation" );
-
diff --git
a/app-misc/sphinx/files/sphinx-1.10_beta-libsphinxclient-darwin.patch
b/app-misc/sphinx/files/sphinx-1.10_beta-libsphinxclient-darwin.patch
deleted file mode 100644
index 594b735..000
--- a/app-misc/sphinx/files/sphinx-1.10_beta-libsphinxclient-darwin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-On Darwin, the linker doesn't like it when vsnprintf is prefixed by an
-underscore. This obviously is an error, since it's only necessary for
-Windows. Add an extra guard, such that vsnprintf is left alone.
-
api/libsphinxclient/sphinxclient.c
-+++ api/libsphinxclient/sphinxclient.c
-@@ -13,6 +13,7 @@
- // did not, you can find it at http://www.gnu.org/
- //
-
-+#if defined(_MSC_VER)
- #if _MSC_VER>=1400
- // VS 2005 and above
- #define _CRT_SECURE_NO_DEPRECATE 1
-@@ -21,6 +22,7 @@
- // VS 2003 and below
- #define vsnprintf _vsnprintf
- #endif
-+#endif
-
- #include
- #include
diff --git a/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch
b/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch
deleted file mode 100644
index a713a89..000
--- a/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Part of upstream fix:
-http://code.google.com/p/sphinxsearch/source/detail?r=2423
-
api/libsphinxclient/sphinxclient.c.~1~ 2010-07-15 13:05:40.0
+0200
-+++ api/libsphinxclient/sphinxclient.c 2010-11-09 19:55:28.964939046 +0100
-@@ -1268,7 +1268,11 @@
- static sphinx_bool net_write ( int fd, const char * bytes, int len,
sphinx_client * client )
- {
- int res;
-+#if defined(_WIN32) || defined(SO_NOSIGPIPE)
- res = send ( fd, bytes, len, 0 );
-+#else
-+ res = send ( fd, bytes, len, MSG_NOSIGNAL );
-+#endif
-
- if ( res<0 )
- {
-@@ -1354,7 +1358,7 @@
- }
-
- optval = 1;
--#ifndef _WIN32
-+#if defined(SO_NOSIGPIPE)
- if ( setsockopt ( sock, SOL_SOCKET, SO_NOSIGPIPE, (void *),
(socklen_t)sizeof(optval) ) < 0 )
- {
- set_error ( client, "setsockopt() failed: %s", sock_error() );
diff --git a/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch
b/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch
deleted file mode 100644
index 6cc69d2..000
--- a/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-link against required libraries
-include sys/fcntl.h for F_[SG]ET constants
-don't try to use an undefined constant
-
api/libsphinxclient/configure.in
-+++ api/libsphinxclient/configure.in
-@@ -33,6 +33,9 @@
- dnl Checks for header files.
- AC_CHECK_HEADERS(string.h strings.h unistd.h stdint.h)
-
-+AC_CHECK_LIB([nsl], gethostbyname)
-+AC_CHECK_LIB([socket], connect)
-+
- DEFAULT_INSTALL_PREFIX="/usr/local"
-
- AC_ARG_ENABLE(debug,
api/libsphinxclient/sphinxclient.c
-+++ api/libsphinxclient/sphinxclient.c
-@@ -57,6 +57,7 @@
- #include
- #include
- #include
-+ #include
- #endif
-
-
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 88f4dec74745218f25791dac1e609bcda7d29dfe
Author: Hans de Graaff gentoo org>
AuthorDate: Sat Jul 30 05:27:42 2016 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Jul 31 05:52:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f4dec7
app-misc/sphinx: cleanup
Package-Manager: portage-2.2.28
app-misc/sphinx/Manifest| 1 -
app-misc/sphinx/sphinx-2.1.8.ebuild | 90 -
2 files changed, 91 deletions(-)
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 092b4f7..f8eb216 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,6 +1,5 @@
DIST libstemmer_c-20091122.tgz 129207 SHA256
ad4e152379214480d599c86dd19421a36fce78cedd20fc324520c5bba0a512e7 SHA512
d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d
WHIRLPOOL
03baf5de80854a2726990d1f79e17a46342b0d8431a564805d78878bba1eba0c1aba6f4f53c64eb1a1946b50053632c32c9106305f0a53623068531f2b67b5c4
DIST sphinx-0.9.9.tar.gz 1218359 SHA256
bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4 SHA512
bf1f6b3429beac9336ed975137b9cc582541357df487ae97f407589458fa4cc4f3a797c868fd505c6b4e97a73b30a0f7f9c7ab6b3d8685ba173fde6d1d5383c2
WHIRLPOOL
70a7db079e35671c17f1c29d71569c4b643462475b10dbed6342a74ed20304ea740e442fb97af874fb3acc3cb9eb8a07ff43aa90dc90c9cf477fb1d651ced021
DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256
efc9e90d1edec4f159846c8d4ca8839e7dcf9ef88c117d0d369aaead75809f0a SHA512
d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
WHIRLPOOL
46e17cc73225692e8ab73438547863ba78ef7c1be306bd46e393723220007b95d9a0ca62cbd8175423b62bf4599a68c4a4831ac6472d02249104ecdf0e3892ac
-DIST sphinx-2.1.8-release.tar.gz 2442119 SHA256
8aebff8b00ec07b71790a67781c80a9a9b3ee28e2a35b226663aaf37cb78b6db SHA512
e53d62a694c1f89a9614d15a7820f245cdad03d6bc4d512dd3dd743908f11c582f45d5cc0a416d0d05b4cbfaffc491fe40e704c03149774ef498b54519d288cf
WHIRLPOOL
e4bb44920ed536bf6f8dd52fa1c373e9c88fb07a98a7458bd6f39feee2f10323bae13431d26d6340537cc3d2bfde9b4af188cac89b8bf1694aeb3d0842ad71e7
DIST sphinx-2.1.9-release.tar.gz 2443797 SHA256
6289aa0ac3e1456a0c9181ce6bce2287778b5a163f685a1376e181fc87eb7c03 SHA512
7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
WHIRLPOOL
fd9e6d31c8b9d88b8de7462ccd947aeb85d97ee4c23c64788653f732a5e47dad134c0f8cedc3b0ccc2d744eb0c4aaeb2d32fbdb02bae50be0d4ed8841a0683a1
DIST sphinx-2.2.10-release.tar.gz 3109250 SHA256
054cb86e64bd48997d89386e1224d4405063d9857b2d7c33dc6cc1b9ef6df440 SHA512
07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
WHIRLPOOL
b98f7c99d09d10cb4f3656da72acb6c986fe674ecb00347e69a979617253dcf3189aa7507fcabe3d932f6f5f1003b781f6d29bf8d94e777f54ec2588a14855ef
diff --git a/app-misc/sphinx/sphinx-2.1.8.ebuild
b/app-misc/sphinx/sphinx-2.1.8.ebuild
deleted file mode 100644
index 9fa5e9f..000
--- a/app-misc/sphinx/sphinx-2.1.8.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils autotools toolchain-funcs
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-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;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
-
-RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
- odbc? ( dev-db/unixODBC )
- stemmer? ( dev-libs/snowball-stemmer )
- xml? ( dev-libs/expat )
- virtual/libiconv"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
- # drop nasty hardcoded search path breaking Prefix
- # We patch configure directly since otherwise we need to run
- # eautoreconf twice and that causes problems, bug 425380
- sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
-
- # Fix QA compilation warnings.
- sed -i -e '19i#include ' api/libsphinxclient/test.c || die
-
- pushd api/libsphinxclient || die
- eautoreconf
- popd || die
-}
-
-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) \
-
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: c5e7155d926bb6b5dc722ac6b842f278fa418a53
Author: Hans de Graaff gentoo org>
AuthorDate: Sat Jul 30 06:59:59 2016 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Jul 31 05:52:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5e7155d
app-misc/sphinx: add 2.2.11
Package-Manager: portage-2.2.28
app-misc/sphinx/Manifest | 1 +
app-misc/sphinx/sphinx-2.2.11.ebuild | 92
2 files changed, 93 insertions(+)
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index f8eb216..d66ba1d 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -3,3 +3,4 @@ DIST sphinx-0.9.9.tar.gz 1218359 SHA256
bf8f55ffc095ff6b628f0cbc7eb5476181114014
DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256
efc9e90d1edec4f159846c8d4ca8839e7dcf9ef88c117d0d369aaead75809f0a SHA512
d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
WHIRLPOOL
46e17cc73225692e8ab73438547863ba78ef7c1be306bd46e393723220007b95d9a0ca62cbd8175423b62bf4599a68c4a4831ac6472d02249104ecdf0e3892ac
DIST sphinx-2.1.9-release.tar.gz 2443797 SHA256
6289aa0ac3e1456a0c9181ce6bce2287778b5a163f685a1376e181fc87eb7c03 SHA512
7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
WHIRLPOOL
fd9e6d31c8b9d88b8de7462ccd947aeb85d97ee4c23c64788653f732a5e47dad134c0f8cedc3b0ccc2d744eb0c4aaeb2d32fbdb02bae50be0d4ed8841a0683a1
DIST sphinx-2.2.10-release.tar.gz 3109250 SHA256
054cb86e64bd48997d89386e1224d4405063d9857b2d7c33dc6cc1b9ef6df440 SHA512
07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
WHIRLPOOL
b98f7c99d09d10cb4f3656da72acb6c986fe674ecb00347e69a979617253dcf3189aa7507fcabe3d932f6f5f1003b781f6d29bf8d94e777f54ec2588a14855ef
+DIST sphinx-2.2.11-release.tar.gz 3061998 SHA256
6662039f093314f896950519fa781bc87610f926f64b3d349229002f06ac41a9 SHA512
cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
WHIRLPOOL
34e4aeb41f1b8e352404792cb18149542e624fd739b5d11bee688f49c8be5067553414e9bf57b4352408ce3a6ffb16ece843af8bcf3625a75813a6adaf231e62
diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild
b/app-misc/sphinx/sphinx-2.2.11.ebuild
new file mode 100644
index 000..10144bb
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+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;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
+
+RDEPEND="mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ odbc? ( dev-db/unixODBC )
+ re2? ( dev-libs/re2 )
+ stemmer? ( dev-libs/snowball-stemmer )
+ xml? ( dev-libs/expat )
+ virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+ # drop nasty hardcoded search path breaking Prefix
+ # We patch configure directly since otherwise we need to run
+ # eautoreconf twice and that causes problems, bug 425380
+ sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
+
+ # Fix QA compilation warnings.
+ sed -i -e '19i#include ' api/libsphinxclient/test.c || die
+
+ pushd api/libsphinxclient || die
+ eautoreconf
+ popd || die
+
+ # Drop bundled code to ensure building against system versions. We
+ # cannot remove libstemmer_c since configure updates its Makefile.
+ rm -rf libexpat libre2 || die
+}
+
+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 re2) \
+ $(use_with stemmer libstemmer) \
+ $(use_with syslog syslog) \
+ $(use_with xml libexpat )
+
+ cd api/libsphinxclient || die
+ econf STRIP=:
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)" || die "emake failed"
+
+ emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+ # Tests require a live database and only
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: b972695086b664a205b83edc12f0634c90fea928
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Apr 6 15:58:54 2016 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Apr 6 16:03:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9726950
app-misc/sphinx: add back Prefix keywords now USE=re2 is masked, bug #563932
Package-Manager: portage-2.2.27
app-misc/sphinx/sphinx-2.2.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.10.ebuild
b/app-misc/sphinx/sphinx-2.2.10.ebuild
index 273dac7..10144bb 100644
--- a/app-misc/sphinx/sphinx-2.2.10.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris"
IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
RDEPEND="mysql? ( virtual/mysql )
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: dece6ac0c36a7ae2b058a63f90e2df5a2eaa4417
Author: Hans de Graaff gentoo org>
AuthorDate: Mon Jan 25 14:05:15 2016 +
Commit: Hans de Graaff gentoo org>
CommitDate: Mon Jan 25 14:05:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dece6ac0
app-misc/sphinx: enable id64 by default
This matches upstream and avoids deprecation messages about using 32bit ids.
Package-Manager: portage-2.2.26
app-misc/sphinx/sphinx-2.2.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.2.10.ebuild
b/app-misc/sphinx/sphinx-2.2.10.ebuild
index 78e154f..273dac7 100644
--- a/app-misc/sphinx/sphinx-2.2.10.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug id64 mysql odbc postgres re2 stemmer syslog xml"
+IUSE="debug +id64 mysql odbc postgres re2 stemmer syslog xml"
RDEPEND="mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql:* )
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 018cbaea715c48366e26ce8c779adb9cbaee6e1f
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Nov 1 13:20:44 2015 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Nov 1 13:20:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=018cbaea
app-misc/sphinx: x86 stable wrt bug #563928
Package-Manager: portage-2.2.20.1
app-misc/sphinx/sphinx-2.1.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild
b/app-misc/sphinx/sphinx-2.1.9.ebuild
index 16a161d..9fa5e9f 100644
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
RDEPEND="mysql? ( virtual/mysql )
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 42663c884c8388c6b0c3cecac6bed2702560be8d
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Oct 27 12:18:10 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Oct 27 12:18:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42663c88
app-misc/sphinx: amd64 stable wrt bug #563928
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
app-misc/sphinx/sphinx-2.1.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild
b/app-misc/sphinx/sphinx-2.1.9.ebuild
index 3f2b330..16a161d 100644
--- a/app-misc/sphinx/sphinx-2.1.9.ebuild
+++ b/app-misc/sphinx/sphinx-2.1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
RDEPEND="mysql? ( virtual/mysql )
[gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
commit: 80a5c0d89285960d2a20bb3be983fd8b8c3b8566
Author: Hans de Graaff gentoo org>
AuthorDate: Sat Oct 24 08:12:04 2015 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sat Oct 24 08:14:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a5c0d8
app-misc/sphinx: add 2.2.10, bug 523240
No longer install tests since that cannot function
outside of the source directory.
Add USE="re2" to enable regular expressions via
dev-libs/re2, bug 523912. Drop keywords due to this,
bug 563932.
Package-Manager: portage-2.2.20.1
app-misc/sphinx/Manifest | 1 +
app-misc/sphinx/metadata.xml | 1 +
app-misc/sphinx/sphinx-2.2.10.ebuild | 92
3 files changed, 94 insertions(+)
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index fe330f8..092b4f7 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -3,3 +3,4 @@ DIST sphinx-0.9.9.tar.gz 1218359 SHA256
bf8f55ffc095ff6b628f0cbc7eb5476181114014
DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256
efc9e90d1edec4f159846c8d4ca8839e7dcf9ef88c117d0d369aaead75809f0a SHA512
d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
WHIRLPOOL
46e17cc73225692e8ab73438547863ba78ef7c1be306bd46e393723220007b95d9a0ca62cbd8175423b62bf4599a68c4a4831ac6472d02249104ecdf0e3892ac
DIST sphinx-2.1.8-release.tar.gz 2442119 SHA256
8aebff8b00ec07b71790a67781c80a9a9b3ee28e2a35b226663aaf37cb78b6db SHA512
e53d62a694c1f89a9614d15a7820f245cdad03d6bc4d512dd3dd743908f11c582f45d5cc0a416d0d05b4cbfaffc491fe40e704c03149774ef498b54519d288cf
WHIRLPOOL
e4bb44920ed536bf6f8dd52fa1c373e9c88fb07a98a7458bd6f39feee2f10323bae13431d26d6340537cc3d2bfde9b4af188cac89b8bf1694aeb3d0842ad71e7
DIST sphinx-2.1.9-release.tar.gz 2443797 SHA256
6289aa0ac3e1456a0c9181ce6bce2287778b5a163f685a1376e181fc87eb7c03 SHA512
7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
WHIRLPOOL
fd9e6d31c8b9d88b8de7462ccd947aeb85d97ee4c23c64788653f732a5e47dad134c0f8cedc3b0ccc2d744eb0c4aaeb2d32fbdb02bae50be0d4ed8841a0683a1
+DIST sphinx-2.2.10-release.tar.gz 3109250 SHA256
054cb86e64bd48997d89386e1224d4405063d9857b2d7c33dc6cc1b9ef6df440 SHA512
07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
WHIRLPOOL
b98f7c99d09d10cb4f3656da72acb6c986fe674ecb00347e69a979617253dcf3189aa7507fcabe3d932f6f5f1003b781f6d29bf8d94e777f54ec2588a14855ef
diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml
index d605858..fc8b152 100644
--- a/app-misc/sphinx/metadata.xml
+++ b/app-misc/sphinx/metadata.xml
@@ -6,6 +6,7 @@
use 64-bit document and word IDs
+ use the dev-libs/re2 regular expression
library
Enable language stemming support
diff --git a/app-misc/sphinx/sphinx-2.2.10.ebuild
b/app-misc/sphinx/sphinx-2.2.10.ebuild
new file mode 100644
index 000..78e154f
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.2.10.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+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;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug id64 mysql odbc postgres re2 stemmer syslog xml"
+
+RDEPEND="mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ odbc? ( dev-db/unixODBC )
+ re2? ( dev-libs/re2 )
+ stemmer? ( dev-libs/snowball-stemmer )
+ xml? ( dev-libs/expat )
+ virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+ # drop nasty hardcoded search path breaking Prefix
+ # We patch configure directly since otherwise we need to run
+ # eautoreconf twice and that causes problems, bug 425380
+ sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure ||
die
+
+ # Fix QA compilation warnings.
+ sed -i -e '19i#include ' api/libsphinxclient/test.c || die
+
+ pushd api/libsphinxclient || die
+ eautoreconf
+ popd || die
+
+ # Drop bundled code to ensure building against system versions. We
+ # cannot remove libstemmer_c since configure updates its Makefile.
+ rm -rf libexpat libre2 || die
+}
+
+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) \
+
