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 032B3139694 for ; Fri, 12 May 2017 09:20:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1DFEE0C58; Fri, 12 May 2017 09:20:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8BF3BE0C58 for ; Fri, 12 May 2017 09:20:54 +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 EC5033416AB for ; Fri, 12 May 2017 09:20:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E2C5744C for ; Fri, 12 May 2017 09:20:51 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1494580846.e5d53d7d4b90920f3b30a88536a4fa65694aca62.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild X-VCS-Directories: net-proxy/squidguard/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: e5d53d7d4b90920f3b30a88536a4fa65694aca62 X-VCS-Branch: master Date: Fri, 12 May 2017 09:20: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: bbcfcb6d-2796-446f-8116-42f28430025c X-Archives-Hash: cf7772fa8f13a8ab453a2c7928807b07 commit: e5d53d7d4b90920f3b30a88536a4fa65694aca62 Author: Sergey Popov gentoo org> AuthorDate: Fri May 12 09:19:24 2017 +0000 Commit: Sergey Popov gentoo org> CommitDate: Fri May 12 09:20:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d53d7d net-proxy/squidguard: revision bump Bump EAPI to 6, restrict linking with unsupported versions of sys-libs/db Committing straight to stable Gentoo-Bug: 528858 Package-Manager: Portage-2.3.5, Repoman-2.3.1 RepoMan-Options: --force ...eta-r1.ebuild => squidguard-1.5_beta-r2.ebuild} | 37 ++++++++++++++++++---- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild b/net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild similarity index 67% rename from net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild rename to net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild index 408711ab997..235a6ac00ed 100644 --- a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild +++ b/net-proxy/squidguard/squidguard-1.5_beta-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 WANT_AUTOMAKE=none -inherit eutils autotools user +inherit autotools db-use eutils user MY_P="squidGuard-${PV/_/-}" @@ -19,7 +19,15 @@ KEYWORDS="amd64 ~arm ppc ppc64 sparc x86" IUSE="ldap" -RDEPEND=">=sys-libs/db-2:* +RDEPEND="|| ( + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 + sys-libs/db:4.4 + sys-libs/db:4.3 + sys-libs/db:4.2 + ) ldap? ( net-nds/openldap:0 )" DEPEND="${RDEPEND} @@ -28,6 +36,17 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" +suitable_db_version() { + local tested_slots="4.8 4.7 4.6 4.5 4.4 4.3 4.2" + for ver in ${tested_slots}; do + if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then + echo ${ver} + return 0 + fi + done + die "No suitable BerkDB versions found, aborting" +} + pkg_setup() { enewgroup squid enewuser squid -1 -1 /var/cache/squid squid @@ -39,13 +58,18 @@ src_prepare() { "${FILESDIR}/${P}-gentoo.patch" \ "${FILESDIR}/${P}-protocol.patch" - epatch_user + # Link only with specific BerkDB versions + db_version="$(suitable_db_version)" + sed -i -e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" configure.ac || die + + eapply_user eautoreconf } src_configure() { econf \ $(use_with ldap) \ + --with-db-inc="$(db_includedir ${db_version})" \ --with-sg-config=/etc/squidGuard/squidGuard.conf \ --with-sg-logdir=/var/log/squidGuard } @@ -62,7 +86,8 @@ src_install() { doins "${FILESDIR}"/blockedsites dodoc ANNOUNCE CHANGELOG README - dohtml doc/*.html + docinto html + dodoc doc/*.html docinto text dodoc doc/*.txt }