gentoo resync : 02.02.2022

9 files changed, 987 insertions, 418 deletions

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 9b7b3b7eeddf..a52edc0ae033 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,17 +1,21 @@
-AUX conf/lighttpd.conf 8257 BLAKE2B 82090a8c467e3738d1e7bb3a55310040145ab6a0ee7dc0ab45abd9ad657cfacec895727eb34799f3552d0c1c11a6dfbf6fe7cc1fd6e17b610284b7194e02aed0 SHA512 0bfa3d44c28f6893362b4c428d7bdce2a560ba155e349af9ee293510341fee03d484f95e9d967afb87f0a61aa11dd33ef9c633e206146c0af791f2690aed9852
-AUX conf/mime-types.conf 8035 BLAKE2B 4f47860376d6bed610ecacf2c79c3ccbd6ed7a05bce6fe57c93e4dfacc5f85fd4957730470765644c4ee233f9e4c853b5092362cbdcd4ad06d6e641ff53439b3 SHA512 230d86331c39e8819c14583309669e49c0a0dcf52144f9ddc24bcdd8a742364f6efee720c964ffaddb1f88bc64b04a32c5ac13b0d512806f98282e20e2682b6e
-AUX conf/mod_cgi.conf 749 BLAKE2B dd565d6052d74aea3489f3a011a5913fcbd331b57ca02e71496eecff7c303cd56e8e43cd5a9b33c27463304a2f2218fc7451cb5754200c9ef48eb4104b820547 SHA512 e611b3ed232af4fb8e9b8821a29fbc32acb0a3431c701e5a64afc192abc288cf90582fbbf79085de9426be23d8d42d90da66e6993ab7cf89943ae23d59d681a1
-AUX conf/mod_fastcgi.conf 549 BLAKE2B 7bd525db1ace97a826bc4fcc11fc230f16839005da8988b21f54e5d43763a7df82b0d3b2cd5f410074cd87b2c8dbaab91042563bb7878ca0bedc076eafdc5906 SHA512 a9245394cbde327f997932546e2c6ee755da9365ce3a3d4662d2042971a9ec0a5fc36f9cdd7c032d35a6c0c3d02471b4b9b394b2cd349291c4a9827ca06cea4f
+AUX conf/lighttpd.conf 6707 BLAKE2B 87c74414991a45ba6be17235db7a627dfea85fd4393efd3fc653495adbed1f0b4950d2f9a9c774fe57ce10d8abbff8025dffdef5dfc7003c09f9ca7fcb8a8572 SHA512 7a466414e455bbbdbf181ca2be602aba8cb8ab4afc2002d9d7fd9b7e7e98cd62fb17863bc291a2dc940b14e08251069ec5961c819e3f6fe592888e91d402bc95
+AUX conf/lighttpd.conf-r1 7623 BLAKE2B 51805756814ed7ea8770419fa98009b1ecf6e963c9f1b9d7694ad307fd3c3f6f9c1c167a41b6048910e4cd89af4211b6a8f48382a9adadb10b76ab61f55b6115 SHA512 8985c77d2dc22cca8caf7a484619d2712dd1fa7ecd4a71c19b8c5d09af471c6b42ab0cf131d40d2c61440d4d3053a86285fb90209204d2ba711868513c800722
+AUX conf/mime-types.conf 5802 BLAKE2B 894906c67176dfb98819fe0d61e66905d873ad96907c14684a1b6284796ea69950606c950a72f16ffa9fdd46675ac79050cc39456ae66c91a38a50e1ef5449e9 SHA512 28fb746307daa92ae8077850627097d8ed4f24ad6f1c1963a3397a052add17282292e6f230550fb65d2fef969af0448f2f86e36afb5b15dc92b00fd80821c54a
+AUX conf/mod_cgi.conf 624 BLAKE2B b2d998f15c3fa6de05a91e987a60f9ba599ec5b8fe24317f17566ce6473cffaf1ad04b937724ef32064afacc87672323cd10718c7a0bdf24091150e4535aa7a8 SHA512 2b9fe376fac868a67daffe5cdcdd3c28a27e210219748f5513f1d2f4763a934739232b2ae521e5596ed4ae84137667c982a1e0d7b4161708e41d6f78ffe395a9
+AUX conf/mod_fastcgi.conf 425 BLAKE2B 5c78303b686677bc77a6c9c51f295a023f4854ce351cf41e8984f84f6d8520fee93db4c96b25495bb935ed53d57090e481516c3fd4862401cea174fa2bccc0d2 SHA512 0847a55736dd86f6589086614331a54d1656214ab918638a319b69825ef67bfc8003fa567dc8b82c1c1611d2b4d2771dce4bdd337ecb9b277758a5dcf6c12331
 AUX lighttpd-1.4.59-nspr-header.patch 546 BLAKE2B c5354d75a0543a7ccb7e1f2c9aabc09dadd1703cc7199438b1b894c566314f189e2115db5f41d70c8df10101e05c31f7f5644634c0e4f9fca7919ced92457793 SHA512 e0ea1b0d3948ff487ffc050bbe692e488b98f4cacdfc122837458527168cf5c40125cd98e69a1f95095ecd28b309b19e209e07be75dae2bcdd48ea1692f1056b
 AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416
 AUX lighttpd.initd 1957 BLAKE2B df5ba8a820d9a75657e6bb3225f86b961d15f11f4b05278c44ffb1840386be5e8dd2c74e4c053ab4c5f10e5987ebac2e9b8e1489436e5ab337a2f96ca403610c SHA512 d5fc03ded923d2aeea19fefdf658ed793114867dd0b50be6836d767108c98fb7de56011f00ea63220c4b198cff45d98fdc8a649efae90673536e03f786219485
+AUX lighttpd.initd-r1 1993 BLAKE2B 719a854c4faad43a7d33303afd68950ec5393b63f485cfcbcd89e39b6a4a6eef3fe74a73acdd95dd948f7d3c822d0cca1a7da087c83eb455f50b2402a5ef8acd SHA512 545b923f199a6f3399df3cbd8122e7a5a83bf4128a59bf000690ccba1e6d9bd7ec3bd31aeecf4c7a14b6349ccc99df5ab4e6ff8ef9b3f026efd6ae628c872962
 AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe
 AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
 DIST lighttpd-1.4.58.tar.xz 956828 BLAKE2B b8b0a111db64a8af429dd9922503991e55276808b58143ffce3268bc8b20a39cfec9d8c1e2917b34326ac5502801a6ca3b9bae26874f86b6749c363a09225ca3 SHA512 b7f18223e46bf78f866eb22f44a7702df07424271e085da9f0d03e626198c30e87a3959536d02e3588aa47ba4bc7db7c432307175fb3b25a2984f9cf692c0ca4
 DIST lighttpd-1.4.59.tar.xz 968352 BLAKE2B 8997386be24d9d84fa8012aedd8ac97b3ad4fd19bb756163d3e9b8c6984c740475c6db2810817db9d1a246320bcd81f7ab35847707316454523c614a4485299f SHA512 94d312f6ac65c32057018b749c4865220b43b3e4b7fe9396848aa403ea7fdc2ccbf3f4f91daf281b754cf272a52a8bcdc689502773ea33cae36eead2785daa0f
+DIST lighttpd-1.4.64.tar.xz 1011436 BLAKE2B 7eea665f20a07ced23e7372515b5e44852ea14e4ac83297ed9f764106b69e7931d84bf5d1c6d5f542ef810021ef94398a89bc3161213f8bdfaba3676e0a687ca SHA512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936
 EBUILD lighttpd-1.4.55-r101.ebuild 6969 BLAKE2B 4d4f5f97ecf84b270d405e639d2b80c739e9bf80e4fb9282cb76395ab4e02b0d41775ae3c5af504d487cf040072523ebec063059f6d508de81292243f20ff77a SHA512 ffc11c91eb34e8c06727725b2c12570def1ab2165e3497643d2cb468e2913b8835436e2afe936365055032e9a05b22a23eed22a85ab7fcefc49a3f8a0b7edb6e
 EBUILD lighttpd-1.4.58-r1.ebuild 7583 BLAKE2B cb86b521d9affc799ed4dd3feeec74305377043d5610beeb83440cdbb5f3fa1bd59b3727736e62f55f0bc2f6694533b7809b6887cb9db923bb10e37fcb2dbf22 SHA512 c1ea434d4a75494fa3115ac5efe37baa5f38212089e6cf6f01ce4b408e704806b560aa82c59ea17dbcd495651b94db137c5fa10b38ab438ec7f9b6b6305936d1
 EBUILD lighttpd-1.4.59-r1.ebuild 6654 BLAKE2B c8bf96550c734593f4534e193114dfa761ee42d8dabd8078615ebcaed2eef0364a44b0c3f8cdf31347b30164a2c578814dc86bbc815067563f3ed1390bf0c8d7 SHA512 90a14e1209121b5da973d150a906a39b11d96fc7d58736445887eea693ac0f47117de6e62ede730c5588d4500320fbf87a658e194ae597f40aae110677cb9823
-MISC metadata.xml 1796 BLAKE2B 2967de0aafd959ce940beb7ba1bb989d12322a33345e80feec53d0b9764429050b8d321f4b24d60fb948b21aacf2c773e6fbdf2e16f8fa3bb2e4c62c5075b106 SHA512 9fa3689a6cfc647babce4b908ea4be51d549db0ac3ab5706224f8623cf38d28f33e2d70964a517f8fb02e3bcc04f49c9b58393bd053841b9fcc5565e30a539fa
+EBUILD lighttpd-1.4.64.ebuild 6493 BLAKE2B 1099f5c212ff294821e9a1376081c00632a3e29850899a6107186880041a9a0fc36d2e14540a3f600284400a0fb41a82874dbbf888b8992435d517584b1e2bc2 SHA512 2302f8b218caaa138f31e5c9c7e3962a2e8fc889f22c15363ad983b6d5f4646c7c490b2963bc067d71d4b960b584223ac933140e1ecb610e8f81c30dde8ca72b
+MISC metadata.xml 2018 BLAKE2B b3e04540572bffdb97e274f310ce2f3ca5431332056c2579ee4fb11f6515608757778ea7a804df7c11dfa782f8e44271a5b4ec8fe64436187ab5ffec09de4a1d SHA512 946c60e5ad6c7c1762043d0c75b960999c1df03ba2d4b186d352d4945ad0e0aa2a1c517ff8b5ae80cff6e47b8e0c8dadc148c11f7b3edcb50fd66f3c97733d04
diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf b/www-servers/lighttpd/files/conf/lighttpd.conf
index 2a13a57c1c8d..13d5e772ac1b 100644
--- a/www-servers/lighttpd/files/conf/lighttpd.conf
+++ b/www-servers/lighttpd/files/conf/lighttpd.conf
@@ -2,67 +2,67 @@
 # Default lighttpd.conf for Gentoo.
 ###############################################################################
 
-# {{{ variables
-var.basedir  = "/var/www/localhost"
-var.logdir   = "/var/log/lighttpd"
+# Variables
+var.basedir = "/var/www/localhost"
+var.logdir = "/var/log/lighttpd"
 var.statedir = "/var/lib/lighttpd"
-# }}}
 
-# {{{ modules
+
+# Modules
 # At the very least, mod_access and mod_accesslog should be enabled.
 # All other modules should only be loaded if necessary.
 # NOTE: the order of modules is important.
 server.modules = (
-#    "mod_rewrite",
-#    "mod_redirect",
-#    "mod_alias",
-    "mod_access",
-#    "mod_cml",
-#    "mod_trigger_b4_dl",
-#    "mod_auth",
-#    "mod_status",
-#    "mod_setenv",
-#    "mod_proxy",
-#    "mod_simple_vhost",
-#    "mod_evhost",
-#    "mod_userdir",
-#    "mod_compress",
-#    "mod_ssi",
-#    "mod_usertrack",
-#    "mod_expire",
-#    "mod_secdownload",
-#    "mod_rrdtool",
-#    "mod_webdav",
-    "mod_accesslog"
+#  "mod_rewrite",
+#  "mod_redirect",
+#  "mod_alias",
+   "mod_access",
+#  "mod_cml",
+#  "mod_trigger_b4_dl",
+#  "mod_auth",
+#  "mod_status",
+#  "mod_setenv",
+#  "mod_proxy",
+#  "mod_simple_vhost",
+#  "mod_evhost",
+#  "mod_userdir",
+#  "mod_compress",
+#  "mod_ssi",
+#  "mod_usertrack",
+#  "mod_expire",
+#  "mod_secdownload",
+#  "mod_rrdtool",
+#  "mod_webdav",
+   "mod_accesslog"
 )
-# }}}
 
-# {{{ includes
+
+# Includes
 include "mime-types.conf"
-# fcgi and cgi are included below 
-# }}}
+# include "mod_cgi.conf"
+# include "mod_fastcgi.conf"
 
-# {{{ server settings
-server.username      = "lighttpd"
-server.groupname     = "lighttpd"
 
+# Server Settings
+server.username = "lighttpd"
+server.groupname = "lighttpd"
 server.document-root = var.basedir + "/htdocs"
-server.pid-file      = "/run/lighttpd.pid"
-
-server.errorlog      = var.logdir  + "/error.log"
+server.pid-file = "/run/lighttpd.pid"
+server.errorlog = var.logdir + "/error.log"
 # log errors to syslog instead
-#   server.errorlog-use-syslog = "enable"
-
-server.indexfiles    = ("index.php", "index.html",
-						"index.htm", "default.htm")
-
-# server.tag           = "lighttpd"
-
+# server.errorlog-use-syslog = "enable"
+server.indexfiles = (
+  "index.php",
+  "index.html",
+  "index.htm",
+  "default.htm"
+)
+# server.tag = "lighttpd"
 server.follow-symlink = "enable"
 
 # event handler (defaults to "poll")
 # see performance.txt
-# 
+
 # for >= linux-2.4
 #   server.event-handler = "linux-rtsig"
 # for >= linux-2.6
@@ -71,13 +71,13 @@ server.follow-symlink = "enable"
 #   server.event-handler = "freebsd-kqueue"
 
 # chroot to directory (defaults to no chroot)
-# server.chroot      = "/"
+# server.chroot = "/"
 
 # bind to port (defaults to 80)
-# server.port          = 81
+# server.port = 81
 
 # bind to name (defaults to all interfaces)
-# server.bind          = "grisu.home.kneschke.de"
+# server.bind = "grisu.home.kneschke.de"
 
 # error-handler for status 404
 # server.error-handler-404 = "/error-handler.html"
@@ -85,157 +85,130 @@ server.follow-symlink = "enable"
 
 # Format: <errorfile-prefix><status-code>.html
 # -> ..../status-404.html for 'File not found'
-# server.errorfile-prefix    = var.basedir + "/error/status-"
+# server.errorfile-prefix = var.basedir + "/error/status-"
 
 # FAM support for caching stat() calls
 # requires that lighttpd be built with USE=fam
-#   server.stat-cache-engine = "fam"
+# server.stat-cache-engine = "fam"
 
 # If lighttpd was build with IPv6 support, and you would like to listen on IPv6,
 # uncomment the following:
 # server.use-ipv6 = "enable"
 
-# }}}
-
-# {{{ mod_staticfile
 
+# mod_staticfile
 # which extensions should not be handled via static-file transfer
 # (extensions that are usually handled by mod_cgi, mod_fastcgi, etc).
 static-file.exclude-extensions = (".php", ".pl", ".cgi", ".fcgi")
-# }}}
 
-# {{{ mod_accesslog
+
+# mod_accesslog
 accesslog.filename   = var.logdir + "/access.log"
-# }}}
 
-# {{{ mod_dirlisting
+
+# mod_dirlisting
 # enable directory listings
-#   dir-listing.activate      = "enable"
-#
+# dir-listing.activate = "enable"
+
 # don't list hidden files/directories
-#   dir-listing.hide-dotfiles = "enable"
-#
+# dir-listing.hide-dotfiles = "enable"
+
 # use a different css for directory listings
-#   dir-listing.external-css  = "/path/to/dir-listing.css"
-#
-# list of regular expressions.  files that match any of the
+# dir-listing.external-css= "/path/to/dir-listing.css"
+
+# list of regular expressions. Files that match any of the
 # specified regular expressions will be excluded from directory
 # listings.
-#   dir-listing.exclude = ("^\.", "~$")
-# }}}
+# dir-listing.exclude = ("^\.", "~$")
 
-# {{{ mod_access
-# see access.txt
 
+# mod_access
 url.access-deny = ("~", ".inc")
-# }}}
 
-# {{{ mod_userdir
-# see userdir.txt
-#
+
+# mod_userdir
 # userdir.path = "public_html"
 # userdir.exclude-user = ("root")
-# }}}
 
-# {{{ mod_ssi
-# see ssi.txt
-#
+
+# mod_ssi
 # ssi.extension = (".shtml")
-# }}}
-
-# {{{ mod_ssl
-# see ssl.txt
-#
-# ssl.engine    = "enable"
-# ssl.pemfile   = "server.pem"
-# }}}
-
-# {{{ mod_status
-# see status.txt
-#
+
+
+# mod_ssl
+# ssl.engine = "enable"
+# ssl.pemfile = "server.pem"
+
+
+# mod_status
 # status.status-url  = "/server-status"
 # status.config-url  = "/server-config"
-# }}}
-
-# {{{ mod_simple_vhost
-# see simple-vhost.txt
-#
-#  If you want name-based virtual hosting add the next three settings and load
-#  mod_simple_vhost
-#
+
+
+# mod_simple_vhost
+# If you want name-based virtual hosting add the next three settings
+# and load mod_simple_vhost
 # document-root =
 #   virtual-server-root + virtual-server-default-host + virtual-server-docroot
 # or
 #   virtual-server-root + http-host + virtual-server-docroot
-#
-# simple-vhost.server-root   = "/home/weigon/wwwroot/servers/"
-# simple-vhost.default-host  = "grisu.home.kneschke.de"
+# simple-vhost.server-root = "/home/user/webroot/servers/"
+# simple-vhost.default-host = "www.example.org"
 # simple-vhost.document-root = "/pages/"
-# }}}
-
-# {{{ mod_compress
-# see compress.txt
-#
-# compress.cache-dir   = var.statedir + "/cache/compress"
-# compress.filetype    = ("text/plain", "text/html")
-# }}}
-
-# {{{ mod_proxy
-# see proxy.txt
-#
-# proxy.server               = ( ".php" =>
-#                               ( "localhost" =>
-#                                 (
-#                                   "host" => "192.168.0.101",
-#                                   "port" => 80
-#                                 )
-#                               )
-#                             )
-# }}}
-
-# {{{ mod_auth
-# see authentication.txt
-#
-# auth.backend               = "plain"
+
+
+# mod_compress
+# compress.cache-dir = var.statedir + "/cache/compress"
+# compress.filetype = ("text/plain", "text/html")
+
+
+# mod_proxy
+# proxy.server = (
+#   ".php" => (
+#     "localhost" => (
+#       "host" => "192.168.0.101",
+#       "port" => 80
+#     )
+#   )
+# )
+
+
+# mod_auth
+# auth.backend = "plain"
 # auth.backend.plain.userfile = "lighttpd.user"
 # auth.backend.plain.groupfile = "lighttpd.group"
 
 # auth.backend.ldap.hostname = "localhost"
-# auth.backend.ldap.base-dn  = "dc=my-domain,dc=com"
-# auth.backend.ldap.filter   = "(uid=$)"
-
-# auth.require               = ( "/server-status" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "user=jan"
-#                               ),
-#                               "/server-info" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "valid-user"
-#                               )
-#                             )
-# }}}
-
-# {{{ mod_rewrite
-# see rewrite.txt
-#
+# auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
+# auth.backend.ldap.filter = "(uid=$)"
+
+#auth.require = (
+#  "/server-status" => (
+#    "method" => "digest",
+#    "realm" => "download archiv",
+#    "require" => "user=jan"
+#  ),
+#  "/server-info" => (
+#    "method" => "digest",
+#    "realm" => "download archiv",
+#    "require" => "valid-user"
+#  )
+#)
+
+
+# mod_rewrite
 # url.rewrite = (
-#	"^/$"		=>		"/server-status"
+#   "^/$" => "/server-status"
 # )
-# }}}
 
-# {{{ mod_redirect
-# see redirect.txt
-#
+
+# mod_redirect
 # url.redirect = (
-#	"^/wishlist/(.+)"		=>		"http://www.123.org/$1"
+#   "^/wishlist/(.+)" => "http://www.123.org/$1"
 # )
-# }}}
 
-# {{{ mod_evhost
+
+# mod_evhost
 # define a pattern for the host url finding
 # %% => % sign
 # %0 => domain name + tld
@@ -243,87 +216,64 @@ url.access-deny = ("~", ".inc")
 # %2 => domain name without tld
 # %3 => subdomain 1 name
 # %4 => subdomain 2 name
-#
-# evhost.path-pattern        = "/home/storage/dev/www/%3/htdocs/"
-# }}}
+# evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/"
 
-# {{{ mod_expire
+
+# mod_expire
 # expire.url = (
-#	"/buggy/"		=>		"access 2 hours",
-#	"/asdhas/"		=>		"access plus 1 seconds 2 minutes"
+#   "/buggy/" => "access 2 hours",
+#   "/asdhas/" => "access plus 1 seconds 2 minutes"
 # )
-# }}}
 
-# {{{ mod_rrdtool
-# see rrdtool.txt
-#
-# rrdtool.binary  = "/usr/bin/rrdtool"
+
+# mod_rrdtool
+# rrdtool.binary = "/usr/bin/rrdtool"
 # rrdtool.db-name = var.statedir + "/lighttpd.rrd"
-# }}}
 
-# {{{ mod_setenv
-# see setenv.txt
-#
-# setenv.add-request-header  = ( "TRAV_ENV" => "mysql://user@host/db" )
+
+# mod_setenv
+# setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" )
 # setenv.add-response-header = ( "X-Secret-Message" => "42" )
-# }}}
 
-# {{{ mod_trigger_b4_dl
-# see trigger_b4_dl.txt
-#
+
+# mod_trigger_b4_dl
 # trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
 # trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
 # trigger-before-download.trigger-url = "^/trigger/"
 # trigger-before-download.download-url = "^/download/"
 # trigger-before-download.deny-url = "http://127.0.0.1/index.html"
 # trigger-before-download.trigger-timeout = 10
-# }}}
 
-# {{{ mod_cml
-# see cml.txt
-#
+
+# mod_cml
 # don't forget to add index.cml to server.indexfiles
-# cml.extension               = ".cml"
-# cml.memcache-hosts          = ( "127.0.0.1:11211" )
-# }}} 
+# cml.extension = ".cml"
+# cml.memcache-hosts = ( "127.0.0.1:11211" )
 
-# {{{ mod_webdav
-# see webdav.txt
-#
+
+# mod_webdav
 # $HTTP["url"] =~ "^/dav($|/)" {
-#     webdav.activate = "enable"
-#     webdav.is-readonly = "enable"
+#   webdav.activate = "enable"
+#   webdav.is-readonly = "enable"
 # }
-# }}}
 
-# {{{ extra rules
-#
+
+# Extra Rules
 # set Content-Encoding and reset Content-Type for browsers that
 # support decompressing on-thy-fly (requires mod_setenv)
 # $HTTP["url"] =~ "\.gz$" {
-#     setenv.add-response-header = ("Content-Encoding" => "x-gzip")
-#     mimetype.assign = (".gz" => "text/plain")
+#   setenv.add-response-header = ("Content-Encoding" => "x-gzip")
+#   mimetype.assign = (".gz" => "text/plain")
 # }
 
 # $HTTP["url"] =~ "\.bz2$" {
-#     setenv.add-response-header = ("Content-Encoding" => "x-bzip2")
-#     mimetype.assign = (".bz2" => "text/plain")
+#   setenv.add-response-header = ("Content-Encoding" => "x-bzip2")
+#   mimetype.assign = (".bz2" => "text/plain")
 # }
-#
-# }}}
 
-# {{{ debug
-# debug.log-request-header   = "enable"
-# debug.log-response-header  = "enable"
-# debug.log-request-handling = "enable"
-# debug.log-file-not-found   = "enable"
-# }}}
 
-# {{{ cgi includes
-# uncomment for cgi support
-#   include "mod_cgi.conf"
-# uncomment for php/fastcgi support
-#   include "mod_fastcgi.conf"
-# }}}
-
-# vim: set ft=conf foldmethod=marker et :
+# Debug
+# debug.log-request-header = "enable"
+# debug.log-response-header = "enable"
+# debug.log-request-handling = "enable"
+# debug.log-file-not-found = "enable"
diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf-r1 b/www-servers/lighttpd/files/conf/lighttpd.conf-r1
new file mode 100644
index 000000000000..1017098caa4f
--- /dev/null
+++ b/www-servers/lighttpd/files/conf/lighttpd.conf-r1
@@ -0,0 +1,309 @@
+###############################################################################
+# Default lighttpd.conf for Gentoo.
+###############################################################################
+
+# {{{ variables
+var.basedir  = "/var/www/localhost"
+var.logdir   = "/var/log/lighttpd"
+var.statedir = "/var/lib/lighttpd"
+# }}}
+
+# {{{ modules
+# At the very least, mod_access and mod_accesslog should be enabled.
+# All other modules should only be loaded if necessary.
+# NOTE: the order of modules is important.
+server.modules = (
+#    "mod_rewrite",
+#    "mod_redirect",
+#    "mod_alias",
+    "mod_access",
+#    "mod_magnet",
+#    "mod_auth",
+#    "mod_status",
+#    "mod_setenv",
+#    "mod_proxy",
+#    "mod_simple_vhost",
+#    "mod_evhost",
+#    "mod_userdir",
+#    "mod_deflate",
+#    "mod_ssi",
+#    "mod_usertrack",
+#    "mod_expire",
+#    "mod_secdownload",
+#    "mod_rrdtool",
+#    "mod_webdav",
+    "mod_accesslog"
+)
+# }}}
+
+# {{{ includes
+include "mime-types.conf"
+# fcgi and cgi are included below
+# }}}
+
+# {{{ server settings
+server.username      = "lighttpd"
+server.groupname     = "lighttpd"
+
+server.document-root = var.basedir + "/htdocs"
+server.pid-file      = "/run/lighttpd.pid"
+
+server.errorlog      = var.logdir  + "/error.log"
+# log errors to syslog instead
+#   server.errorlog-use-syslog = "enable"
+
+server.indexfiles    = ("index.php", "index.html",
+						"index.htm", "default.htm")
+
+# server.tag           = "lighttpd"
+
+server.follow-symlink = "enable"
+
+# event handler (defaults to "poll")
+# see performance.txt
+#
+# for >= linux-2.4
+#   server.event-handler = "linux-rtsig"
+# for >= linux-2.6
+#   server.event-handler = "linux-sysepoll"
+# for FreeBSD
+#   server.event-handler = "freebsd-kqueue"
+
+# chroot to directory (defaults to no chroot)
+# server.chroot      = "/"
+
+# bind to port (defaults to 80)
+# server.port          = 81
+
+# bind to name (defaults to all interfaces)
+# server.bind          = "grisu.home.kneschke.de"
+
+# error-handler for status 404
+# server.error-handler-404 = "/error-handler.html"
+# server.error-handler-404 = "/error-handler.php"
+
+# Format: <errorfile-prefix><status-code>.html
+# -> ..../status-404.html for 'File not found'
+# server.errorfile-prefix    = var.basedir + "/error/status-"
+
+# FAM support for caching stat() calls
+# requires that lighttpd be built with USE=fam
+#   server.stat-cache-engine = "fam"
+
+# If lighttpd was build with IPv6 support, and you would like to listen on IPv6,
+# uncomment the following:
+# server.use-ipv6 = "enable"
+
+# }}}
+
+# {{{ mod_staticfile
+
+# which extensions should not be handled via static-file transfer
+# (extensions that are usually handled by mod_cgi, mod_fastcgi, etc).
+static-file.exclude-extensions = (".php", ".pl", ".cgi", ".fcgi")
+# }}}
+
+# {{{ mod_accesslog
+accesslog.filename   = var.logdir + "/access.log"
+# }}}
+
+# {{{ mod_dirlisting
+# enable directory listings
+#   dir-listing.activate      = "enable"
+#
+# don't list hidden files/directories
+#   dir-listing.hide-dotfiles = "enable"
+#
+# use a different css for directory listings
+#   dir-listing.external-css  = "/path/to/dir-listing.css"
+#
+# list of regular expressions.  files that match any of the
+# specified regular expressions will be excluded from directory
+# listings.
+#   dir-listing.exclude = ("^\.", "~$")
+# }}}
+
+# {{{ mod_access
+# see access.txt
+
+url.access-deny = ("~", ".inc")
+# }}}
+
+# {{{ mod_userdir
+# see userdir.txt
+#
+# userdir.path = "public_html"
+# userdir.exclude-user = ("root")
+# }}}
+
+# {{{ mod_ssi
+# see ssi.txt
+#
+# ssi.extension = (".shtml")
+# }}}
+
+# {{{ mod_ssl
+# see ssl.txt
+#
+# ssl.engine    = "enable"
+# ssl.pemfile   = "server.pem"
+# }}}
+
+# {{{ mod_status
+# see status.txt
+#
+# status.status-url  = "/server-status"
+# status.config-url  = "/server-config"
+# }}}
+
+# {{{ mod_simple_vhost
+# see simple-vhost.txt
+#
+#  If you want name-based virtual hosting add the next three settings and load
+#  mod_simple_vhost
+#
+# document-root =
+#   virtual-server-root + virtual-server-default-host + virtual-server-docroot
+# or
+#   virtual-server-root + http-host + virtual-server-docroot
+#
+# simple-vhost.server-root   = "/home/weigon/wwwroot/servers/"
+# simple-vhost.default-host  = "grisu.home.kneschke.de"
+# simple-vhost.document-root = "/pages/"
+# }}}
+
+# {{{ mod_deflate
+# see compress.txt
+#
+# deflate.cache-dir   = var.statedir + "/cache/compress"
+# deflate.mimetypes   = ("text/plain", "text/html")
+# }}}
+
+# {{{ mod_proxy
+# see proxy.txt
+#
+# proxy.server               = ( ".php" =>
+#                               ( "localhost" =>
+#                                 (
+#                                   "host" => "192.168.0.101",
+#                                   "port" => 80
+#                                 )
+#                               )
+#                             )
+# }}}
+
+# {{{ mod_auth
+# see authentication.txt
+#
+# auth.backend               = "plain"
+# auth.backend.plain.userfile = "lighttpd.user"
+# auth.backend.plain.groupfile = "lighttpd.group"
+
+# auth.backend.ldap.hostname = "localhost"
+# auth.backend.ldap.base-dn  = "dc=my-domain,dc=com"
+# auth.backend.ldap.filter   = "(uid=$)"
+
+# auth.require               = ( "/server-status" =>
+#                               (
+#                                 "method"  => "digest",
+#                                 "realm"   => "download archiv",
+#                                 "require" => "user=jan"
+#                               ),
+#                               "/server-info" =>
+#                               (
+#                                 "method"  => "digest",
+#                                 "realm"   => "download archiv",
+#                                 "require" => "valid-user"
+#                               )
+#                             )
+# }}}
+
+# {{{ mod_rewrite
+# see rewrite.txt
+#
+# url.rewrite = (
+#	"^/$"		=>		"/server-status"
+# )
+# }}}
+
+# {{{ mod_redirect
+# see redirect.txt
+#
+# url.redirect = (
+#	"^/wishlist/(.+)"		=>		"http://www.123.org/$1"
+# )
+# }}}
+
+# {{{ mod_evhost
+# define a pattern for the host url finding
+# %% => % sign
+# %0 => domain name + tld
+# %1 => tld
+# %2 => domain name without tld
+# %3 => subdomain 1 name
+# %4 => subdomain 2 name
+#
+# evhost.path-pattern        = "/home/storage/dev/www/%3/htdocs/"
+# }}}
+
+# {{{ mod_expire
+# expire.url = (
+#	"/buggy/"		=>		"access 2 hours",
+#	"/asdhas/"		=>		"access plus 1 seconds 2 minutes"
+# )
+# }}}
+
+# {{{ mod_rrdtool
+# see rrdtool.txt
+#
+# rrdtool.binary  = "/usr/bin/rrdtool"
+# rrdtool.db-name = var.statedir + "/lighttpd.rrd"
+# }}}
+
+# {{{ mod_setenv
+# see setenv.txt
+#
+# setenv.add-request-header  = ( "TRAV_ENV" => "mysql://user@host/db" )
+# setenv.add-response-header = ( "X-Secret-Message" => "42" )
+# }}}
+
+# {{{ mod_webdav
+# see webdav.txt
+#
+# $HTTP["url"] =~ "^/dav($|/)" {
+#     webdav.activate = "enable"
+#     webdav.is-readonly = "enable"
+# }
+# }}}
+
+# {{{ extra rules
+#
+# set Content-Encoding and reset Content-Type for browsers that
+# support decompressing on-thy-fly (requires mod_setenv)
+# $HTTP["url"] =~ "\.gz$" {
+#     setenv.add-response-header = ("Content-Encoding" => "x-gzip")
+#     mimetype.assign = (".gz" => "text/plain")
+# }
+
+# $HTTP["url"] =~ "\.bz2$" {
+#     setenv.add-response-header = ("Content-Encoding" => "x-bzip2")
+#     mimetype.assign = (".bz2" => "text/plain")
+# }
+#
+# }}}
+
+# {{{ debug
+# debug.log-request-header   = "enable"
+# debug.log-response-header  = "enable"
+# debug.log-request-handling = "enable"
+# debug.log-file-not-found   = "enable"
+# }}}
+
+# {{{ cgi includes
+# uncomment for cgi support
+#   include "mod_cgi.conf"
+# uncomment for php/fastcgi support
+#   include "mod_fastcgi.conf"
+# }}}
+
+# vim: set ft=conf foldmethod=marker et :
diff --git a/www-servers/lighttpd/files/conf/mime-types.conf b/www-servers/lighttpd/files/conf/mime-types.conf
index 3d7880811717..40e26c1ae9cd 100644
--- a/www-servers/lighttpd/files/conf/mime-types.conf
+++ b/www-servers/lighttpd/files/conf/mime-types.conf
@@ -3,168 +3,166 @@
 # include'd from lighttpd.conf.
 ###############################################################################
 
-# {{{ mime types
-mimetype.assign             = (
-  ".pdf"          =>      "application/pdf",
-  ".epub"         =>      "application/epub+zip",
-  ".spl"          =>      "application/futuresplash",
-  ".jar"          =>      "application/java-archive",
-  ".class"        =>      "application/java-vm",
-  ".jsonld"       =>      "application/ld+json",
-  ".json"         =>      "application/json",
-  ".mdb"          =>      "application/msaccess",
-  ".doc"          =>      "application/msword",
-  ".ogg"          =>      "application/ogg",
-  ".pgp"          =>      "application/pgp-encrypted",
-  ".sig"          =>      "application/pgp-signature",
-  ".ps"           =>      "application/postscript",
-  ".eps"          =>      "application/postscript",
-  ".rar"          =>      "applicaion/rar",
-  ".rdf"          =>      "application/rdf+xml",
-  ".rss"          =>      "application/rss+xml",
-  ".rtf"          =>      "application/rtf",
-  ".azw"          =>      "application/vnd.amazon.ebook",
-  ".cbz"          =>      "application/vnd.comicbook+zip",
-  ".cbr"          =>      "application/vnd.comicbook-rar",
-  ".exe"          =>      "application/vnd.microsoft.portable-executable",
-  ".xls"          =>      "application/vnd.ms-excel",
-  ".ppt"          =>      "application/vnd.ms-powerpoint",
-  ".docm"         =>      "application/vnd.ms-word.document.macroEnabled.12",
-  ".odt"          =>      "application/vnd.oasis.opendocument.text",
-  ".ods"          =>      "application/vnd.oasis.opendocument.spreadsheet",
-  ".odp"          =>      "application/vnd.oasis.opendocument.presentation",
-  ".odg"          =>      "application/vnd.oasis.opendocument.graphics",
-  ".odc"          =>      "application/vnd.oasis.opendocument.chart",
-  ".odf"          =>      "application/vnd.oasis.opendocument.formula",
-  ".odi"          =>      "application/vnd.oasis.opendocument.image",
-  ".pptx"         =>      "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-  ".xlsx"         =>      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-  ".docx"         =>      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-  ".vsd"          =>      "application/vnd.visio",
-  ".wasm"         =>      "application/wasm",
-  ".xhtml"        =>      "application/xhtml+xml",
-  ".zip"          =>      "application/zip",
-  ".zstd"         =>      "application/zstd",
-  ".7z"           =>      "application/x-7z-compressed",
-  ".dmg"          =>      "application/x-apple-diskimage",
-  ".torrent"      =>      "application/x-bittorrent",
-  ".bz2"          =>      "application/x-bzip",
-  ".tbz"          =>      "application/x-bzip-compressed-tar",
-  ".tar.bz2"      =>      "application/x-bzip-compressed-tar",
-  ".pgn"          =>      "application/x-chess-pgn",
-  ".deb"          =>      "application/x-debian-package",
-  ".dvi"          =>      "application/x-dvi",
-  ".mm"           =>      "application/x-freemind",
-  ".gz"           =>      "application/x-gzip",
-  ".iso"          =>      "application/x-iso9660-image",
-  ".jnlp"         =>      "application/x-java-jnlp-file",
-  ".pac"          =>      "application/x-ns-proxy-autoconfig",
-  ".rpm"          =>      "application/x-redhat-package-manager",
-  ".swf"          =>      "application/x-shockwave-flash",
-  ".tar.gz"       =>      "application/x-tgz",
-  ".tgz"          =>      "application/x-tgz",
-  ".tar"          =>      "application/x-tar",
-  ".xz"           =>      "application/x-xz",
-  ".aac"          =>      "audio/aac",
-  ".adts"         =>      "audio/aac",
-  ".ac3"          =>      "audio/ac3",
-  ".snd"          =>      "audio/basic",
-  ".mid"          =>      "audio/midi",
-  ".midi"         =>      "audio/midi",
-  ".m4a"          =>      "audio/mp4",
-  ".mp1"          =>      "audio/mpeg",
-  ".mp2"          =>      "audio/mpeg",
-  ".mp3"          =>      "audio/mpeg",
-  ".oga"          =>      "audio/ogg",
-  ".opus"         =>      "audio/ogg",
-  ".spx"          =>      "audio/ogg",
-  ".sid"          =>      "audio/prs.sid",
-  ".mlp"          =>      "audio/vnd.dolby.mlp",
-  ".dts"          =>      "audio/vnd.dts",
-  ".dtshd"        =>      "audio/vnd.dts.hd",
-  ".flac"         =>      "audio/x-flac",
-  ".mka"          =>      "audio/x-matroska",
-  ".m3u"          =>      "audio/x-mpegurl",
-  ".mod"          =>      "audio/x-mod",
-  ".wma"          =>      "audio/x-ms-wma",
-  ".wax"          =>      "audio/x-ms-wax",
-  ".wav"          =>      "audio/x-wav",
-  ".otf"          =>      "font/otf",
-  ".ttf"          =>      "font/ttf",
-  ".woff"         =>      "font/woff",
-  ".woff2"        =>      "font/woff2",
-  ".bmp"          =>      "image/bmp",
-  ".gif"          =>      "image/gif",
-  ".heic"         =>      "image/heic",
-  ".heics"        =>      "image/heic-sequence",
-  ".heif"         =>      "image/heif",
-  ".heifs"        =>      "image/heif-sequence",
-  ".jpg"          =>      "image/jpeg",
-  ".jpeg"         =>      "image/jpeg",
-  ".png"          =>      "image/png",
-  ".tif"          =>      "image/tiff",
-  ".tiff"         =>      "image/tiff",
-  ".svg"          =>      "image/svg+xml",
-  ".svgz"         =>      "image/svg+xml",
-  ".webp"         =>      "image/webp",
-  ".psd"          =>      "image/vnd.adobe.photoshop",
-  ".apng"         =>      "image/vnd.mozilla.apng",
-  ".ico"          =>      "image/x-icon",
-  ".xbm"          =>      "image/x-xbitmap",
-  ".xpm"          =>      "image/x-xpixmap",
-  ".xwd"          =>      "image/x-xwindowdump",
-  ".ics"          =>      "text/calendar",
-  ".css"          =>      "text/css",
-  ".csv"          =>      "text/csv",
-  ".html"         =>      "text/html",
-  ".htm"          =>      "text/html",
-  ".js"           =>      "text/javascript",
-  ".asc"          =>      "text/plain",
-  ".c"            =>      "text/plain",
-  ".h"            =>      "text/plain",
-  ".cc"           =>      "text/plain",
-  ".cpp"          =>      "text/plain",
-  ".hh"           =>      "text/plain",
-  ".hpp"          =>      "text/plain",
-  ".conf"         =>      "text/plain",
-  ".log"          =>      "text/plain",
-  ".text"         =>      "text/plain",
-  ".txt"          =>      "text/plain",
-  ".diff"         =>      "text/plain",
-  ".patch"        =>      "text/plain",
-  ".ebuild"       =>      "text/plain",
-  ".eclass"       =>      "text/plain",
-  ".vcard"        =>      "text/vcard",
-  ".vcf"          =>      "text/vcard",
-  ".dtd"          =>      "text/xml",
-  ".xml"          =>      "text/xml",
-  ".vcs"          =>      "text/x-vcalendar",
-  ".x3db"         =>      "model/x3d+binary",
-  ".x3dbz"        =>      "model/x3d+binary",
-  ".x3dv"         =>      "model/x3d+vrml",
-  ".x3dvz"        =>      "model/x3d+vrml",
-  ".x3d"          =>      "model/x3d+xml",
-  ".x3dz"         =>      "model/x3d+xml",
-  ".ts"           =>      "video/mp2t",
-  ".m4v"          =>      "video/mp4",
-  ".mp4"          =>      "video/mp4",
-  ".mpeg"         =>      "video/mpeg",
-  ".mpg"          =>      "video/mpeg",
-  ".ogv"          =>      "video/ogg",
-  ".mov"          =>      "video/quicktime",
-  ".qt"           =>      "video/quicktime",
-  ".webm"         =>      "video/webm",
-  ".m4u"          =>      "video/vnd.mpegurl",
-  ".bik"          =>      "video/vnd.radgamettools.bink",
-  ".bk2"          =>      "video/vnd.radgamettools.bink",
-  ".smk"          =>      "video/vnd.radgamettools.smacker",
-  ".flv"          =>      "video/x-flv",
-  ".mkv"          =>      "video/x-matroska",
-  ".mk3d"         =>      "video/x-matroska-3d",
-  ".mng"          =>      "video/x-mng",
-  ".avi"          =>      "video/x-msvideo",
-  ".asf"          =>      "video/x-ms-asf",
-  ".asx"          =>      "video/x-ms-asf",
-  ".wmv"          =>      "video/x-ms-wmv"
- )
-# }}}
+mimetype.assign = (
+  ".pdf" => "application/pdf",
+  ".epub" => "application/epub+zip",
+  ".spl" => "application/futuresplash",
+  ".jar" => "application/java-archive",
+  ".class" => "application/java-vm",
+  ".jsonld" => "application/ld+json",
+  ".json" => "application/json",
+  ".mdb" => "application/msaccess",
+  ".doc" => "application/msword",
+  ".ogg" => "application/ogg",
+  ".pgp" => "application/pgp-encrypted",
+  ".sig" => "application/pgp-signature",
+  ".ps" => "application/postscript",
+  ".eps" => "application/postscript",
+  ".rar" => "applicaion/rar",
+  ".rdf" => "application/rdf+xml",
+  ".rss" => "application/rss+xml",
+  ".rtf" => "application/rtf",
+  ".azw" => "application/vnd.amazon.ebook",
+  ".cbz" => "application/vnd.comicbook+zip",
+  ".cbr" => "application/vnd.comicbook-rar",
+  ".exe" => "application/vnd.microsoft.portable-executable",
+  ".xls" => "application/vnd.ms-excel",
+  ".ppt" => "application/vnd.ms-powerpoint",
+  ".docm" => "application/vnd.ms-word.document.macroEnabled.12",
+  ".odt" => "application/vnd.oasis.opendocument.text",
+  ".ods" => "application/vnd.oasis.opendocument.spreadsheet",
+  ".odp" => "application/vnd.oasis.opendocument.presentation",
+  ".odg" => "application/vnd.oasis.opendocument.graphics",
+  ".odc" => "application/vnd.oasis.opendocument.chart",
+  ".odf" => "application/vnd.oasis.opendocument.formula",
+  ".odi" => "application/vnd.oasis.opendocument.image",
+  ".pptx" => "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  ".xlsx" => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ".docx" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  ".vsd" => "application/vnd.visio",
+  ".wasm" => "application/wasm",
+  ".xhtml" => "application/xhtml+xml",
+  ".zip" => "application/zip",
+  ".zstd" => "application/zstd",
+  ".7z" => "application/x-7z-compressed",
+  ".dmg" => "application/x-apple-diskimage",
+  ".torrent" => "application/x-bittorrent",
+  ".bz2" => "application/x-bzip",
+  ".tbz" => "application/x-bzip-compressed-tar",
+  ".tar.bz2" => "application/x-bzip-compressed-tar",
+  ".pgn" => "application/x-chess-pgn",
+  ".deb" => "application/x-debian-package",
+  ".dvi" => "application/x-dvi",
+  ".mm" => "application/x-freemind",
+  ".gz" => "application/x-gzip",
+  ".iso" => "application/x-iso9660-image",
+  ".jnlp" => "application/x-java-jnlp-file",
+  ".pac" => "application/x-ns-proxy-autoconfig",
+  ".rpm" => "application/x-redhat-package-manager",
+  ".swf" => "application/x-shockwave-flash",
+  ".tar.gz" => "application/x-tgz",
+  ".tgz" => "application/x-tgz",
+  ".tar" => "application/x-tar",
+  ".xz" => "application/x-xz",
+  ".aac" => "audio/aac",
+  ".adts" => "audio/aac",
+  ".ac3" => "audio/ac3",
+  ".snd" => "audio/basic",
+  ".mid" => "audio/midi",
+  ".midi" => "audio/midi",
+  ".m4a" => "audio/mp4",
+  ".mp1" => "audio/mpeg",
+  ".mp2" => "audio/mpeg",
+  ".mp3" => "audio/mpeg",
+  ".oga" => "audio/ogg",
+  ".opus" => "audio/ogg",
+  ".spx" => "audio/ogg",
+  ".sid" => "audio/prs.sid",
+  ".mlp" => "audio/vnd.dolby.mlp",
+  ".dts" => "audio/vnd.dts",
+  ".dtshd" => "audio/vnd.dts.hd",
+  ".flac" => "audio/x-flac",
+  ".mka" => "audio/x-matroska",
+  ".m3u" => "audio/x-mpegurl",
+  ".mod" => "audio/x-mod",
+  ".wma" => "audio/x-ms-wma",
+  ".wax" => "audio/x-ms-wax",
+  ".wav" => "audio/x-wav",
+  ".otf" => "font/otf",
+  ".ttf" => "font/ttf",
+  ".woff" => "font/woff",
+  ".woff2" => "font/woff2",
+  ".bmp" => "image/bmp",
+  ".gif" => "image/gif",
+  ".heic" => "image/heic",
+  ".heics" => "image/heic-sequence",
+  ".heif" => "image/heif",
+  ".heifs" => "image/heif-sequence",
+  ".jpg" => "image/jpeg",
+  ".jpeg" => "image/jpeg",
+  ".png" => "image/png",
+  ".tif" => "image/tiff",
+  ".tiff" => "image/tiff",
+  ".svg" => "image/svg+xml",
+  ".svgz" => "image/svg+xml",
+  ".webp" => "image/webp",
+  ".psd" => "image/vnd.adobe.photoshop",
+  ".apng" => "image/vnd.mozilla.apng",
+  ".ico" => "image/x-icon",
+  ".xbm" => "image/x-xbitmap",
+  ".xpm" => "image/x-xpixmap",
+  ".xwd" => "image/x-xwindowdump",
+  ".ics" => "text/calendar",
+  ".css" => "text/css",
+  ".csv" => "text/csv",
+  ".html" => "text/html",
+  ".htm" => "text/html",
+  ".js" => "text/javascript",
+  ".asc" => "text/plain",
+  ".c" => "text/plain",
+  ".h" => "text/plain",
+  ".cc" => "text/plain",
+  ".cpp" => "text/plain",
+  ".hh" => "text/plain",
+  ".hpp" => "text/plain",
+  ".conf" => "text/plain",
+  ".log" => "text/plain",
+  ".text" => "text/plain",
+  ".txt" => "text/plain",
+  ".diff" => "text/plain",
+  ".patch" => "text/plain",
+  ".ebuild" => "text/plain",
+  ".eclass" => "text/plain",
+  ".vcard" => "text/vcard",
+  ".vcf" => "text/vcard",
+  ".dtd" => "text/xml",
+  ".xml" => "text/xml",
+  ".vcs" => "text/x-vcalendar",
+  ".x3db" => "model/x3d+binary",
+  ".x3dbz" => "model/x3d+binary",
+  ".x3dv" => "model/x3d+vrml",
+  ".x3dvz" => "model/x3d+vrml",
+  ".x3d" => "model/x3d+xml",
+  ".x3dz" => "model/x3d+xml",
+  ".ts" => "video/mp2t",
+  ".m4v" => "video/mp4",
+  ".mp4" => "video/mp4",
+  ".mpeg" => "video/mpeg",
+  ".mpg" => "video/mpeg",
+  ".ogv" => "video/ogg",
+  ".mov" => "video/quicktime",
+  ".qt" => "video/quicktime",
+  ".webm" => "video/webm",
+  ".m4u" => "video/vnd.mpegurl",
+  ".bik" => "video/vnd.radgamettools.bink",
+  ".bk2" => "video/vnd.radgamettools.bink",
+  ".smk" => "video/vnd.radgamettools.smacker",
+  ".flv" => "video/x-flv",
+  ".mkv" => "video/x-matroska",
+  ".mk3d" => "video/x-matroska-3d",
+  ".mng" => "video/x-mng",
+  ".avi" => "video/x-msvideo",
+  ".asf" => "video/x-ms-asf",
+  ".asx" => "video/x-ms-asf",
+  ".wmv" => "video/x-ms-wmv"
+)
diff --git a/www-servers/lighttpd/files/conf/mod_cgi.conf b/www-servers/lighttpd/files/conf/mod_cgi.conf
index 982333a007c6..9897af78eafc 100644
--- a/www-servers/lighttpd/files/conf/mod_cgi.conf
+++ b/www-servers/lighttpd/files/conf/mod_cgi.conf
@@ -3,30 +3,22 @@
 # include'd by lighttpd.conf.
 ###############################################################################
 
-#
-# see cgi.txt for more information on using mod_cgi
-#
-
 server.modules += ("mod_cgi")
 
-# NOTE: this requires mod_alias
+# this requires mod_alias
 alias.url = (
-     "/cgi-bin/"	    =>	    var.basedir + "/cgi-bin/"
+  "/cgi-bin/" => var.basedir + "/cgi-bin/"
 )
 
-#
 # Note that you'll also want to enable the
 # cgi-bin alias via mod_alias (above).
-#
 
 $HTTP["url"] =~ "^/cgi-bin/" {
-    # disable directory listings
-    dir-listing.activate = "disable"
-    # only allow cgi's in this directory
-    cgi.assign = (
-		".pl"	=>	"/usr/bin/perl",
-		".cgi"	=>	"/usr/bin/perl"
-	)
-}
-
-# vim: set ft=conf foldmethod=marker et :
+  # disable directory listings
+  dir-listing.activate = "disable"
+  # only allow cgi's in this directory
+  cgi.assign = (
+    ".pl" => "/usr/bin/perl",
+    ".cgi" => "/usr/bin/perl"
+  )
+}
\ No newline at end of file
diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
index 5d5ea51ef252..515e7c52aafd 100644
--- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf
+++ b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
@@ -4,13 +4,12 @@
 ###############################################################################
 
 server.modules += ("mod_fastcgi")
-fastcgi.server = ( ".php" =>
-		            ( "localhost" =>
-			            (
-				            "socket"		=>		"/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
-				            "bin-path"	=>		"/usr/bin/php-cgi"
-			            )
-		            )
-	            )
 
-# vim: set ft=conf foldmethod=marker et :
+fastcgi.server = (
+  ".php" => (
+    "localhost" => (
+      "socket" => "/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
+      "bin-path" => "/usr/bin/php-cgi"
+    )
+  )
+)
diff --git a/www-servers/lighttpd/files/lighttpd.initd-r1 b/www-servers/lighttpd/files/lighttpd.initd-r1
new file mode 100644
index 000000000000..f355a5c7232d
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd.initd-r1
@@ -0,0 +1,79 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload graceful"
+
+LIGHTTPD_PID="$($(which lighttpd) -pf ${LIGHTTPD_CONF} | grep server.pid-file | cut -d '=' -f 2 | tr -d \\\" | tr -d [:space:])"
+
+depend() {
+	need net
+	use mysql logger spawn-fcgi ldap slapd netmount dns
+	after famd
+	after sshd
+}
+
+checkconfig() {
+	if [ ! -f "${LIGHTTPD_CONF}" ] ; then
+		ewarn "${LIGHTTPD_CONF} does not exist."
+		return 1
+	fi
+
+	if [ -z "${LIGHTTPD_PID}" ] ; then
+		eerror "server.pid-file variable in ${LIGHTTPD_CONF}"
+		eerror "is not set. Please set this variable properly"
+		eerror "and try again"
+		return 1
+	fi
+	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
+}
+
+start() {
+	checkconfig || return 1
+	# Glean lighttpd's credentials from the configuration file
+	# Fixes bug 454366
+	LIGHTTPD_USER="$(awk '/^server.username/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
+	LIGHTTPD_GROUP="$(awk '/^server.groupname/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
+	checkpath -d -q -m 0750 -o "${LIGHTTPD_USER}":"${LIGHTTPD_GROUP}" /run/lighttpd/
+
+	ebegin "Starting lighttpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \
+		--pidfile "${LIGHTTPD_PID}" -- -f "${LIGHTTPD_CONF}"
+	eend $?
+}
+
+stop() {
+	local rv=0
+	ebegin "Stopping lighttpd"
+	start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}"
+	eend $?
+}
+
+reload() {
+	if ! service_started "${SVCNAME}" ; then
+		eerror "${SVCNAME} isn't running"
+		return 1
+	fi
+	checkconfig || return 1
+
+	ebegin "Re-opening lighttpd log files"
+	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
+		--signal HUP
+	eend $?
+}
+
+graceful() {
+	if ! service_started "${SVCNAME}" ; then
+		eerror "${SVCNAME} isn't running"
+		return 1
+	fi
+	checkconfig || return 1
+
+	ebegin "Gracefully stopping lighttpd"
+	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
+		--signal INT
+	if eend $? ; then
+		rm -f "${LIGHTTPD_PID}"
+		start
+	fi
+}
diff --git a/www-servers/lighttpd/lighttpd-1.4.64.ebuild b/www-servers/lighttpd/lighttpd-1.4.64.ebuild
new file mode 100644
index 000000000000..567635bdc540
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.64.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools lua-single readme.gentoo-r1 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Lightweight high-performance web server"
+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 ~sparc ~x86"
+IUSE="+brotli dbi doc gnutls ipv6 kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	mysql? ( dbi )
+	postgres? ( dbi )
+	sqlite? ( dbi )
+	webdav? ( sqlite )
+"
+
+COMMON_DEPEND="
+	acct-group/lighttpd
+	acct-user/lighttpd
+	virtual/libcrypt:=
+	brotli? ( app-arch/brotli )
+	dbi? (
+		dev-db/libdbi
+		mysql? ( dev-db/libdbi-drivers[mysql] )
+		postgres? ( dev-db/libdbi-drivers[postgres] )
+		sqlite? ( dev-db/libdbi-drivers[sqlite] )
+	)
+	gnutls? ( net-libs/gnutls )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2.1.26 )
+	lua? ( ${LUA_DEPS} )
+	maxminddb? ( dev-libs/libmaxminddb )
+	mbedtls? ( net-libs/mbedtls )
+	nettle? ( dev-libs/nettle )
+	nss? ( dev-libs/nss )
+	pcre? ( dev-libs/libpcre2 )
+	php? ( dev-lang/php:*[cgi] )
+	rrdtool? ( net-analyzer/rrdtool )
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( >=dev-libs/openssl-0.9.7:0= )
+	system-xxhash? ( dev-libs/xxhash )
+	unwind? ( sys-libs/libunwind )
+	webdav? (
+		dev-libs/libxml2
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	zstd? ( app-arch/zstd )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc?  ( dev-python/docutils )
+	test? (
+		virtual/perl-Test-Harness
+	)"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${D}/etc/lighttpd/lighttpd.conf"
+
+	# enable php/mod_fastcgi settings
+	if use php; then sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; fi
+
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	if use ipv6; then sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; fi
+}
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}."
+	fi
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_prepare() {
+	default
+	# 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
+}
+
+src_configure() {
+	# The lua bit requires a bit of explanation. The lighttpd autoconf script
+	# handles the value passed to --with-lua as follows:
+	#  - "no" - do nothing
+	#  - "yes" - query pkgconfig for VERSIONED lua packages, starting with 5.3
+	#    and going down; only if lua5.1 cannot be found plain "lua" is tried
+	#  - any other value is passed to pkgconfig as the exact package name to use.
+	# We want a specific implementation to be used even if a newer one is present
+	# in the system so we use the latter mode.
+	econf \
+		CC_FOR_BUILD=$(tc-getBUILD_CC) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_enable mmap) \
+		$(use_with brotli) \
+		$(use_with dbi) \
+		$(use_with gnutls ) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with lua lua ${ELUA}) \
+		$(use_with maxminddb) \
+		$(use_with mbedtls) \
+		$(use_with nettle) \
+		$(use_with nss) \
+		$(use_with pcre pcre2) \
+		$(use_with sasl) \
+		$(use_with ssl openssl) \
+		$(use_with system-xxhash xxhash) \
+		$(use_with webdav webdav-props) \
+		$(use_with webdav webdav-locks) \
+		$(use_with xattr attr) \
+		$(use_with zlib) \
+		$(use_with zstd) \
+		$(use_with unwind libunwind)
+}
+
+src_compile() {
+	emake
+
+	if use doc ; then
+		einfo "Building HTML documentation"
+		cd doc || die
+		emake html
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		default_src_test
+	else
+		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd-r1 lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+
+	# configs
+	insinto /etc/lighttpd
+	newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+	# update lighttpd.conf directives based on conditionals
+	update_config
+
+	# docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
+	if use ipv6; then readme.gentoo_create_doc; fi
+
+	if use doc; then dodoc -r doc; fi
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" "${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	if use ipv6; then readme.gentoo_print_elog; fi
+
+	if [[ -f ${ROOT}/etc/lighttpd.conf ]] ; then
+		elog
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
+		elog "existing configuration."
+	fi
+
+	if use brotli || use zstd || use zlib; then
+		elog
+		elog "Remember to clean your cache directory when using"
+		elog "output compression!"
+		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
+	fi
+
+	if use mysql; then
+		elog
+		elog "Note that upstream has moved away from using mysql directly"
+		elog "via mod_mysql and is now accessing it through mod_dbi. You"
+		elog "may need to update your configuration"
+	fi
+
+	elog
+	elog "Upstream has deprecated a number of features. They are not missing"
+	elog "but have been migrated to other mechanisms. Please see upstream"
+	elog "changelog for details."
+	elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
+}
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index 25fe93ef41cd..df57890b0f75 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -10,25 +10,27 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
-		lighttpd is a secure, fast, compliant and very flexible web-server
-		which has been optimized for high-performance environments. It has a very
-		low memory footprint compared to other webservers and takes care of cpu-load.
-		Its advanced feature-set (FastCGI, CGI, Auth, Output-Compression,
-		URL-Rewriting and many more) make lighttpd the perfect webserver-software
-		for every server that is suffering load problems.
+		lighttpd (pronounced /lighty/) is a secure, fast, compliant, and very
+		flexible web server that has been optimized for high-performance
+		environments. lighttpd uses memory and CPU efficiently and has lower
+		resource use than other popular web servers. Its advanced feature-set
+		(FastCGI, CGI, Auth, Output-Compression, URL-Rewriting and much more)
+		make lighttpd the perfect web server for all systems, small and large.
 	</longdescription>
 	<use>
-		<flag name="brotli">Enable output compression via Brotli (recommended)</flag>
+		<flag name="brotli">Enable output compression via <pkg>app-arch/brotli</pkg> (recommended)</flag>
 		<flag name="bzip2">Enable output compression via bzip2</flag>
 		<flag name="libev">Enable fdevent handler</flag>
-		<flag name="gnutls">Build module for TLS via GnuTLS</flag>
-		<flag name="maxminddb">Add support for geolocation using libMaxMindDB</flag>
-		<flag name="mbedtls">Build module for TLS via Mbed TLS</flag>
-		<flag name="mmap">Use mmap with files owned by lighttpd. This is a dangerous option as it may allow local users to trigger SIGBUS crashes.</flag>
+		<flag name="gnutls">Build module for TLS via <pkg>net-libs/gnutls</pkg></flag>
+		<flag name="maxminddb">Add support for geolocation using <pkg>dev-libs/libmaxminddb</pkg></flag>
+		<flag name="mbedtls">Build module for TLS via <pkg>net-libs/mbedtls</pkg></flag>
+		<flag name="mmap">Use mmap when sendfile is not available</flag>
+		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> as crypto backend</flag>
 		<flag name="nss">Build module for TLS via Mozilla's Network Security Services</flag>
 		<flag name="rrdtool">Enable rrdtool support via mod_rrdtool</flag>
+		<flag name="system-xxhash">Use system provided <pkg>dev-libs/xxhash</pkg></flag>
 		<flag name="webdav">Enable webdav properties</flag>
-		<flag name="zlib">Enable output compression via gzip or deflate algorithms</flag>
-		<flag name="zstd">Enable output compression via Zstandard algorithm</flag>
+		<flag name="zlib">Enable output compression via gzip or deflate algorithms from <pkg>sys-libs/zlib</pkg></flag>
+		<flag name="zstd">Enable output compression via Zstandard (<pkg>app-arch/zstd</pkg>) algorithm</flag>
 	</use>
 </pkgmetadata>