[gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/

[Anthony G. Basile]

commit:     a9f7128597dac01e42e8445b17c728f33f66d746
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 14:00:47 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 14:01:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f71285

www-servers/varnish: also port older versions to GLEP 81

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 .../varnish/{varnish-6.2.2.ebuild => varnish-6.2.2-r1.ebuild} | 11 +++--------
 www-servers/varnish/varnish-6.3.0.ebuild                      |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/www-servers/varnish/varnish-6.2.2.ebuild 
b/www-servers/varnish/varnish-6.2.2-r1.ebuild
similarity index 92%
rename from www-servers/varnish/varnish-6.2.2.ebuild
rename to www-servers/varnish/varnish-6.2.2-r1.ebuild
index e5c46f10e7d..45b9dbeea58 100644
--- a/www-servers/varnish/varnish-6.2.2.ebuild
+++ b/www-servers/varnish/varnish-6.2.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} pypy )
 
-inherit user autotools systemd python-r1
+inherit autotools systemd python-r1
 
 DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
 HOMEPAGE="https://varnish-cache.org/";
@@ -26,6 +26,8 @@ CDEPEND="
 RDEPEND="
        ${PYTHON_DEPS}
        ${CDEPEND}
+       acct-user/varnish
+       acct-group/varnish
        sys-devel/gcc"
 
 DEPEND="
@@ -38,13 +40,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test" #315725
 
-pkg_setup() {
-       ebegin "Creating varnish user and group"
-       enewgroup varnish
-       enewuser varnish -1 -1 /var/lib/varnish varnish
-       eend $?
-}
-
 src_prepare() {
        # Remove -Werror bug #528354
        sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac

diff --git a/www-servers/varnish/varnish-6.3.0.ebuild 
b/www-servers/varnish/varnish-6.3.0.ebuild
index 9930680fa67..45b9dbeea58 100644
--- a/www-servers/varnish/varnish-6.3.0.ebuild
+++ b/www-servers/varnish/varnish-6.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} pypy )
 
-inherit user autotools systemd python-r1
+inherit autotools systemd python-r1
 
 DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
 HOMEPAGE="https://varnish-cache.org/";