From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CC75D13888F for ; Mon, 12 Oct 2015 13:31:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1815FE07F1; Mon, 12 Oct 2015 13:31:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B3C7E07F1 for ; Mon, 12 Oct 2015 13:31:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CEA533FE13 for ; Mon, 12 Oct 2015 13:31:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C175EC8 for ; Mon, 12 Oct 2015 13:31:29 +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: <1444656681.c0174797bdee5f98ce633ad8cac666b89979bcfe.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.ebuild X-VCS-Directories: net-proxy/squidguard/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: c0174797bdee5f98ce633ad8cac666b89979bcfe X-VCS-Branch: master Date: Mon, 12 Oct 2015 13:31:29 +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: 6eefab86-c3d8-4df9-9f05-a1685b2cbf18 X-Archives-Hash: 71bfdcf5186af9775c258fdcdf561043 commit: c0174797bdee5f98ce633ad8cac666b89979bcfe Author: Sergey Popov gentoo org> AuthorDate: Mon Oct 12 13:31:03 2015 +0000 Commit: Sergey Popov gentoo org> CommitDate: Mon Oct 12 13:31:21 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0174797 net-proxy/squidguard: add subslot operator to sys-libs/db dependency, drop old revision Package-Manager: portage-2.2.22 net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild | 2 +- net-proxy/squidguard/squidguard-1.5_beta.ebuild | 74 ---------------------- 2 files changed, 1 insertion(+), 75 deletions(-) diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild index 917df47..4fbf1b3 100644 --- a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild +++ b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild @@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" IUSE="ldap" -RDEPEND=">=sys-libs/db-2 +RDEPEND=">=sys-libs/db-2:* ldap? ( net-nds/openldap:0 )" DEPEND="${RDEPEND} diff --git a/net-proxy/squidguard/squidguard-1.5_beta.ebuild b/net-proxy/squidguard/squidguard-1.5_beta.ebuild deleted file mode 100644 index 1e6d391..0000000 --- a/net-proxy/squidguard/squidguard-1.5_beta.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -WANT_AUTOMAKE=none - -inherit eutils autotools user - -MY_P="squidGuard-${PV/_/-}" - -DESCRIPTION="Combined filter, redirector and access controller plugin for Squid" -HOMEPAGE="http://www.squidguard.org" -SRC_URI="http://www.squidguard.org/Downloads/Devel/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" - -IUSE="ldap" - -RDEPEND=">=sys-libs/db-2 - ldap? ( net-nds/openldap:0 )" - -DEPEND="${RDEPEND} - sys-devel/bison:0 - sys-devel/flex:0" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup squid - enewuser squid -1 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - - eautoreconf -} - -src_configure() { - econf \ - $(use_with ldap) \ - --with-sg-config=/etc/squidGuard/squidGuard.conf \ - --with-sg-logdir=/var/log/squidGuard -} - -src_install() { - emake prefix="/usr" INSTDIR="${D}" install - - keepdir /var/log/squidGuard - fowners squid:squid /var/log/squidGuard - - insinto /etc/squidGuard/sample - doins "${FILESDIR}"/squidGuard.conf.* - insinto /etc/squidGuard/sample/db - doins "${FILESDIR}"/blockedsites - - dodoc ANNOUNCE CHANGELOG README - dohtml doc/*.html - docinto text - dodoc doc/*.txt -} - -pkg_postinst() { - einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:" - einfo " url_rewrite_program /usr/bin/squidGuard" - einfo " url_rewrite_children 10" - einfo "" - einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!" - einfo "Examples can be found in /etc/squidGuard/sample/" -}