net-proxy/squid: migrate to acct user/group

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>

diff --git a/net-proxy/squid/squid-4.10.ebuild b/net-proxy/squid/squid-4.10.ebuild
index 90f46fc0095b39218052143f50eff974cb359884..a738f7035bc7b3ab362057c60e52e2cc433169cf 100644 (file)
--- a/net-proxy/squid/squid-4.10.ebuild
+++ b/net-proxy/squid/squid-4.10.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 WANT_AUTOMAKE="1.15"
 
-inherit autotools linux-info pam toolchain-funcs user
+inherit autotools linux-info pam toolchain-funcs
 
 DESCRIPTION="A full-featured web proxy cache"
 HOMEPAGE="http://www.squid-cache.org/"
@@ -30,17 +30,20 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux
        +htcp +wccp +wccpv2 \
        pf-transparent ipf-transparent kqueue \
        elibc_uclibc kernel_linux"
+
 RESTRICT="!test? ( test )"
 
 BDEPEND="dev-lang/perl"
 
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+COMMON_DEPEND="acct-group/squid
+       acct-user/squid
+       caps? ( >=sys-libs/libcap-2.16 )
        pam? ( sys-libs/pam )
        ldap? ( net-nds/openldap )
        kerberos? ( virtual/krb5 )
        qos? ( net-libs/libnetfilter_conntrack )
        ssl? (
-               !gnutls? ( dev-libs/openssl:0 ) 
+               !gnutls? ( dev-libs/openssl:0 )
                dev-libs/nettle:= )
        sasl? ( dev-libs/cyrus-sasl )
        ecap? ( net-libs/libecap:1 )
@@ -49,10 +52,12 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
        logrotate? ( app-admin/logrotate )
        >=sys-libs/db-4:*
        dev-libs/libltdl:0"
+
 DEPEND="${COMMON_DEPEND}
        ${BDEPEND}
        ecap? ( virtual/pkgconfig )
        test? ( dev-util/cppunit )"
+
 RDEPEND="${COMMON_DEPEND}
        samba? ( net-fs/samba )
        perl? ( dev-lang/perl )
@@ -71,11 +76,6 @@ pkg_pretend() {
        fi
 }
 
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
 src_prepare() {
        eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
        sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \

diff --git a/net-proxy/squid/squid-4.9.ebuild b/net-proxy/squid/squid-4.9.ebuild
index adfc6b39a0fae1ea695267ab6d284a38ae71776e..76687eb647d2ece85b79102585331c611d608057 100644 (file)
--- a/net-proxy/squid/squid-4.9.ebuild
+++ b/net-proxy/squid/squid-4.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 WANT_AUTOMAKE="1.15"
 
-inherit autotools linux-info pam toolchain-funcs user
+inherit autotools linux-info pam toolchain-funcs
 
 DESCRIPTION="A full-featured web proxy cache"
 HOMEPAGE="http://www.squid-cache.org/"
@@ -30,11 +30,14 @@ IUSE="caps gnutls ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp
        +htcp +wccp +wccpv2 \
        pf-transparent ipf-transparent kqueue \
        elibc_uclibc kernel_linux"
+
 RESTRICT="!test? ( test )"
 
 BDEPEND="dev-lang/perl"
 
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+COMMON_DEPEND="acct-group/squid
+       acct-user/squid
+       caps? ( >=sys-libs/libcap-2.16 )
        pam? ( sys-libs/pam )
        ldap? ( net-nds/openldap )
        kerberos? ( virtual/krb5 )
@@ -51,10 +54,12 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
        logrotate? ( app-admin/logrotate )
        >=sys-libs/db-4:*
        dev-libs/libltdl:0"
+
 DEPEND="${COMMON_DEPEND}
        ${BDEPEND}
        ecap? ( virtual/pkgconfig )
        test? ( dev-util/cppunit )"
+
 RDEPEND="${COMMON_DEPEND}
        samba? ( net-fs/samba )
        perl? ( dev-lang/perl )
@@ -73,11 +78,6 @@ pkg_pretend() {
        fi
 }
 
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
 src_prepare() {
        eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
        sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \