gentoo resync : 10.02.2020

4 files changed, 56 insertions, 44 deletions

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index b17db621db1a..5b67d9d6a62d 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -9,7 +9,8 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.53.tar.xz 732160 BLAKE2B 75848ab259226fc77b232dfb365c6c656e4605055fb5beba1aea60f54f01cb76c3260ca97e59110dc3dd3d1ba7cb3f2fad646f91f37baee69a8cdbaefcf125a4 SHA512 bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76
 DIST lighttpd-1.4.54.tar.xz 763248 BLAKE2B 0425dde326dc514a55790256ab7f3e6c704417fe2ac01c49d109d5f463fb41605140c0773dc3988bd27e1dbee316c5fc96231c9c8699ec40db3acf2c54ec077d SHA512 aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37
-EBUILD lighttpd-1.4.53.ebuild 6352 BLAKE2B 584affd7be01f2c1f595a8cc932fb4bee89d7add8412e653a17a7357b5ec0872ae2c7e57d20e1c6b8dda36c6111b91f74229d8dd920fe6ca897f341a47e3d140 SHA512 eec578b409fadefa008d3fa78768d4963874442b307b7b6422e6d8895eba3725ae41f5aeabb7fc701eaf9ecc6b02962913c8df7f8a93e9b3a1709a29129b85a5
-EBUILD lighttpd-1.4.54.ebuild 6353 BLAKE2B 35244ab51f6e93857f2611e77d262a5ed3c78e77c5f5fe8e63eae8ab7307fa55eead74a7dbaf66ee5ed35b4650dee09c52dfdd57c111d5ff5f41058a13a086bd SHA512 d0fde0f4d906f3c327501aef37e4e22e6522cce3009280c7bd18ecee1b4e7c5b0dc53f4ea24fd34afb11a1ef22d7ea7dc96f74c2bcdf1045659bea77147d37dc
-EBUILD lighttpd-9999.ebuild 5939 BLAKE2B d58f5b531433b32d8223735b4bc836cab048aa4a6c52c90060898c6f8578e6e85e7e17cfb9825ba1c6e593213d0c85ee8ed37e1b5390f71d8c6495ae6b6e74b8 SHA512 b3b4d58f4feb2486acaf0c9115997ca8012fcca4e3fd0a7abcc65e088beddef91a689a4d96f823b5b3c3ed85182b2e5f60b8dc2a925d1f757fb4feb744096053
+DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
+EBUILD lighttpd-1.4.53.ebuild 6307 BLAKE2B b9c6407dc67c59de97d4ea75326b0a6211b09637060eddbc8b57fc9fe4d3db49a4da27c015a482757b8b9aa43828d0974cf4613846dba568eae4f974242fc74c SHA512 e0e241ca1daa6e79ff6309b3646cc548779e79f9a3073eae073914b8b6310bb13bd1d9d0b2c8417044c127e8704bd11ee9625d8167de3fa6392c91524cb725a1
+EBUILD lighttpd-1.4.54.ebuild 6308 BLAKE2B 82c072ee05bbcb396bc412ef7d836c9aee457cd02733b6ed2ad9330d567c7cce045a5d14c8738a5f73cfaa2a7b562719e95f08ddd5291bcc58fad0ca9c6451e4 SHA512 41c4eaeb1cbbbd7b5e4ef1b99d81b5a08615eeb520944fc84ef237c1fbfd23ed297f883446d85567d1f805ada30dbe8812663ab5bac372607f9e519a8023b16e
+EBUILD lighttpd-1.4.55.ebuild 6308 BLAKE2B 82c072ee05bbcb396bc412ef7d836c9aee457cd02733b6ed2ad9330d567c7cce045a5d14c8738a5f73cfaa2a7b562719e95f08ddd5291bcc58fad0ca9c6451e4 SHA512 41c4eaeb1cbbbd7b5e4ef1b99d81b5a08615eeb520944fc84ef237c1fbfd23ed297f883446d85567d1f805ada30dbe8812663ab5bac372607f9e519a8023b16e
 MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/lighttpd-1.4.53.ebuild b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
index 2a4cc6bdf7c5..0097aa1b826d 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 d296fa74c41b..b8d0d13b8efa 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 )
@@ -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-9999.ebuild b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
index 50b9cd4b7091..b8d0d13b8efa 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
@@ -1,55 +1,63 @@
 # 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 flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net
-		  https://github.com/lighttpd"
-EGIT_REPO_URI="https://git.lighttpd.net/lighttpd1.4.git git+ssh://git@lighttpd.net/lighttpd/lighttpd1.4.git git://git.lighttpd.net/lighttpd/lighttpd1.4.git"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="kerberos? ( ssl !libressl )"
+REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
+
+BDEPEND="dev-libs/libgamin
+	virtual/pkgconfig"
 
-CDEPEND="
+COMMON_DEPEND="
 	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	libev?    ( >=dev-libs/libev-4.01 )
-	lua?      ( >=dev-lang/lua-5.1:= )
+	dbi?	( dev-db/libdbi )
+	fam?    ( virtual/fam )
+	gdbm?   ( sys-libs/gdbm )
+	geoip?	( dev-libs/geoip )
+	ldap?   ( >=net-nds/openldap-2.1.26 )
+	libev?  ( >=dev-libs/libev-4.01 )
+	lua?    ( >=dev-lang/lua-5.1:= )
 	memcached? ( dev-libs/libmemcached )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
+	mysql?  ( dev-db/mysql-connector-c:= )
+	pcre?   ( >=dev-libs/libpcre-3.1 )
 	php?      ( dev-lang/php:*[cgi] )
+	postgres? ( dev-db/postgresql:* )
 	rrdtool?  ( net-analyzer/rrdtool )
+	sasl?     ( dev-libs/cyrus-sasl )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.7:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
+	sqlite?	( dev-db/sqlite:3 )
 	webdav? (
 		dev-libs/libxml2
-		>=dev-db/sqlite-3
 		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}
-	virtual/pkgconfig
+DEPEND="${COMMON_DEPEND}
 	doc?  ( dev-python/docutils )
 	test? (
 		virtual/perl-Test-Harness
 		dev-libs/fcgi
 	)"
 
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-apache )
 "
 
@@ -76,7 +84,7 @@ remove_non_essential() {
 
 	# non-essential modules
 	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
 
 	# allow users to keep some based on USE flags
 	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
@@ -96,19 +104,17 @@ 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"
 }
 
 src_prepare() {
+	default
+	use memcached && append-ldflags -pthread
 	#dev-python/docutils installs rst2html.py not rst2html
 	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
 		die "sed doc/Makefile.am failed"
 	eautoreconf
-	default
 }
 
 src_configure() {
@@ -117,16 +123,21 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable mmap) \
 		$(use_with bzip2) \
+		$(use_with dbi) \
 		$(use_with fam) \
 		$(use_with gdbm) \
-		$(use_with kerberos kerberos5) \
+		$(use_with geoip ) \
+		$(use_with kerberos krb5) \
 		$(use_with ldap) \
 		$(use_with libev) \
 		$(use_with lua) \
-		$(use_with memcached memcache) \
+		$(use_with memcached) \
 		$(use_with mysql) \
 		$(use_with pcre) \
+		$(use_with postgres pgsql) \
+		$(use_with sasl) \
 		$(use_with ssl openssl) \
+		$(use_with sqlite) \
 		$(use_with webdav webdav-props) \
 		$(use_with webdav webdav-locks) \
 		$(use_with xattr attr) \
@@ -154,6 +165,8 @@ src_test() {
 src_install() {
 	default
 
+	find "${D}" -name '*.la' -delete || die
+
 	# init script stuff
 	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
 	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
@@ -189,7 +202,7 @@ src_install() {
 	fperms 0750 /var/l{ib,og}/lighttpd
 
 	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
 
 	use minimal && remove_non_essential
 
@@ -200,13 +213,13 @@ src_install() {
 pkg_postinst () {
 	use ipv6 && readme.gentoo_print_elog
 
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
 		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
 		einfo "spawn-fcgi's init script configuration is now located"
 		einfo "at /etc/conf.d/spawn-fcgi."
 	fi
 
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+	if [[ -f ${ROOT}/etc/lighttpd.conf ]] ; then
 		elog "Gentoo has a customized configuration,"
 		elog "which is now located in /etc/lighttpd.  Please migrate your"
 		elog "existing configuration."