[gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/

[Sergey Popov]

commit:     c0174797bdee5f98ce633ad8cac666b89979bcfe
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 13:31:03 2015 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> 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/"
-}