From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BCA03138334 for ; Fri, 27 Jul 2018 05:22:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A7C8E0872; Fri, 27 Jul 2018 05:22:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E17BEE0872 for ; Fri, 27 Jul 2018 05:22:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A22A335CD0 for ; Fri, 27 Jul 2018 05:22:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B9AD37D for ; Fri, 27 Jul 2018 05:22:51 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1532668956.02951365a6fbefd3f05f64a8929c1588ff15d0e2.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/sphinx/metadata.xml app-misc/sphinx/sphinx-2.2.11-r1.ebuild X-VCS-Directories: app-misc/sphinx/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 02951365a6fbefd3f05f64a8929c1588ff15d0e2 X-VCS-Branch: master Date: Fri, 27 Jul 2018 05:22:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa49b458-69d9-4651-a332-cdb284c67876 X-Archives-Hash: df150ce0bd19dc47e4cb01d3c579e40a commit: 02951365a6fbefd3f05f64a8929c1588ff15d0e2 Author: Hans de Graaff gentoo org> AuthorDate: Fri Jul 27 05:06:02 2018 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Fri Jul 27 05:22:36 2018 +0000 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 00000000000..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 +}