commit:     c7f296436c9aba6c30e83a6c1fd48b687c05bf80
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 16:44:08 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:45:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f29643

www-servers/lighttpd: Version bump (v1.4.55)

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

 www-servers/lighttpd/Manifest                             |  1 +
 www-servers/lighttpd/lighttpd-1.4.53.ebuild               |  9 ++++-----
 www-servers/lighttpd/lighttpd-1.4.54.ebuild               |  6 ++++--
 .../{lighttpd-1.4.54.ebuild => lighttpd-1.4.55.ebuild}    |  6 ++++--
 www-servers/lighttpd/lighttpd-9999.ebuild                 | 15 +++++++++------
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 02e20318b9b..897f7fd71cd 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,2 +1,3 @@
 DIST lighttpd-1.4.53.tar.xz 732160 BLAKE2B 
75848ab259226fc77b232dfb365c6c656e4605055fb5beba1aea60f54f01cb76c3260ca97e59110dc3dd3d1ba7cb3f2fad646f91f37baee69a8cdbaefcf125a4
 SHA512 
bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76
 DIST lighttpd-1.4.54.tar.xz 763248 BLAKE2B 
0425dde326dc514a55790256ab7f3e6c704417fe2ac01c49d109d5f463fb41605140c0773dc3988bd27e1dbee316c5fc96231c9c8699ec40db3acf2c54ec077d
 SHA512 
aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37
+DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 
7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402
 SHA512 
023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439

diff --git a/www-servers/lighttpd/lighttpd-1.4.53.ebuild 
b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
index 2a4cc6bdf7c..0097aa1b826 100644
--- a/www-servers/lighttpd/lighttpd-1.4.53.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 systemd user
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd";
@@ -46,7 +46,9 @@ COMMON_DEPEND="
                sys-fs/e2fsprogs
        )
        xattr? ( kernel_linux? ( sys-apps/attr ) )
-       zlib? ( >=sys-libs/zlib-1.1 )"
+       zlib? ( >=sys-libs/zlib-1.1 )
+       acct-group/lighttpd
+       acct-user/lighttpd"
 
 DEPEND="${COMMON_DEPEND}
        doc?  ( dev-python/docutils )
@@ -102,9 +104,6 @@ pkg_setup() {
                ewarn "and mod_ssi."
        fi
 
-       enewgroup lighttpd
-       enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
        DOC_CONTENTS="IPv6 migration guide:\n
                http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config";
 }

diff --git a/www-servers/lighttpd/lighttpd-1.4.54.ebuild 
b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
index d296fa74c41..35b1c45431c 100644
--- a/www-servers/lighttpd/lighttpd-1.4.54.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 systemd user
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd";
@@ -46,7 +46,9 @@ COMMON_DEPEND="
                sys-fs/e2fsprogs
        )
        xattr? ( kernel_linux? ( sys-apps/attr ) )
-       zlib? ( >=sys-libs/zlib-1.1 )"
+       zlib? ( >=sys-libs/zlib-1.1 )
+       acct-group/lighttpd
+       acct-user/lighttpd"
 
 DEPEND="${COMMON_DEPEND}
        doc?  ( dev-python/docutils )

diff --git a/www-servers/lighttpd/lighttpd-1.4.54.ebuild 
b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
similarity index 97%
copy from www-servers/lighttpd/lighttpd-1.4.54.ebuild
copy to www-servers/lighttpd/lighttpd-1.4.55.ebuild
index d296fa74c41..35b1c45431c 100644
--- a/www-servers/lighttpd/lighttpd-1.4.54.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 systemd user
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd";
@@ -46,7 +46,9 @@ COMMON_DEPEND="
                sys-fs/e2fsprogs
        )
        xattr? ( kernel_linux? ( sys-apps/attr ) )
-       zlib? ( >=sys-libs/zlib-1.1 )"
+       zlib? ( >=sys-libs/zlib-1.1 )
+       acct-group/lighttpd
+       acct-user/lighttpd"
 
 DEPEND="${COMMON_DEPEND}
        doc?  ( dev-python/docutils )

diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild 
b/www-servers/lighttpd/lighttpd-9999.ebuild
index 50b9cd4b709..4db91887f92 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit autotools eutils readme.gentoo-r1 user systemd git-r3
+EAPI=7
+
+inherit autotools eutils readme.gentoo-r1 systemd git-r3
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="https://www.lighttpd.net
@@ -17,7 +18,7 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
 
-CDEPEND="
+COMMON_DEPEND="
        bzip2?    ( app-arch/bzip2 )
        fam?      ( virtual/fam )
        gdbm?     ( sys-libs/gdbm )
@@ -39,9 +40,11 @@ CDEPEND="
                sys-fs/e2fsprogs
        )
        xattr? ( kernel_linux? ( sys-apps/attr ) )
-       zlib? ( >=sys-libs/zlib-1.1 )"
+       zlib? ( >=sys-libs/zlib-1.1 )
+       acct-group/lighttpd
+       acct-user/lighttpd"
 
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
        doc?  ( dev-python/docutils )
        test? (
@@ -49,7 +52,7 @@ DEPEND="${CDEPEND}
                dev-libs/fcgi
        )"
 
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
        selinux? ( sec-policy/selinux-apache )
 "
 

Reply via email to