diff options
Diffstat (limited to 'app-misc/sphinx')
| -rw-r--r-- | app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch | 10 | ||||
| -rw-r--r-- | app-misc/sphinx/metadata.xml | 6 | ||||
| -rw-r--r-- | app-misc/sphinx/sphinx-2.2.11-r2.ebuild | 112 | ||||
| -rw-r--r-- | app-misc/sphinx/sphinx-2.2.11-r5.ebuild (renamed from app-misc/sphinx/sphinx-2.2.11-r1.ebuild) | 43 | ||||
| -rw-r--r-- | app-misc/sphinx/sphinx-2.2.11.ebuild | 94 |
5 files changed, 39 insertions, 226 deletions
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 000000000000..da556ef2ef64 --- /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/metadata.xml b/app-misc/sphinx/metadata.xml index 397dd2466c73..f0cbdf298a59 100644 --- a/app-misc/sphinx/metadata.xml +++ b/app-misc/sphinx/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>graaff@gentoo.org</email> @@ -7,7 +7,9 @@ <use> <flag name="id64">use 64-bit document and word IDs</flag> <flag name="mariadb">Add mariadb database support</flag> - <flag name="re2">use the <pkg>dev-libs/re2</pkg> regular expression library</flag> <flag name="stemmer">Enable language stemming support</flag> </use> +<upstream> + <remote-id type="github">sphinxsearch/sphinx</remote-id> +</upstream> </pkgmetadata> diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild deleted file mode 100644 index 4275fa3b36bc..000000000000 --- a/app-misc/sphinx/sphinx-2.2.11-r2.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 <string.h>' 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 -} diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild index ae063ea14f8f..cd7ae1b4fc4a 100644 --- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild +++ b/app-misc/sphinx/sphinx-2.2.11-r5.ebuild @@ -1,40 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -WANT_AUTOMAKE=1.15 - -inherit epatch autotools toolchain-funcs +inherit autotools flag-o-matic 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" +HOMEPAGE="https://sphinxsearch.com/" +SRC_URI="https://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" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos" +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 ) - re2? ( dev-libs/re2 ) - stemmer? ( dev-libs/snowball-stemmer ) + 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 + 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 @@ -56,10 +54,17 @@ src_prepare() { # Drop bundled code to ensure building against system versions. We # cannot remove libstemmer_c since configure updates its Makefile. - rm -rf libexpat libre2 || die + rm -rf libexpat || die } 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 + # fix libiconv detection use !elibc_glibc && export ac_cv_search_iconv=-liconv @@ -77,7 +82,6 @@ src_configure() { ${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 ) @@ -102,10 +106,13 @@ 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/* - dodir /var/lib/sphinx - dodir /var/log/sphinx + keepdir /var/lib/sphinx + keepdir /var/log/sphinx newinitd "${FILESDIR}"/searchd.rc searchd } 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 7b6c533c457e..000000000000 --- 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 <string.h>' 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 -} |