gentoo resync : 24.12.2018

3 files changed, 42 insertions, 35 deletions

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 2a2ca1742d11..a23f2b1451e2 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -8,9 +8,9 @@ AUX lighttpd.logrotate 366 BLAKE2B 518eb5d54c6aa0cbc40cf8b2b5db7c7828ac1a300e892
 AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe
 AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f
 AUX lighttpd.tmpfiles.conf 44 BLAKE2B 00550d523dc350184ef0d681e9e8da5ad1909dd6226698c79d88c7cab7d35c8e20a0c308b5342f94872442aeac240e202ea6055f4666759f9ec853debac18730 SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936
-DIST lighttpd-1.4.45.tar.xz 660432 BLAKE2B 31ea3209b8efad32c3811d39b1c1a682d9f2d79a2ecd7d90c413ad066b6a7d5f84df9b3af2ffb2d49a701856ac496626f2a744b25f1dc4fe1c3b9af586fc437f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d
-DIST lighttpd-1.4.49.tar.xz 710964 BLAKE2B 112ceb36b45f51c7d5526caba27d2b2aa57ec9d14751e1334472c9079c25317c5e37faf884788c84d61fa6cfa2efedc0b4ec02e32308beb6a0b6be28eea44fbd SHA512 de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784
-EBUILD lighttpd-1.4.45-r1.ebuild 5949 BLAKE2B d511a5945fe9289d5a292da738fd3ace41ceda69e446db929ffd70ae7c7f15135068a779e988b627078d3358172dc51b6c5c471d7d3e0ae753af59f32a945341 SHA512 88fef9582a93e29fced13455934e5a60ff4a7390578dccf7645622e57b71f041c2e63aeea75f5cc2d9ccd809df20b62184daa198c7ab271197a0071d8055ab78
-EBUILD lighttpd-1.4.49.ebuild 6330 BLAKE2B ed954d144848c5f8bfa2e6086478b0e615dae9e2f9226815da642ad2de91f7d8863382dc6f0fc09b57bd0cbe39fe11cd46c89da40456cb4966e2958adda233a1 SHA512 23ee2bbc4df2d512511095c152d11f7ced673af25401c1ed487ecfc6d552599e2537e0bfd07bf0a53262e163c56480fbc9f8269c3284faec7e8c50fa51d310ad
+DIST lighttpd-1.4.51.tar.xz 723268 BLAKE2B 524874a5cc29b3fad23b1d2d623bcaf5b781556d7f11848047bc02fb4793480acfc5b5eb6f60304be9472a8b42c87e8c23baf85352bc9479ea156c4a03990bad SHA512 ee4f150c30322dae50760b99cddd0bd935195ee21e042809fa8d303425d12081c23c00d8ea8fcd3d023b6b414a46b9b953edc4ed25400fe39f10487f0956561f
+DIST lighttpd-1.4.52.tar.xz 728668 BLAKE2B 6ffce05ad8cb83895f8865cfd2ce627c39c881e7717992ce25d1ed899c51fd1769d91d9c43f621b013e536a3a24d4350e5525426be333aa5b21913f480af5d31 SHA512 3c604f441c001641681b958012524c9a2e801314b07d9741d4b5e086e7585d676516e3fe587e0ff69f1f937c11b9a290f2173866d6b90019117b6be299972a72
+EBUILD lighttpd-1.4.51.ebuild 6296 BLAKE2B ab1f50593c428124a4de77d7c1c487129e7e7653eb0256c63c35a62ab0615515ec3517bbbb257e485a5b77a6d6b4ef84082ae3e6e2f228cf610f6f4ac19c97b8 SHA512 38d9e63c64af8fde307c713d65af732eefe5da1103d48101c27b3476dd7a1c61719c778c467974218687b0be2a38bb7115d13687cf901a0e22fabf8def1ee59c
+EBUILD lighttpd-1.4.52.ebuild 6305 BLAKE2B 8108925b03d5331f575cb848fce299ab81824dbb5153e2a35744664d072433395444cd3872123f90a92c89954aafed350b519c85bd3644e44487405a98e945f3 SHA512 0f240be866e13e49c24122af2936be8cdbb3c09b33814ab2e9f7e797acedebe655bb4ef50b5478e6494b9b30bb1beb9e06846cf326140fbbd17c886272bdd9d5
 EBUILD lighttpd-9999.ebuild 5950 BLAKE2B f32cb4e5ddf22af2b698aaf17fb33f16862d13e28025984d0468e769af84acff9f2981e69526c139d9192964d57b8b95200edcfb756725855481fc31fbbf73be SHA512 50d096574b0f05c207eca9c18b7b70324c923bbbafe7d42c56770cae8eea3793f46e39c1a9be497fd35dba4844c83a8342c38afcfa4aa4c60ea7f0eb72856e69
 MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.51.ebuild
index 998089c89aff..7e25904b4332 100644
--- a/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.51.ebuild
@@ -1,41 +1,44 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools readme.gentoo-r1 systemd user
+inherit autotools flag-o-matic readme.gentoo-r1 systemd user
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net
-		  https://github.com/lighttpd"
+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="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
-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 ~x86-fbsd"
+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"
 
-REQUIRED_USE="kerberos? ( ssl !libressl )"
+REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
 
 CDEPEND="
 	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=[kerberos?] )
 		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 ) )
@@ -105,6 +108,7 @@ pkg_setup() {
 
 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"
@@ -117,8 +121,10 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable mmap) \
 		$(use_with bzip2) \
+		$(use_with dbi) \
 		$(use_with fam) \
 		$(use_with gdbm) \
+		$(use_with geoip ) \
 		$(use_with kerberos krb5) \
 		$(use_with ldap) \
 		$(use_with libev) \
@@ -126,7 +132,10 @@ src_configure() {
 		$(use_with memcached) \
 		$(use_with mysql) \
 		$(use_with pcre) \
+		$(use_with postgres pgsql) \
+		$(use_with sasl) \
 		$(use_with ssl openssl) \
+		$(use_with sqlite sqlite) \
 		$(use_with webdav webdav-props) \
 		$(use_with webdav webdav-locks) \
 		$(use_with xattr attr) \
diff --git a/www-servers/lighttpd/lighttpd-1.4.49.ebuild b/www-servers/lighttpd/lighttpd-1.4.52.ebuild
index b13d9470ccd1..a6f73fe32fdb 100644
--- a/www-servers/lighttpd/lighttpd-1.4.49.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.52.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools flag-o-matic readme.gentoo-r1 systemd user
 
 DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net
-		  https://github.com/lighttpd"
+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"
@@ -15,21 +14,20 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 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"
 
-REQUIRED_USE="kerberos? ( ssl !libressl )
-	      webdav? ( sqlite )"
+REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
 
 CDEPEND="
 	bzip2?    ( app-arch/bzip2 )
-	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:= )
+	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 )