gentoo auto-resync : 24:10:2022 - 03:51:17

author: V3n3RiX <venerix@koprulu.sector> 2022-10-24 03:51:17 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-24 03:51:17 +0100
commit: 1e9275d80771f014d7754407ca8ab9d7c43247b0 (patch)
tree: 2843c5027c4bae59c7cc5dc677e3021510cf96ee
parent: ba3d6ddada23eaa04f85228bee3438ab479b4442 (diff)
71 files changed, 1672 insertions, 308 deletions
diff --git a/Manifest b/Manifest
index 7532657d342b..66733774fefb 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29616 BLAKE2B 7e7eae8404f4828a503569d2e6d0ebec75ece97a6803ad40d73c3359d656c13cb5976337198d7bcfd286a81e2f9d7dcfc6ea0f88d3a6d143538e23d3090a2d82 SHA512 8e8f8ba33c9a3acfa1bf484b43ab55ac5f7fdc6ad56da58d63b01df6bb5aced56c0c2bca38f3a273d2da948251069c5b7824b1ee7e64e5b740fd980739d141e8
-TIMESTAMP 2022-10-23T20:09:42Z
+MANIFEST Manifest.files.gz 29624 BLAKE2B 00c4923a4ca738126a0b8ca8d504c336abcdc29a9b3a319630f5f254254cad0520dc54b0bb2e584519649e71b2700bce57408b11ec1f47b4df231b923e345e16 SHA512 d2a353dd63997ace0fb55e7f2e99efa846da16fe91788854e0ba1aada9c24ef6a4c1094bd2fa43bdeac7b390e733b7e9138c9f75dc7d1beb8a6ab734695cd5a6
+TIMESTAMP 2022-10-24T02:10:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNVn4ZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNV9DBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA7iA//XApxG/op+QVNvhHmYMAZtOj0SD42VvlZev5MaMB8Q5d0NFJ6i6+CRPIe
-Oer8IbHBDY4ytuF56zMqBOzdbi5123wEUksbhXMcKWjNkbfCme6hnK97ah6JOi+U
-fG0r4deF/ALwZvrdyt/QLm5iociZA4utMRUCUJLVENpht4hda27KdSQrmkRcHOv4
-C6DCcCyWXFNereh6lm/XPc+UFVgxcONbZzQZHTKbOpsYGsLB0lcNhh2EgC+PVUBj
-tP15sSj06bbMTI9EQpSDVVm77sCoTgQxZTwDCIXELR59Kx3Vf6kLSW3cx8lX/jgS
-7Hfg3GmL/YrwpLbaJI+T0150IKpjCqgZYPT1dUgxcCdsuA8DkX1Ery4UgFo54kxu
-XI3OP6UOHPjwvqkgCEnkYnBV86sq842szg10XbF0nf95T8Rghv8H7/ULFS52aK8p
-jf/lLBERu+Qtwu0y5IWxVLrkw7s4nv4eHX3IsODBii/vhZBd5REa/r/25MbYdaiy
-V3G9sHXgFp/C783f/mJooC4PAW66bhc7V15GQbb4uo4C3U0yErTam71cjI1wBKLi
-aZUKG4nssh6+Sy9RaKKX14AsnsUx7MBTJ/x0bgdG6z7d9neFq8ImnQ77gOxrbSM5
-mNyRAXFCfSxWyS1TZuDyOg1mHnMcMu9gdozO4M5ZpY0ZTKRRbA0=
-=S15Z
+klBexA//QM4zSYtfmWxDwclPVq70hqvhmat3dfiNOU0Ww0A3au/bQo1iR+3wi+yA
+iTsshmpINU0CN7uLDc3XwHFF4qrQzURfmt6XdzYqNrcx+khuWYnROMMttpJjXpmc
+Qt2lJwzYUs7g7uFQfp5Ye0xhraYoGkINmlKvNFE/lRxnobmMFV+Ryby0Dh6usEyI
+bbbvo4hHx+jZhCR0/03s/wxPl/X8hsBBrtHW8Uct3LBrnMEGH6kJnfS2DEhPMBHg
+DtyVL69xkodVTsr9FlDRbZ8KpvpiRsDxJsVCq/t7qwEO4idjPC7t52Lm5iACTSIP
+f+ieeEZHTEutBCFx2N4U47lxBg+1SQ8TgAWpIMcgkTa8VlPDDK9f111QhiUGl2WO
+V6KjEriDrszmhS7Vv9cQ/BK28Z/VJ0MSCQ01CtYjK1sNzc/wq8MyJQwDuY/FIrZl
+ODerEb5IbKT28v0qsKM9GJGWYqhJRfp7yd/giKRhx5aQ5N4d3jG5FULTDwmvLK44
+Dc3twio+IDu+jzvR5s/U/zNOyTcPQRXwIDvU+v42vi93gyiziGJc4tKuNLCyjrAQ
++LxK7LSdu+O52KcWJXEOfjAMS7SlVwaxvtt5JK9VbuRifDGuw0B9jy9St+fod+VY
+yKim6xJo88+7MaYL3rLZjcVntzbrkxy0Ht0wBxh//EPtHVCOADQ=
+=+n8G
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2de28debca16..48d32f4ca26c 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ea2ae355ca86..2033ca86b909 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index d291d8815ba9..3be5054965d4 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,4 +1,3 @@
-AUX zathura-0.4.8-meson-0.61-build.patch 814 BLAKE2B 692fa4e525d8ca5bad33e1e36a288832509da06399db895f53235709db2367e4011a58d6b6632ee8850677619e6cf8a8d419989737af4cbfc6b6ed04ed8ea83e SHA512 ebf7769d5775f60e57521bdbfbc5a749c584ed706dc0f28d63ec2b6de6e5324a1835ad6f66827301a8ccedb3f2e4b6d60822c0176d63a52173b37fbf36e8f5ce
 DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10
 EBUILD zathura-0.4.9.ebuild 1355 BLAKE2B 82e932b9fddd23316066c358a6aede8480532c970a992270f9f6fa2a3c7545b4286249d4ce9a96b9079500ede0e2371fe8682e2b234a93c4e351d1781507b7ea SHA512 7978966e9716677442b274af5792aa3e2a682f7e1963ed6c3ed094f322e8a12db1118525b06c600c407c362177584c543679de2583cfadfd5e4ad95e86d30734
 EBUILD zathura-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
diff --git a/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch b/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch
deleted file mode 100644
index 577eddc4da1f..000000000000
--- a/app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/pwmt/zathura/commit/c6ec5044c5ff843979050bfb81742d14740bb656.patch
-https://bugs.gentoo.org/831468
-
-From: Sebastian Ramacher <sebastian@ramacher.at>
-Date: Sat, 30 Oct 2021 15:41:25 +0200
-Subject: [PATCH] Fix build with meson 0.60
-
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,7 @@ endif
- i18n = import('i18n')
- podir = join_paths(meson.project_source_root(), 'po')
- 
--desktop = i18n.merge_file('desktop',
-+desktop = i18n.merge_file(
-   input: 'org.pwmt.zathura.desktop.in',
-   output: 'org.pwmt.zathura.desktop',
-   install: true,
-@@ -28,7 +28,7 @@ desktop = i18n.merge_file('desktop',
-   type: 'desktop'
- )
- 
--appdata = i18n.merge_file('appdata',
-+appdata = i18n.merge_file(
-   input: 'org.pwmt.zathura.appdata.xml.in',
-   output: 'org.pwmt.zathura.appdata.xml',
-   install: true,
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index b14db04ba884..06063b458b54 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest
index 18aecd2c9ef4..dea102dc1bd1 100644
--- a/dev-lua/luajson/Manifest
+++ b/dev-lua/luajson/Manifest
@@ -1,3 +1,3 @@
 DIST luajson-1.3.4.tar.gz 46941 BLAKE2B 50c8c20c487f92fd19b3e080a87eec58c2cb30d83dfc6acd7aca3f155a04f85a194c069f735a2881e14b0eb3fd3b16e4a75ea625ac81c65b9e25cb1c3601673c SHA512 d24dc8399337b96cde3254a83e5cc1fa995b76f0e1fae54ad91a490f0a6f4c5d0927919320f99d7bc4238ac5529d0ea57435c6be2519fb52e2a83f5005fbc4f7
-EBUILD luajson-1.3.4-r100.ebuild 831 BLAKE2B 459a96bb50d08b8471d5e43a71bdb8cf2ecc6d95c9bd304599b96a1bd7419d38c7354ee6fbdcc759e65daa036c4149dc90b624c7035dfaa1b45b15a3ff5df3e7 SHA512 dc035358284a6a96aa83ede86a79e347c76fbb1ba0e11860c4157708938c6648d04533f86baba681e88f53aad59afad5b690555d49dc077c93bdc6a178a35de0
-MISC metadata.xml 254 BLAKE2B 295771fad4c91714216a3c9781eead175fd9c594a40d0d0f682a38bd97fe84f34b79c6ea4c7b2d07727b43c3f56fce0eddc2078722474426dd95a627ade00c60 SHA512 35f431c5774ecf9f60707f6fb52c84dfe400d4f66d3d9164a86b1c726444f4e6e497740d08a1ef8b3296ed92f1fa4b6e9e56f4d3c164015c3917aa9fdc5652c9
+EBUILD luajson-1.3.4.ebuild 831 BLAKE2B d6596f65a8ee76edbffacb64955cc246a8674b8a56e195af4ddd0734a38384e2dd2f3705f321fee5ce7bd190783a0490496c34b13e9328dc7c08e18c37f0c4ed SHA512 706c1b5231d9dd1ee33bb2b084cbe36beabb2bc27744c53b314d35c042812249ace650358a17e75d54d4576484474a5e52e2175f7bdb4f9bc1d9bdb696d51936
+MISC metadata.xml 332 BLAKE2B 36b6a37a12ddd9090870a7107c6ca23f9bc0ee42d02b6dfbc47eb7ae9d790be0c441fd2296d8b00fcd5dfa4aefab82fb9dfc3abee539f596769404394b91fdde SHA512 c8762aa9ac81b31b966c236dc8a26c53cdef9c6c501f354edd351e2e0959f442846be38f09df7f6ffb187d99abe6e67c4b528a01c6dbf74514c1e170506b0faa
diff --git a/dev-lua/luajson/luajson-1.3.4-r100.ebuild b/dev-lua/luajson/luajson-1.3.4.ebuild
index d84fee782294..cabddc0c9358 100644
--- a/dev-lua/luajson/luajson-1.3.4-r100.ebuild
+++ b/dev-lua/luajson/luajson-1.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua
 
diff --git a/dev-lua/luajson/metadata.xml b/dev-lua/luajson/metadata.xml
index ef117d229b64..b201c0bb4186 100644
--- a/dev-lua/luajson/metadata.xml
+++ b/dev-lua/luajson/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">harningt/luajson</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">harningt/luajson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index b116436dd0a5..7ba7db191c22 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
index 0c5afe3e5dbf..bfc4283c1b4d 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -2,22 +2,33 @@ AUX rocksndiamonds-4.1.0.0-CVE-2011-4606.patch 961 BLAKE2B 10eae087eb32a90ae0f05
 AUX rocksndiamonds-4.1.0.0-YN.patch 700 BLAKE2B 92cdef21f6a301b37671fd2748b72f0b774861644fe75b480a99230ea0b4df6525207d09e661125e42aa20375ac4da0be96c5dc308a58ad237969a736f87bcb7 SHA512 3781a5ac8c43fdf6372c5e74b3ab3e57eeaff6adb814a590330a457b1ef8c37447d93e549745fa96fec3fc45e463d7669982aeda58fabd6ac8e20708746f6859
 AUX rocksndiamonds-4.1.0.0-music-info-url.patch 2598 BLAKE2B 9edde25c6306eebf10e365828b367fb090972e16aba53010c5ea1bba4628e4ec1cebcf13a80e5a68e19c00d84db0b0347e891411f3dc19a4b117b5c82b6c39bd SHA512 64a6908f7cf9e9d332634e8222c71b30fecbc550e49433d619a58f4a1a5c688e757c1c035bfc1a6d1c2a672921219e3390b87b8b96f0b4abefcc2048bec94038
 AUX rocksndiamonds-4.1.4.1-gcc10.patch 987 BLAKE2B 6cba0dccb2a41df79a6d19695619923de7b3b770511c8cf18781ce4ce250d163d8249ed56e9a71528c4f3f679bb2ad287e6b254d2f09e994ef220c870aaaf771 SHA512 0188f5558d1546bd162734f1028d32d56c1109604b2837ea3e5a815b06ef7951bc5e01f9bf13e47373b176e344975a4f4cdbfbaec400d6b0456f1f0d4c2d1ce1
+DIST Andreas_Buschbeck-1.0.0.zip 18331338 BLAKE2B b6520ab10ce62d4bec804a2a7e1c4908a683f9f3833e5b1d4c64d376eb4225abc38c44a519bed8cbbd3fc928bfdddda17f292b0011805e45a30b84101dad9d1d SHA512 1b47914561aea5b07035cc70f8b1b6d35f0c829d89327713ad644d82225e778a7ffd27f9d421c40dd303f85c9fc0774244dd97d405f5db866ba3d1f8027151e4
 DIST BD2K3-1.0.0.zip 4715324 BLAKE2B 72e25038c41a7a1c29a896459db97954d18731d6980f5096c28ebddb09c0b6d7bdb68a8c56f17d26c71085e4ae883d2ceaad8e95b5525cbf532d18f32ecdd638 SHA512 80f172584d2077a3ade0749790802ef9cecde75283d6b889e7d2fedf9b55fd1fd7f1f1fd5596b17d5b2a542172699a929ea626086e77d28fde11487440c43622
 DIST Boulder_Dash_Dream-1.0.0.zip 10923437 BLAKE2B 976156c763281b993550a08361c5b6279a471e24568205c0369cc3f57d99e97db84d914a560c909b30fe92b8c8c10931cf6a8a8de4da181edac410a770d922b7 SHA512 f2765f52653b4f9d6c4a6548076281f6749d08c2dfd220345bdc0058b94d51c49ef81acdc87ff71bc1b3f337f3cc6a1d08b9e5a02d6aaeaeac5d894f97ba3d8e
 DIST Contributions-1.2.0.zip 9499312 BLAKE2B a90a84d230ab1032819bc3821871eb027ed83a8e289b01692f80185c42d50429ca8c6928b72b1ae5ea102ba2a0d25cd25391dc53b0cdb37ef4504233292dc2da SHA512 463e629bd4f592e24a82d20f1f249cea9e266a7c370bb5b079add8daa125d1af69a69746b696dd92f89b90e50972c6b2ba007aab87beed4cd980c0c7bdb81920
 DIST Emerald_Mine_Club-2.1.1.7z 20992125 BLAKE2B deb8e60058ead5e6b8df2c58f5c88da5fc9c1282a7f4a4c85c8e35f3f5c25fefe552d6440401093403cf2b0967c7a39cd1ec9c5926fa780aa6b224ed6bfe7804 SHA512 b45ca6c9163c28b0d000d783cd8a66fccd23a8c4ad2c7200366c6900fc31284d50a55171a12272d8bf117f135fb68810ac3f28e8708b9e47a98dbf0f53dd3d21
+DIST Emerald_Mine_Club-3.1.3.7z 45669526 BLAKE2B 8cc44ba75c67bf2b53b042b07b9cf160f42155559137a873676fff773757760c0d5084b6646e2a1127bd4454beb16e4d5a8ec263c7db36cb782cf0655bba3e8d SHA512 bb4eb28515d01b9bc8fd3a542a017091e7e27ab5a043c3fad128f8ea4deb0ec14edbc026cccc28a6c6d998a882e5bcfef9a7dcb59d478459f49b654f7ea6b9be
 DIST RS_MIX_01-needs_rnd_jue.zip 288339 BLAKE2B 08d08e934af95543d2027805d91f5c8b2806c2da74a8cdfed61afe26be5696a832cbac7e7aae30a314a2414b7d5a82b53b8556f7098c6570a54a26d751785347 SHA512 546fc50d089493a41f01895f16a7e96e664a472d61b1f92ebc391006c10142b493a55854d892019b0ff19fe318b4b67f78c137d7e1466c5fa4d49fbb521d7a48
+DIST RS_MIX_01-standalone.zip 17982550 BLAKE2B 829055ec48c5de31b8bb0edc3eb5dc8f60001e1cbfa7cd85706e635b2389fd800d22fbe657ceac64c0e3cc7725dbfef23d518d53df1cc35bf8a2aa25ece7cac6 SHA512 1ea070017f80c47c9eff29b644e30b0ae4d5eb78e11dfef10fd183aad7b8af981af74728883f9d223d63b24361a7c5449a68558d142a0f391d102f14f22ceaa5
 DIST Snake_Bite-1.0.0.zip 6506066 BLAKE2B 852f7815939100f78d6a7ce27df565277f6467cc63c069f77d4e067f0144df092c3b6e73a64d0a9743033d90b20d390761046b253c188fd65873f7b28bf8b451 SHA512 82131cb68c9654cb49ddbb46b0c15f13ce98af4f3b2a46e1cc4f2980eea45a707297c74787f365996321f39a9f7656a9492c3d437e3da0d71a295447c868960e
 DIST Sokoban-1.0.0.zip 295339 BLAKE2B e263e311e58dcc21d11dd10b0fa7af0f871405d932c2e1ea6d580ec58098c6a498202b516cbd3d2f1dd795521b419de61c8c9a195f4b2ea781a35ac645cd9c59 SHA512 b63be5b00c4c0b153bb6fc45fde556c26cd49fa672b279cce2f61b572d9c056d5e10a565530bdf539024d75ffdd38efe68310e98b8f810d9c5dfc17b24ec376b
 DIST Supaplex-2.0.0.zip 13023727 BLAKE2B 0ea4077d66af893e5f42d8857138e4c926c02d6f75642b5a316c4e606d4c3dfb0655c71530a4becfcc6c536727b908122d413fe37cd8f3b094b629f27f31a3d9 SHA512 75641f603499bce062b74657ac1718b7009eed1159504088807ed77600f07b76775d986859e03e2e1bc0693c58850ed94711e1def74eb73a8c92fcc517de5886
 DIST Zelda-1.0.0.zip 2175860 BLAKE2B 8c44e67a0e04a992675c1f14acd07c2537873adc1f38f495dd6b12f45eb67962164664a24128ba3abfd602f59eedf9407be8a45800a5aa2e5086473a9b1b403d SHA512 930235aa784cb8304af811144c1c33cd92f5cfda1e744ea04836e9d817223c09dfcd7be6d4d66a050bd50474f7c3e5547f69c166124df288e596f486eeeb426e
 DIST ZeldaII-1.0.0.zip 11542241 BLAKE2B abe6a8407148478e3ea8a4a9561ffef2a7e193419b65877aeb5844700d6a15d83387140195567029f356a4ead331eff6c6575d074fa522b099f6810519111287 SHA512 9e7fb213251e790b2415745c5a4de671902439abff0d90b8cbb9cfaf90b01b7bb124f8c95360516f93100ccec66d2cddbcefb7a05dfb395b74854568c74c186e
+DIST es_b_v1-2.zip 302152 BLAKE2B 2da45a024f8d71d2ce1cad07ecdf7f066c48f6aeec0d79cd49270ae7e48d26e087829972335b77ec5b4b7315c7f30ccf54efd9f42ad44a4e3e9cb55d73d7b2e4 SHA512 93736f0c2187a4a0c619889ee081e4c3ba066a08d1dd765d393a3866161bb987137c46faff2d629880540f5ec9e148453db61c8cf160b25556e95af2bb7cec81
+DIST ese_v1-1.zip 318685 BLAKE2B abf479f873112ef7f76087155e168e0100923545f40ea7912653eec55f07b38b5d6a18de57d1ecd720bc40d0438051a7f1b0eb2533bf8fa81d8cec402867941b SHA512 fe3b5f537f76d37be95ace2ee158b2f917165099cb1d6805bb05e19fa9f0c8eae68e5c41b5db81298629593814692693e7d2bc2a87415980f28cc3065409e943
 DIST rnd-contrib-1.0.0.tar.gz 3389242 BLAKE2B bcdc926a7164788c8c640bf1aced57fbe9d71d99332751d2c4e30460427cb09a30ee3e45f2e6b6a1d83cce9bdf4c92ab187a2385a57bdc2a893735bd19c64b9b SHA512 8bd82f9c34e6e2d2b7ea22fc5899e72a64587469bfb1336d0d33e6ee2bcd04b3b6adca958861b0e29e18e8dac74651c642126511cacb247072e367783a5c6a08
 DIST rnd_jue-v8.tar.bz2 17244645 BLAKE2B 92d0cf646296b065c9ebe54d8d5ecb831eeb49748e47b6d2f019c2fd359d1e6ef5d3cd0472f1247e5c41b6b5aa7154b9e3baae000defc83b24470163a9dfc416 SHA512 cbff4cd16c812d77fe8446da4016d8f75dfa8675298a745062ff53a7783a39a59cffd886fedf1097023e72e111f10ddd56f280a109058a1a8ee069d664d2c59c
 DIST rockslevels-dx-1.0.tar.gz 211151 BLAKE2B 637a600f9197925d82e7ef344c90f04e8508c6b114fd07ad00977d91a856ff85dc29207e5f22c659382ee0759f8607e9dc8ad0c0de3826d57b74d494320b57ad SHA512 2e1bc4484a76bf638e8ce285972b20b6377e0483abb2475e2343d48de1f84ee102f430049d685b89bc1087e0f20b9b6e29370f8e6cae66b480d3650be9991f44
 DIST rockslevels-emc-1.0.tar.gz 3824268 BLAKE2B 0feadd5d9c6225c8574576281d07e14ff98fc9a33c67d3fa5083219ce39daaa1902a5ed652b5379fa4e58ee2428a8a452d66520571206143fd0fcd54f71b977a SHA512 9abad888fa00bc305444367c5ab8ffdad95eaca22613573e44d5ecd93b1a9a1cbc931497c064002d90fd3174c4661d0b009ede7746b2fe8da0a00072303a1301
 DIST rockslevels-sp-1.0.tar.gz 373564 BLAKE2B 3f724ea55bbdaae80a35d6a9f5d8751a9228862fbe1ba45419343b1968510e10d3c82cc01844e35bc35561e65df3bc7e5ec2a0b807e1f56359dc7dccc16e3cb0 SHA512 2d44e9238a72846b9d4fbab90288aa3b23af4957ffe0d42d95c523fd22f3587572864b3fc0b277894d2f3f56d6eff52ea009e5b2d59aebc34163a1067662d729
 DIST rocksndiamonds-4.1.4.1.tar.gz 3982860 BLAKE2B c19baf38f77c9b9eaaf7c57e9b43d4862a0ff677d99753d6520b9e4746f6340d7f3a2cf8d3e6b692230bf49289cc2aef29d7a846d2d1e0ad162e55f6433634a2 SHA512 eb66dd0fcc162c522384b1c2fb7b380a6a460a4078dd0ffb5f16a63c3faa4a502d9a9a6e3505becd8ab4c188c0eb5edd32db45412c881ab90d6a9d05e5ed6d4b
+DIST rocksndiamonds-4.3.2.1.tar.gz 4415020 BLAKE2B 2886891dcc32b71a61b83717941d56348ae8a330d7a5e2dfde1675ebd2c6f44ebbd365d6396d0099a9f9f7968f280036c5735499a7e9d9b94796671f37561a93 SHA512 c0f53e9664895ba5e749d417843ba8e4a4b481e7ac8729e12f2714264e24b72dc5acba5019ca2bd30064406dd8d7d6a26505d35c1e5636898862d7c8df99808f
+DIST rocksndiamonds-distributable-music.tar.bz2 4957282 BLAKE2B e00ccc1a06977289ffe79c010512b4a9a5c79d5a0fdff750e17f888f09395dd8a20ce06c5f1f7cc034d22e9651bad54beff1fa4e3dac854e77bbc57353d98bdd SHA512 dd220e4506492e66742796d0c359bce24691f5ebfba092aa2c2b52c5582ae9d5a38aa558872c738eeb7619b8ca853d3affa6b0e4af0fda5621bf7e07441ff252
 DIST rocksndiamonds.png 2021 BLAKE2B 795be09e6d60aaa66dd457f6ce7dcb0069a82e395cb54578b83ad49ba70b669aa5bd52a4da34979d1e0ba95413a499c13355ce6816c4e364d9d88d1988c88060 SHA512 026abfef17bfc8621d036b83a8a4a878b1d68615e69975ea37589e8d29d864dc42dbabc5a381e579c66be1053175df02209f2c1c1feff3bd9e29db3e09c40346
+DIST wf_v1-3.zip 35570 BLAKE2B eded867101b316406cdf378ce8bf36d1dbd28d38ebc9f904df85753955ec2d8f5a87a528975c58ee81b60362bcc37efa766ad87ccf1a1e8a5b062c59c6cc69a2 SHA512 b1b3b2efe20e7d74a072a6289d1af5c22fccf1b9359700269a381d38bdf2458d7d365df7db616a93512428a05f58cf872ea70fcf87080df327e0c4fc231f0470
+DIST wg_v1-0.zip 821765 BLAKE2B 5bc69179e0429992a916e2287eb57bfa947e4bb08bc6e3d801f940bc73dc8fc8af93aa82a9b8a9f8535d0d22043f50414f09b9643ea9cfa081a92943b1c73273 SHA512 7e7605d258deccbe938fedc4651bdcc4b9a01478de66f793053bb4191429cf733ad317a315965597817dbaa03d5cb538a9ab36bee53cf6a2fd3457aeb06dac88
+DIST ww_v1-0.zip 199805 BLAKE2B 167a36cc33f157e11850a786f511fb5eb9043eb732c514c00e13a71bdce3f63a2406aec88ca25e1510b3d7aeea0434101c878fcdbc2806f89b45c75417a931f3 SHA512 5689663e7d0da797a8a4904d69a3d37cfb09826acf55cf93b41beabf2638b13c6c666f4f40c011018cd84b6c14681061d5efcae3cc09ac86054ec23e0253f6d5
 EBUILD rocksndiamonds-4.1.4.1.ebuild 3132 BLAKE2B d82abc8402502cd6149486afddd872f2b47c277c5184af45913a9b109d2c75a6bac7502ba0057fc7cf6b64cb47151beb800014a4f1ee4e6c0eca800ce2e9e026 SHA512 dfe7589d91e8f7037c87ee82a1dfd43775534b8044c67a443cf1acf61a529d7ca42d46a6a3905ab0102ca265a728b280b86067a93a9517b464e71871761efc3a
+EBUILD rocksndiamonds-4.3.2.1.ebuild 3957 BLAKE2B 33935b976aee35670774f2808ccf51647d7686ac4035c3cd04532c9eca8bfe55abaf396b1619009037104c883d315b45e87ec274eafb4fd713314a934b53c935 SHA512 fae94c233ed796957e9068306d096cca56eb47cb067ed7574338c7e4a1116fc6fd7fb28d812236abb8a20f698f4a1f5763b31f6479c4e6e6fbcf42949e8760db
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.3.2.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-4.3.2.1.ebuild
new file mode 100644
index 000000000000..679de3d81ea3
--- /dev/null
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-4.3.2.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop flag-o-matic unpacker
+
+DESCRIPTION="A Boulderdash clone"
+HOMEPAGE="https://www.artsoft.org/rocksndiamonds/"
+# rocksndiamonds-distributable-music.tar.bz2 from Fedora
+SRC_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz
+	https://dev.gentoo.org/~pacho/${PN}/rocksndiamonds-distributable-music.tar.bz2
+	https://upload.wikimedia.org/wikipedia/commons/e/e2/Rocks%27n%27Diamonds.png -> ${PN}.png
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Andreas_Buschbeck-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Emerald_Mine_Club-3.1.3.7z
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-needs_rnd_jue.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-standalone.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Supaplex-2.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Zelda-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/ZeldaII-1.0.0.zip
+	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz
+	https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz
+	https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz
+	https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz
+	mirror://gentoo/rnd_jue-v8.tar.bz2
+	https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wg_v1-0.zip
+	https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wf_v1-3.zip
+	https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ese_v1-1.zip
+	https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/es_b_v1-2.zip
+	https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ww_v1-0.zip
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libmodplug
+	media-libs/libsdl2[joystick,video]
+	media-libs/sdl2-mixer[mod,mp3,timidity]
+	media-libs/sdl2-net
+	media-libs/sdl2-image[gif]
+	media-libs/smpeg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(unpacker_src_uri_depends)"
+
+PATCHES=(
+	# From Fedora:
+	"${FILESDIR}"/${PN}-4.3.2.0-music-info-url.patch
+	"${FILESDIR}"/${PN}-4.1.0.0-CVE-2011-4606.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	unpack \
+		rockslevels-emc-1.0.tar.gz \
+		rockslevels-sp-1.0.tar.gz \
+		rockslevels-dx-1.0.tar.gz
+	cd levels
+	unpacker \
+		Andreas_Buschbeck-1.0.0.zip \
+		rnd_jue-v8.tar.bz2 \
+		BD2K3-1.0.0.zip \
+		rnd-contrib-1.0.0.tar.gz \
+		Snake_Bite-1.0.0.zip \
+		Contributions-1.2.0.zip \
+		Boulder_Dash_Dream-1.0.0.zip \
+		Sokoban-1.0.0.zip \
+		Zelda-1.0.0.zip \
+		ZeldaII-1.0.0.zip \
+		Emerald_Mine_Club-3.1.3.7z \
+		RS_MIX_01-needs_rnd_jue.zip \
+		RS_MIX_01-standalone.zip \
+		Supaplex-2.0.0.zip \
+		wg_v1-0.zip \
+		wf_v1-3.zip \
+		ese_v1-1.zip \
+		es_b_v1-2.zip \
+		ww_v1-0.zip
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
+		-e '/^MAKE/d' \
+		-e '/^CC/d' \
+		Makefile || die
+
+	sed -i \
+		-e '/^LDFLAGS/s/=/+=/' \
+		src/Makefile || die
+}
+
+src_compile() {
+	replace-cpu-flags k6 k6-1 k6-2 i586
+
+	local makeopts="BASE_PATH=/usr/share/${PN} RO_GAME_DIR=/usr/share/${PN} RW_GAME_DIR=/usr/share/${PN} EXTRA_CFLAGS=-DUSE_USERDATADIR_FOR_COMMONDATA"
+	emake -j1 clean
+	emake ${makeopts} OPTIONS="${CFLAGS}"
+}
+
+src_install() {
+	dobin rocksndiamonds
+	insinto "/usr/share/${PN}"
+	doins -r docs graphics levels music sounds
+
+	einstalldocs
+	doicon "${DISTDIR}/${PN}.png"
+	make_desktop_entry ${PN} "Rocks 'N' Diamonds" ${PN}
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index f5e41cf2aa56..5ffcdaf6108b 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 283f6e9e7639..ceb3e8adfecb 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,6 +1,10 @@
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20 SHA512 7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
+DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758 SHA512 fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
 DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830 SHA512 7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377
+DIST wesnoth-1.17.9.tar.bz2 420547403 BLAKE2B 8fcef89b72057ce60e292a7a986010f4b0d060e7542ff20029306cde4580473f5e8240f9d99a6248d23147be7a61345a04dca97fa70fb9a1fa039603b8ddd8d9 SHA512 c8f9eb8cc77ea239e710e52a23333636700b34cea5fc8d73d5a62f80d0b58867ee633f556c170700e65e4ad234a69ea1746a1a4148efb64979cf22129ee59157
 EBUILD wesnoth-1.16.3.ebuild 2230 BLAKE2B 72027fdc814cc0aa769a94d971b7eb5f769265861ffadf1a30f612ef1d01b89725e04d16ffd32f9889c4a2b19796be7dfd072504fce1826f4dbb4afd37e9b73f SHA512 2efd412cce8e8cda42cf3421de5d60ff514778bd7355155c7252ef06859eb23ccb650719677968339b2a77a060cbb6b911a6ca23523e44a5b91f95147b1f72a2
+EBUILD wesnoth-1.16.6.ebuild 2230 BLAKE2B 72027fdc814cc0aa769a94d971b7eb5f769265861ffadf1a30f612ef1d01b89725e04d16ffd32f9889c4a2b19796be7dfd072504fce1826f4dbb4afd37e9b73f SHA512 2efd412cce8e8cda42cf3421de5d60ff514778bd7355155c7252ef06859eb23ccb650719677968339b2a77a060cbb6b911a6ca23523e44a5b91f95147b1f72a2
 EBUILD wesnoth-1.17.5.ebuild 2203 BLAKE2B 9c5f81f08b619e228052ca7bc4c8d667524a15df4e8d81db47a3a54bc3165f53ee07db38f593debf37f0d4fbee1af4242147e7843f1a0e47923f082397fec4a3 SHA512 4776a5abc4f2d048e4f628d29ee5ebbe4a372dd4d6e049965b4c583258f09c3c8e688175d99121228a842b314ae91a6f40086f1e8d1aec5d8f2034c78be5cb27
+EBUILD wesnoth-1.17.9.ebuild 2203 BLAKE2B 9c5f81f08b619e228052ca7bc4c8d667524a15df4e8d81db47a3a54bc3165f53ee07db38f593debf37f0d4fbee1af4242147e7843f1a0e47923f082397fec4a3 SHA512 4776a5abc4f2d048e4f628d29ee5ebbe4a372dd4d6e049965b4c583258f09c3c8e688175d99121228a842b314ae91a6f40086f1e8d1aec5d8f2034c78be5cb27
 MISC metadata.xml 418 BLAKE2B 636dfbbd604111ba7c6241fbbc8ba8bd9a4f1f6e30811c9f3788a3624deadf751ad62dca9e24a74f19709900c32530fd3b12363ba288a94d2d94eb9c7e15b6f1 SHA512 298467b69ae7455c096e186061df02c45dd42aa33241ea12bd672a551589dd62a7cf5d2e383a6e94a6ee1332bc29b24f80e4597cbb0771e64b40d3bee5249102
diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
new file mode 100644
index 000000000000..1ee6998e389d
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+	https://github.com/wesnoth/wesnoth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+	acct-group/wesnoth
+	acct-user/wesnoth
+	dev-libs/boost:=[bzip2,context,icu,nls]
+	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	!dedicated? (
+		dev-libs/glib:2
+		dev-libs/openssl:0=
+		>=media-libs/fontconfig-2.4.1
+		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-mixer-2.0.0[vorbis]
+		media-libs/libvorbis
+		>=x11-libs/pango-1.22.0
+		>=x11-libs/cairo-1.10.0
+		sys-libs/readline:0=
+		dbus? ( sys-apps/dbus )
+	)"
+DEPEND="${RDEPEND}
+	x11-libs/libX11
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt || die
+	fi
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]] ; then
+		local lang langs=()
+		for lang in $(cat po/LINGUAS) ; do
+			has ${lang} ${LINGUAS} && langs+=( ${lang} )
+		done
+		echo "${langs[@]}" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="ON"
+			-DENABLE_SERVER="ON"
+			-DSERVER_UID="${PN}"
+			-DSERVER_GID="${PN}"
+			-DFIFO_DIR="/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="OFF"
+			-DENABLE_SERVER="OFF"
+			)
+	fi
+	mycmakeargs+=(
+		-Wno-dev
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_STRICT_COMPILATION="OFF"
+		)
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( README.md changelog.md )
+	cmake_src_install
+	if use dedicated || use server ; then
+		rmdir "${ED}"/run{/wesnothd,} || die
+		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+	fi
+}
diff --git a/games-strategy/wesnoth/wesnoth-1.17.9.ebuild b/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
new file mode 100644
index 000000000000..5724bdef29fa
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+	https://github.com/wesnoth/wesnoth"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+	acct-group/wesnoth
+	acct-user/wesnoth
+	dev-libs/boost:=[bzip2,context,icu,nls]
+	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	!dedicated? (
+		dev-libs/glib:2
+		dev-libs/openssl:0=
+		>=media-libs/fontconfig-2.4.1
+		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-mixer-2.0.0[vorbis]
+		media-libs/libvorbis
+		>=x11-libs/pango-1.22.0
+		>=x11-libs/cairo-1.10.0
+		sys-libs/readline:0=
+		dbus? ( sys-apps/dbus )
+	)"
+DEPEND="${RDEPEND}
+	x11-libs/libX11
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt || die
+	fi
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]] ; then
+		local lang langs=()
+		for lang in $(cat po/LINGUAS) ; do
+			has ${lang} ${LINGUAS} && langs+=( ${lang} )
+		done
+		echo "${langs[@]}" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="ON"
+			-DENABLE_SERVER="ON"
+			-DSERVER_UID="${PN}"
+			-DSERVER_GID="${PN}"
+			-DFIFO_DIR="/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="OFF"
+			-DENABLE_SERVER="OFF"
+			)
+	fi
+	mycmakeargs+=(
+		-Wno-dev
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_STRICT_COMPILATION="OFF"
+		)
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( README.md changelog.md )
+	cmake_src_install
+	if use dedicated || use server ; then
+		rmdir "${ED}"/run{/wesnothd,} || die
+		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+	fi
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index d5b5bf6f0830..ace5b75cbeb3 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest
deleted file mode 100644
index b1475a4173e5..000000000000
--- a/kde-misc/kmarkdownwebview/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kmarkdownwebview-0.5.6.tar.xz 68992 BLAKE2B cf2dd0718c6517b7ff3cebd032410b695a4ec40e6c51c93ac3f8f85cd3ffdb9a23c1922ac7f7e097412f0ea76891ea067ca2633d036dba8e45ff3fd6cc468f9b SHA512 51c99da9cb2fd0868bf0bc18e89efad75d70758343cf2b4d05e4eec00d328cc041ee9c8b90c402dc137afab5266e9dfb8877832064305de5a836c4aa94af4e4e
-EBUILD kmarkdownwebview-0.5.6.ebuild 725 BLAKE2B e5de2dd2c7018a56fe1ccd80c4482654b01ee7fc356323ab184938fbad7efbd01961f8ec8acb66c75244cda6788b78ce54480a140545ac47b8106207767fc8d4 SHA512 95f58ed97993bdbfd1166cecd940b12f73fd961d89481fed6a953e9ef43d11a4e762fc6bf1f0fbb7c5e95f6b15968d743abe4e9d51aa25aedc4ddc6ec90cad51
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild
deleted file mode 100644
index 113eeb3ce745..000000000000
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ecm kde.org
-
-DESCRIPTION="KPart for rendering Markdown content"
-HOMEPAGE="https://apps.kde.org/en/kmarkdownwebviewpart"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="BSD LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kxmlgui:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QTWEBKIT=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-misc/kmarkdownwebview/metadata.xml b/kde-misc/kmarkdownwebview/metadata.xml
deleted file mode 100644
index d925f2439758..000000000000
--- a/kde-misc/kmarkdownwebview/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/kde-misc/ultimate-gmail-feed/Manifest b/kde-misc/ultimate-gmail-feed/Manifest
deleted file mode 100644
index 262b1587a11d..000000000000
--- a/kde-misc/ultimate-gmail-feed/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ultimate-gmail-feed-2.1.tar.gz 26416 BLAKE2B eb6da2c2968a8fda9a758daf77c55f2cc28cb939bb542c757e99f839c4b252339ce3ef936fac13b16e046a60617ba2f0fbdc6aca41ce723ad0c04d68ed1c712b SHA512 dcf8ebd76c8d02d8c359153b3bd06cc25608111c6fa832160858d77bf7a996dc75ba17d59fbfcacbea311a3ceee642ff36fe0f2bf78bf1b6dd108ed4408a079e
-EBUILD ultimate-gmail-feed-2.1.ebuild 686 BLAKE2B 62748dca9e434744240f5462c8e5a0af6365157dcf6b9059006e1463e623cdfd9166e4156c59868ec55621aa284a09ed51c2593e6f137ad01322cc1985aa66d4 SHA512 9b2dadb8257275da56f2a557ff9228e84f490414385860a8fdd5c394e6f51782ab560049deac6c933070651ed51cb6706f4ff6b9a8d3277616084f6257592abd
-MISC metadata.xml 333 BLAKE2B 1a6265b60dcc95cb5c24c1574c9c2270658ec3ca15ff88b1b99d1436b760d31ca4b96422a36a6a0ca9465a46a7179c99b8364fb8d32c5a8cadcfbeac173098ce SHA512 52f4646801d2c6c94768807a6c2fe680c121a176e7b2f8d50de1f36b6d0765fbe4105b546bf19521200fb1454b83238e4d2bcf61bff8a0188433ef77a4962ff4
diff --git a/kde-misc/ultimate-gmail-feed/metadata.xml b/kde-misc/ultimate-gmail-feed/metadata.xml
deleted file mode 100644
index 152bdb7ff651..000000000000
--- a/kde-misc/ultimate-gmail-feed/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">anthon38/gmailfeed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild b/kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild
deleted file mode 100644
index 62796ae711ea..000000000000
--- a/kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="plasmoid-${PN}"
-inherit ecm
-
-DESCRIPTION="Plasma 5 widget showing your Gmail feed"
-HOMEPAGE="https://www.pling.com/p/1248550/
-https://github.com/Intika-KDE-Plasmoids/plasmoid-ultimate-gmail-feed"
-SRC_URI="https://github.com/Intika-KDE-Plasmoids/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DEPEND="
-	dev-qt/qtdeclarative:5
-	dev-qt/qtnetwork:5
-	kde-frameworks/knotifications:5
-	kde-frameworks/plasma:5
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtxmlpatterns:5[qml]
-"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e75ede6d5cde..6e3c66db9a39 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e69fd9c2ad07..d8ce38b177c7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Oct 2022 20:09:37 +0000
+Mon, 24 Oct 2022 02:10:52 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f84d8a11c475..aeda3b0f2d45 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-23T20:09:41Z
+TIMESTAMP 2022-10-24T02:10:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNVn4VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNV9C9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD/cw//fa3Xno8GRCcnTHycUStcsFvPaIdsDfj//SXuysUaXBKOZUbJkSDc8fUL
-Pxm3dBvaQ4WuHLOmhsoYf+JvdnGAJFT+gZlZNfp2aqkFrYHpWB+CEO96iGvPcwbo
-xaiJSJwQKqsLj/pWfwgH9/XmrjwAjoz6/icnwGeh28fZ2qs1B5s7/6EIXyALs0/x
-gVcd7MgOwyaC9lUeWuojwWqCPe8dOA9zhaKJBy53+ObsMZmQZp1RQlkOCqnBLskG
-tmg0P9+BfDyLeNObKY+ATM5z3jz2GRcUA3dvR49uEr4rMCSz7BH09XbwdFuqHyUv
-c0Y9OpebeYbLwKdgWkELwPWK0MDXT2CNv/wDPBaikSo1/myq1QA1SbHDYpeizb7L
-R0sjwqomxKpzmTz2+hKqLswwao6jbf1PMVtur4RtiIk7JlLwFOV0ld6BFBwlFNMi
-c4GiYw6aYRcJhnRILx6hwTobgRMvDxcq9XKD7lQwPzxin3gxWYYyJc6iOZ4DpuGm
-Q45+btwuc850Qq1v9CW4fn6ZYYXbjg/c5feBevZX2SJ+FkmSobGqCDshIC0W/EbC
-Jp37yETA5Kox6tf3UF0k4Xy5fowkahdpXXGcBEeJ76DUUAqjcuckcJTYlKPi8A4f
-FcOQPF21+yGNneWncA6X4JoaqRGQ8h6lrSU/WYOP6d4V2eqaIEU=
-=AUon
+klDceg/7BOSm4yYKibcqka47fVpoRVDijoE+c+aw9YAgRnZ1b3hQyhd+8UHq2UIz
++RHVeaO9Mazf7Y5LVgle+e2X2JE3SMmJ2wlrf1qmxAEwtlBfzkKx82vuflM0ygq3
+2s6bOD4jVhjpxho7WPfAgis72KdIUFb+9IPSaoHHktVxce5jad8m91EUsi0fvqmo
+FTMmBIXP1xrD3cWDaP/YvO+DMdiPwATPGX2wX1hH1377yPbbI0K4f2IGoPb2J/m1
++UxFdhc8tJ9OwlovrxJ+cYXzxlOlSt55k93o+oCO1YPbPMAsL2bZ6tYXntD8Gvph
+64bGf6ZqHSpP143ACpGP6FTldf0FjZCW8r6cfPCVy1s/alRId48zGDBz5/ZTEEV8
+rDPhDSwmxD6G553haKbf3tJzxlilz3IvqA8FJ7cHPuO35hPEcfQk5GmfYmx9vOsU
+pHM/mzoKqbZ1WEokiofU4g8XdkqTgZ6KZy+36r/9gr/7tB7OTaX/iHnweCvnpvww
+xskyaGmDSAvUElMuRGj9bYVKKpE62CZhtexAOx3OrlOwy+F7RYp5l/25g1nrIdAI
+XS0HpAaxi6ZoOifcy7fDtsajG6eZ6jyteIhkcY1GmmkCRzssjKBFXOz+igx+4Lv8
+hN4MjpvNIRIIm3jR5uH/SnWjwWUtXJ76Wd1beli8oHp4+LiJH+g=
+=7wUc
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e69fd9c2ad07..d8ce38b177c7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Oct 2022 20:09:37 +0000
+Mon, 24 Oct 2022 02:10:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index de2c630fec2c..de7e8555bc82 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 5e706152a20a..967b29d53b6a 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luajson-1.3.4-r100 b/metadata/md5-cache/dev-lua/luajson-1.3.4
index 213905fed1d0..f538b630e040 100644
--- a/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
+++ b/metadata/md5-cache/dev-lua/luajson-1.3.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=JSON Parser/Constructor for Lua
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.eharning.us/wiki/luajson/
 INHERIT=lua
-IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
-RDEPEND=dev-lua/lpeg[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?]
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 )
+RDEPEND=dev-lua/lpeg[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?]
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/harningt/luajson/archive/1.3.4.tar.gz -> luajson-1.3.4.tar.gz
 _eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=289e0d6019dbe0b8ec3c4b25e3b8f5e4
+_md5_=8526654e8a5aa5f814641c45dce556f1
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 559565cbb98a..46fff4ac21b1 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/rocksndiamonds-4.3.2.1 b/metadata/md5-cache/games-arcade/rocksndiamonds-4.3.2.1
new file mode 100644
index 000000000000..650fe54613ed
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/rocksndiamonds-4.3.2.1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/p7zip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=media-libs/libmodplug media-libs/libsdl2[joystick,video] media-libs/sdl2-mixer[mod,mp3,timidity] media-libs/sdl2-net media-libs/sdl2-image[gif] media-libs/smpeg
+DESCRIPTION=A Boulderdash clone
+EAPI=8
+HOMEPAGE=https://www.artsoft.org/rocksndiamonds/
+INHERIT=desktop flag-o-matic unpacker
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libmodplug media-libs/libsdl2[joystick,video] media-libs/sdl2-mixer[mod,mp3,timidity] media-libs/sdl2-net media-libs/sdl2-image[gif] media-libs/smpeg
+SLOT=0
+SRC_URI=https://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-4.3.2.1.tar.gz https://dev.gentoo.org/~pacho/rocksndiamonds/rocksndiamonds-distributable-music.tar.bz2 https://upload.wikimedia.org/wikipedia/commons/e/e2/Rocks%27n%27Diamonds.png -> rocksndiamonds.png https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Andreas_Buschbeck-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Emerald_Mine_Club-3.1.3.7z https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-needs_rnd_jue.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-standalone.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Supaplex-2.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Zelda-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/ZeldaII-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz mirror://gentoo/rnd_jue-v8.tar.bz2 https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wg_v1-0.zip https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wf_v1-3.zip https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ese_v1-1.zip https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/es_b_v1-2.zip https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ww_v1-0.zip
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=2363682c43c6bebd14f7dd9c7d20c381
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 9a215d1cbf86..2bb8c832b597 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.16.6 b/metadata/md5-cache/games-strategy/wesnoth-1.16.6
new file mode 100644
index 000000000000..a14f999726ad
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.16.6
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,nls] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) ) x11-libs/libX11
+DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
+EAPI=8
+HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic xdg
+IUSE=dbus dedicated doc nls server
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,nls] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) )
+SLOT=0
+SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.16.6.tar.gz -> wesnoth-1.16.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5c98c567d0f7bc7fb0a5fdf476db6d75
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.17.9 b/metadata/md5-cache/games-strategy/wesnoth-1.17.9
new file mode 100644
index 000000000000..dde0c45d39a0
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.17.9
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,nls] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) ) x11-libs/libX11
+DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
+EAPI=8
+HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic xdg
+IUSE=dbus dedicated doc nls server
+LICENSE=GPL-2
+RDEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,nls] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.17.9.tar.bz2
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f41da7d6cca55a0c0d86f6d10e8956c9
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 919c4315c69a..f00cff4aded2 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.6 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.6
deleted file mode 100644
index 7df6b4e0efcf..000000000000
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kparts:5 kde-frameworks/kxmlgui:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KPart for rendering Markdown content
-EAPI=7
-HOMEPAGE=https://apps.kde.org/en/kmarkdownwebviewpart
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64
-LICENSE=BSD LGPL-2.1+
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kparts:5 kde-frameworks/kxmlgui:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kmarkdownwebview/0.5.6/src/kmarkdownwebview-0.5.6.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e19f1259b998eee88a885232a4762b47
diff --git a/metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1 b/metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1
deleted file mode 100644
index e08cf1df7c39..000000000000
--- a/metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 kde-frameworks/knotifications:5 kde-frameworks/plasma:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma 5 widget showing your Gmail feed
-EAPI=7
-HOMEPAGE=https://www.pling.com/p/1248550/ https://github.com/Intika-KDE-Plasmoids/plasmoid-ultimate-gmail-feed
-INHERIT=ecm
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 kde-frameworks/knotifications:5 kde-frameworks/plasma:5 dev-qt/qtquickcontrols:5 dev-qt/qtxmlpatterns:5[qml] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=https://github.com/Intika-KDE-Plasmoids/plasmoid-ultimate-gmail-feed/archive/v2.1.tar.gz -> ultimate-gmail-feed-2.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=083aba4a7f0ff9cf8b2b2f3779b9afe2
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 618af4cd2158..13817da880ac 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221008 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221008
index 44e693872436..4b8db402575e 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221008
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221008
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
 INHERIT=toolchain
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20221008/gcc-12-20221008.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a003c9112081e4f62fe73cf45c2d202d
+_md5_=0b8d0b96e6b6d1415c359e8b6f511f58
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index d6c4273b303b..410e359e23f7 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/git-sources-6.1_rc2 b/metadata/md5-cache/sys-kernel/git-sources-6.1_rc2
new file mode 100644
index 000000000000..86b081cb5bf4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-6.1_rc2
@@ -0,0 +1,16 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.6-r4
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+INHERIT=kernel-2
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.1_rc2
+SRC_URI=https://git.kernel.org/torvalds/p/v6.1-rc2/v6.0 -> patch-6.1-rc2.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=04b03ecba24933874b6d52da3c95bf6c
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 6cad34c5f68e..2ed9c7934548 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/nginx-1.23.2-r1 b/metadata/md5-cache/www-servers/nginx-1.23.2-r1
new file mode 100644
index 000000000000..8d941484eae1
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.23.2-r1
@@ -0,0 +1,18 @@
+BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=8
+HOMEPAGE=https://nginx.org
+INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
+IUSE=aio debug +http +http2 +http-cache libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) app-misc/mime-types[nginx] selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite pcre !pcre2 ) nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.23.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.63.tar.gz -> ngx_http_echo-0.63.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/v0.34.tar.gz -> ngx_http_headers_more-0.34.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz -> ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/wargio/naxsi/archive/4140b2ded624eb36f04c783c460379b9403012d0.tar.gz -> ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz https://github.com/libinjection/libinjection/archive/49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz -> ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.2.1.tar.gz -> ngx_http_vhost_traffic_status-0.2.1.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.2.tar.gz -> ngx_rtmp-1.2.2.tar.gz )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=4f8553bc1a67d4b41e79cd2af8c77dbe
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9955b48ac430..19d3307b1c0a 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-23T20:09:41Z
+TIMESTAMP 2022-10-24T02:10:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNVn4VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNV9C9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBxPA/+M1ngXlG0XVsyxJKiX2KVA75Tsa+cpZDuz4Tno/7OSuNOUlgwQKcqmEuw
-JL6KyZYAHBZDjI4C94vRbBK6Yj+0OFyayR4CMRmcIQJwAEK2ommh+RW54IDYNr8d
-r+VANXIjlJDDwtHykgr6lbCqthxwQfERzVB2MQeecLZ45ae7HzYudHzkPDpmVk6b
-2sXZ20sxN5VnEZBDq4KmMn0ssrZ+UbOQ7n841jcfA3jF7rIPFegG/EHSPXKzOa/r
-Reb7crSPcTaN0NlblEc/ZN9nEluX4EH7uG/fymnYIrndtnucPJIFmqqK5otOhcrE
-O4SO8nrxtHKqIL2/F+ssXAtnsXbECu7Q8XwAchdc/2wPuZpklwSezsbpO0pihfPP
-AiFZjvE7otEo3uZRVxi3ADvwt8WhdbdIYZBrQdj1J75+N7Aksndp14k/qBEmUHgC
-E4jMVlweWqDTaYRMs9UZq+6b510hAYeOLz7yQws57bgHKV2QkzMFU0a/JDNyHWuC
-ySILLGDnnznzfbXZ9Tg26mUBUmIKYly17fy30j3rlnbS/f2PYP5Qtc26NL+2O/NE
-DkigQuRGBkxjSok6JjxD1biz11RYBrPdak8Nd5OhrQycssnelNLXdHTXeHguKA/0
-MtU0weezUFOX3sP2+h6H7/g35DIgrxjOhpy0RkaoC1pXutJ8KeY=
-=KR4i
+klC5FQ/9FTk82K3NTHlIrniu5uM/glIjFhzoNX9/XZoHH/XF2NGIMbK7Md7tXuQt
+79ujgVA39AfRSCmMmPHJQyFFk8/KdOO0bg7LtQApsHMsCuwoBqCBj1oTp5oreLnY
+HMTQAchdSdKS3xNuqq7n0HxoPyMfY2Tiwv5YfDGRseToTaFG8iVDzuZm8BWZ2Mgb
++205G645lNhhqaMrf7mj8mcQolUm1YgabHOF+duOb3WUYX4yRE9n1TihW0XzIZdf
+21fn/FzmidcyzDH72YjUMLia45BZazYyt5pF6EBCt1PaIEjOgKh2NqlcmPZn0HBa
+sfAw6a7EoHP8MtPO8XqSsTeIfVcR13zMNmJ+wuIJ3o7jMsbcKXkRjjdMaQPQ3KRw
+nLI0e7OnjfXYFegrT0U9fDop0m6+xLN2ZSMquyFhs/lkUzJ+idGlSuI+COo8qz+2
+n9Y7WEuKopc0R4S0T8F8E0FAC6dxKi5IYL0tnGUCWXrwSHAgoZrqZdhI1mjkWuaz
+79VPiuAOx4OkozsJ//j4PNdLibj9ODjVLOl/5OAC8krpmSXeDfyHat4ZQMqyZT/M
+tfTVESjZif8Q8OVDvs6Ec6CLygfnzBiTWGFgZSwNMffnPlC7eMw+kxhGN9hnw0Ox
+1Psid5j5LGFLbDtgsNuUhv3rXnC79M8tsHO7wtAYWX2d+n/ECPk=
+=HCe2
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e69fd9c2ad07..d8ce38b177c7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Oct 2022 20:09:37 +0000
+Mon, 24 Oct 2022 02:10:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e39d9687c41f..8458fd790697 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Oct 23 08:09:37 PM UTC 2022
+Mon Oct 24 02:10:52 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7d44aa21b5d0..20bea091d8df 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Oct 2022 20:15:01 +0000
+Mon, 24 Oct 2022 02:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 6f77e8f366ae..c54c665dae3d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ac52ef924e45fc2b517009af23357bfe7ecd1642 1666555051 2022-10-23T19:57:31+00:00
+ed189588a071f88186a3a9de25abfbd7582b9c69 1666570878 2022-10-24T00:21:18+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 66bcaa5aa32f..3d3144b6aa83 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666555801 Sun 23 Oct 2022 08:10:01 PM UTC
+1666577401 Mon 24 Oct 2022 02:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e69fd9c2ad07..d8ce38b177c7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Oct 2022 20:09:37 +0000
+Mon, 24 Oct 2022 02:10:52 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6d6123d51d78..06ea5a08e735 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 5680e466e917..b7549ffd9b39 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,5 +1,4 @@
 AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
-AUX tcpreplay-4.4.1-fix-bashism-configure.patch 988 BLAKE2B 847d6f241a84b456f96c2ea58a0e15df98f41befcda0a46fcb0a6e1f46b8ac3f6fb5fd8454ec91eb7696601bc015b821dd2fb3452a1dd7c79260e518ca0d2d2d SHA512 e711bb603eb490c34439557c663c31aa267cccaa47db5b40b74497771b5c7daff2e1211a19773d9b0ed2826a578f373261db2456b9747330b17e7ac3f9c3e4a9
 DIST tcpreplay-4.4.2.tar.xz 750592 BLAKE2B c1f0bad69eca7e086aeb7100c4a35e2984a81412f81eaf981d969d24510736788e4657b511308b38ffbf88021c23272c51b9265eb2fb08318352d3eb8bed0a2a SHA512 78e5482c0cd70a55aa80167c602b33811fa01203860fab4b2d504da71a95e218356ea0cc85254e12be7cb13b611487a150f13df94f9da274661f71e921bd6045
 EBUILD tcpreplay-4.4.2.ebuild 2131 BLAKE2B a6c8a42e51fec6bed9bc92b3bb61edccd9667795ae498fb3ab8a8d11478266f8163fc1d369c6ca0552d7c8fd09165e662643e7ed6133931c9739b18965fe3461 SHA512 4b4593adf596a1af17822997b300edd75175f3662d47d34d14459db54ac773a212c661ae48d6d74923d5650da6df7402d6aa341fb94a2ebb4712f7863237546c
 EBUILD tcpreplay-9999.ebuild 2133 BLAKE2B 24055b46b8746954e05cfaf88695389ef7e17171ba16f4b6de166f40e23ce3a7ef5f82f2915fc016bd6cc637ecf473fc90ed791111e87e7d905f83d0ca380629 SHA512 033159087ec5edb13a1c87a94489ffcf30b085b58707581b1de8d5f176511204a1e907e19c70b1aa46ec81678c0cb16b7bf086eb4d6c0f0562a6d74218d02718
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
deleted file mode 100644
index f1d424274333..000000000000
--- a/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/appneta/tcpreplay/pull/714
-
-From bd93776c50ec1d0574c72f253095afe22eb6bf73 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 13 Feb 2022 16:09:23 +0000
-Subject: [PATCH] build: fix bashism in configure
-
-configure scripts are run with /bin/sh which is supposed
-to be a POSIX-compliant shell, so if /bin/sh is provided
-by e.g. dash (like on Debian) rather than bash, we hit
-errors.
-
-This has no effect on functionality for bash &
-retains compatibility.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11a1e4ea..4c577c42 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1808,7 +1808,7 @@ fi
- dnl No 'make test' when cross compile
- 
- AC_MSG_CHECKING(for 'make test' profile)
--if test "$host" == "$build" ; then
-+if test "$host" = "$build" ; then
-     AC_MSG_RESULT([yes])
- else    
-     AC_MSG_WARN(Unable to do tests when cross-compiling)
-
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 1d70a8e37854..2fe9e5bda4cc 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 0c05dec124e2..e7e18ff6a912 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="amd64"
@@ -28,7 +28,7 @@ LDFLAGS_amd64="-m elf_x86_64"
 CHOST_amd64="x86_64-pc-linux-gnu"
 
 # 32bit specific settings.
-CFLAGS_x86="-m32"
+CFLAGS_x86="-m32 -mfpmath=sse"
 LDFLAGS_x86="-m elf_i386"
 CHOST_x86="i686-pc-linux-gnu"
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 3a38caa23b74..760063881022 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -153,11 +153,6 @@ net-im/empathy
 # Unused Java library. Removal on 2022-11-10.
 dev-java/objenesis-test
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2022-10-08)
-# Obsolete after Plasma 5.25 release, merged into KWin.
-# Removal on 2022-10-22.
-kde-plasma/kwayland-server
-
 # Michał Górny <mgorny@gentoo.org> (2022-10-08)
 # Repository and SRC_URI gone.  Last release in 2012 (guessing
 # by filename).
@@ -302,17 +297,6 @@ games-sports/torcs
 # Removal on 2022-10-25.
 dev-python/ssh2-python
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2022-09-23)
-# Unmaintained upstream, obsolete after introduction of kde-misc/markdownpart.
-# Removal on 2022-10-23.
-kde-misc/kmarkdownwebview
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2022-09-23)
-# Broken after Google stopped accepting "Less Secure Apps".
-# https://github.com/Intika-KDE-Plasmoids/plasmoid-ultimate-gmail-feed/issues/32
-# Use kde-misc/gmail-feed instead; removal on 2022-10-23.
-kde-misc/ultimate-gmail-feed
-
 # John Helmert III <ajak@gentoo.org> (2022-09-18)
 # Unfixed root privilege escalation, bug #631552
 sys-cluster/slurm
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index cdcfb7c08ca3..315fb7e7f9dd 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index b8f9bb2b3d64..6048c37ca0af 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -54,7 +54,7 @@ EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e79976
 EBUILD gcc-12.2.1_p20220917.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.2.1_p20220924.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.2.1_p20221001.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
-EBUILD gcc-12.2.1_p20221008.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
+EBUILD gcc-12.2.1_p20221008.ebuild 1421 BLAKE2B ac34f19e52c2debca52725ffd9a219fabeb326dd32614bc5b9da9d19960138860a6e51f6b343e0184e56a9b115fda306eb0785b1a38a31b9082741b16e52791b SHA512 e2b05d0ea98c0b75c7a69792f558e848e907a836a7f9869ef984c1df932bfd23a08f987ad2d54707038379cf0932b18231d11d64d9166d0ee164be148c6def66
 EBUILD gcc-12.2.1_p20221015.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.2.1_p20221022.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279
diff --git a/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild b/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild
index aa3dfbf98f28..97bcb6b2054e 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild
@@ -35,7 +35,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 # Technically only if USE=hardened *too* right now, but no point in complicating it further.
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index ac1f8d26f4df..80de774bed99 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 0d5c5b2f9a0f..21a401a875fe 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,4 +1,6 @@
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST patch-6.1-rc1.patch 50406846 BLAKE2B 357a8a4fab087a67f79efcab4ada2a5d65e77c5ef13a7ab9d58963de31adeb0b3b841b7120acd6bba1767ef2080f086eec2d72ce98a6c21d1920478d6b9fb244 SHA512 80f3fff420e06ea937274ef5ea8927d57f633b0bb1f702ef2b583bd9eddae4c65b0587f57144d1d9eec0aee815d5676d9fc9187779a6149f6c916c432c5a8ea3
+DIST patch-6.1-rc2.patch 51039243 BLAKE2B 0f0727885c52a12e5eaf907d40752705a2dc8b174e7ce8f2fd97a1521396db2b32069acc323e732749839e4645dc550be1db16afc942a9513d437160cf509e15 SHA512 753ab27541248489bc3280595b22e138c063defec1ac4f3c7ee60cd9212345e94061ab6206f1cb1c712d76220db0b41b8197ea35e4c72851705046ca986dbb0a
 EBUILD git-sources-6.1_rc1.ebuild 1191 BLAKE2B c5bb824a1d0b5bb9ef1d3a82fdea4ef8f7fdf3a44a5e7b8747f17f7d6929e44c7ba4e56d218344090d2107b45190a1e93fbd291949cd9adf6b18154fa12718ae SHA512 e8dc2cf31a00c73625453bf8a90f1ecd0786c5a4439158bca21097edde2bae0fb38d3f0ea51128c9aa169a95ad1035927356deee7c2623db82f0711b05d2d339
+EBUILD git-sources-6.1_rc2.ebuild 1191 BLAKE2B c5bb824a1d0b5bb9ef1d3a82fdea4ef8f7fdf3a44a5e7b8747f17f7d6929e44c7ba4e56d218344090d2107b45190a1e93fbd291949cd9adf6b18154fa12718ae SHA512 e8dc2cf31a00c73625453bf8a90f1ecd0786c5a4439158bca21097edde2bae0fb38d3f0ea51128c9aa169a95ad1035927356deee7c2623db82f0711b05d2d339
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-6.1_rc2.ebuild b/sys-kernel/git-sources/git-sources-6.1_rc2.ebuild
new file mode 100644
index 000000000000..b91652186526
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.1_rc2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="6.0"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.6-r4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 46caeb90cf58..39da624cdecf 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index 9db81169a66e..bfb785a803ec 100644
--- a/sys-process/at/Manifest
+++ b/sys-process/at/Manifest
@@ -1,12 +1,10 @@
 AUX at-3.1.10.2-Makefile.in-parallel-make-fix.patch 369 BLAKE2B 9c9a4482fce8170181fd56191e14220c0155a96c69f0c3b4fc2b57863acdea3cb8d007eb064d5adb4f6e2dd81f468e9b9b52db64d90bdaac0a4cac7914d4a763 SHA512 1890bb448991d5bb07f318f8e406f8cdcd28a720c3c8356b0e7dc34c2d61fc37d2fba0f8700ebed83ea528c46b31c4c2a41e6b021ab945c67b5c9e64a3703c9a
 AUX at-3.1.13-configure.in-fix-PAM-automagick-dep.patch 614 BLAKE2B 3f69746438fa998111369fef6962e0f0deaf8c9c443947523d5c5806da9ad74c96a854364765a8bffbcf1fd25f50c70cf378d9988b8925c60f1db2e3e35800ec SHA512 c8a9bef7c4419bf0601de72b30ee1d04606bf4180d0b8b4e74729471742a646fee616f2fb02f819854a7e42be26c2bda2a384d26b5da5d41e54661ac5b44e303
-AUX at-3.1.13-getloadavg.patch 469 BLAKE2B e69e2d6b3176f94fc3b08765a92cd4901d03ba1405cc8bdf8269e9d5cc45f699475773f505f4ed5d0a11a6d86d2a46a2e4aede92be031807548a137044dbba5e SHA512 3880adc05b94c85d54820c0f8a05359fe6837f6c8086207f660a137a204d92b79f71e8bacd0abe7532666568da0339e5ce12c07c5f78b55c673b33aa276358df
 AUX at-3.1.13-parallel-make-fix.patch 336 BLAKE2B 82a7e0788bfdf1b0fd07135401a585b5a1a03be2217c3e03203a4c7f665447d56b4e7ed1d85f4cbfc80d055408872180e599b21ad40dff0c61d6466181f33706 SHA512 262a330b6886fb93b00bf301d11e72aeb924171db891bcb5041383f7192c48a74d85da51d6be41ea71e84802fda08ce24120eae4fdea32b168801de0ea11bd85
 AUX at-3.1.14-Makefile.patch 405 BLAKE2B e48e3dbc13d63ae4b0a08f97af82238e2430671e66e94d3fcb74d49796c63896df3e3d0a71c0d4a245331abec4ae6a5bf9b063deaedaecd9ee4b281cc788de4e SHA512 4002cae6b86e6fd6011acf985b72a7c5f141eaa81d3f56250621a4f9c1d406d30669b5fab1df2921cc74ada823bd8d6f477c622550d1b7b6f8b026a82816c319
 AUX at-3.1.8-more-deny.patch 175 BLAKE2B 622b50e7c03d738602a95e0465bd3dd4c1152e0f540535a655ad76c671e00902b13c88e147580dbb0b51e8e2f1f4cf7b974cf3789cbf6ce4b01e89006a374495 SHA512 0013006b8079ab86edd8100fee99ba5f099628be41c84ef099edba11d8b976836f7023658bb61d6425e70531fd4dd1958bb776078510fa84c3473e0b60260dee
 AUX at.pamd-3.1.13-r1 208 BLAKE2B 725552bae7c0a3d5d10b5bf66ee5460a33b415f8316b798c650297ade2bd98a14fdf9533c0129dbfcabc76d35652d9b5ef5789fd7fd7ac42d43f8e480569c176 SHA512 7ebbeed1fb9c9d8c26f677956ae3fb5d947aa8e1f1dbc2c576b1ee4b2d8c92d206ad361d61772e6a28b40e747ad009d16ed1d3516fa2549b1f01f6f0886612b8
 AUX atd.confd 214 BLAKE2B 73cb9a8efa568f11620029521e93b7a2e424eeb860d462663ea4eabbe236b386c54392824b224e3de1d245ef40fef503477502531b1d95c40def08710f788772 SHA512 12f1423e2d0841a98ce506ebbf24280bc634b76a2b15cb1c6e12285fc7fd859428380841754ab2e3a0b7c3d7cc9957b53d4e018651ef097ca1af83f92cfa130a
-AUX atd.rc8 289 BLAKE2B f1ef6e087b1eee30b272a88feeb7f45ec1e4bc78f3c016b48c0ff353e6171a6e73eb3b3e043e5b8500864bab07aa419928a8e0c132bb56f18975b800d51534dc SHA512 a8517b4a754ad096aa72d975b556925c566963657402ffe0c00ed3fbc22a84f6c32917c8d2021e6244339d171352e429d1c360ad6c500de6c60a444e07d006f3
 AUX atd.rc9 265 BLAKE2B 0f1f1e75fbcedb2fb5baf2ee6dbd8b9d519cdee203bb91119f78678dea2f6af569197c920ec0a39548cbff546abb89c46de5127a0cbc55b6072028cb25ea9a24 SHA512 de3525120a16884f72cedacf8873e82e2a4010e8bf9fe3dca3611d9a5fb081232f0e75f91886a2f31c89645b7f97fd419b60295f00b16f561325c0645b5ff57f
 AUX atd.service 172 BLAKE2B 84ff9c4a55ba895e87303f31f124562fa22eff29059c07d2ab3cc81ecdfd742776c389baa80f8ddc25c01220801465218e62f4dd73e77435eb05023c4cc5aa87 SHA512 6ac20de3e0d03f3fd99b302b8de6f8dc5228d0cca3b383d9f6b1f1abe82d8d5f4d7a23a4cae6d710eabd21fc28c568a63c0c802eb6237ca91fa48318b99a6f39
 DIST at_3.2.5.orig.tar.gz 132660 BLAKE2B 30cd8e53aff8176ceea62f2a34c0cc0706b35fc187c2da58f86ec6ca4cec4701bfab9d932949d57b9750a18841d315d7c9a4289691f209c899598991f6541a32 SHA512 542e8948bbdc1d06934070cbfe242688b541ef6342c6b0351255f8b9d7a3ed915a9304b5cf5442dfc15845b3d2b926ebecbfc5bccd204519d0a2775b27f8139c
diff --git a/sys-process/at/files/at-3.1.13-getloadavg.patch b/sys-process/at/files/at-3.1.13-getloadavg.patch
deleted file mode 100644
index 7de085dcd84b..000000000000
--- a/sys-process/at/files/at-3.1.13-getloadavg.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/getloadavg.c b/getloadavg.c
-index cf5869f..c7e2b27 100644
---- a/getloadavg.c
-+++ b/getloadavg.c
-@@ -69,8 +69,12 @@ Boston, MA  02110-1301  USA */
- #include <config.h>
- #endif
- 
--#include "lisp.h"
--#include "sysfile.h" /* for encapsulated open, close, read, write */
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+
-+//#include "lisp.h"
-+//#include "sysfile.h" /* for encapsulated open, close, read, write */
- 
- #ifndef HAVE_GETLOADAVG
-
diff --git a/sys-process/at/files/atd.rc8 b/sys-process/at/files/atd.rc8
deleted file mode 100644
index 3cc437eaa16e..000000000000
--- a/sys-process/at/files/atd.rc8
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/atd.pid"
-command="/usr/sbin/atd"
-command_args="${ATD_OPTS}"
-start_stop_daemon_args="--pidfile ${pidfile}"
-
-depend() {
-	need clock
-	use logger
-}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 30e9cf6f7550..746d6960f56b 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 893a4f06e6e7..654c5de13b78 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -8,6 +8,7 @@ AUX http_upstream_check-nginx-1.11.5+.patch 8557 BLAKE2B b1f21fa56e94d92b30d4b84
 AUX nginx-1.4.1-fix-perl-install-path.patch 403 BLAKE2B af7c0d3845f4e971ff6470cac11722a54339832518a1f48eef6343908676e352d869df7e65e1072e41dc67dbac4e0f006694bba2ba66ab06ae500c7e00664023 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f
 AUX nginx-httpoxy-mitigation-r1.patch 2023 BLAKE2B 82e6cb6c1d38b9e4cd619abfe60eeaa968ded8975277e60afb94456b59e311817eef04db2b207e85308ef480c442e8acd68cba8f455b4cfc872829e522cb1ea4 SHA512 bfc480c34cea525b0eb3753622eb371198e2252aba3299fca4f1c7b29848da162b93757b05eb11a3839618ed895f7b73534dcd7861f4b924997ec422939222a3
 AUX nginx.conf-r2 1292 BLAKE2B ad941577401ee99e7904871a20cdf94e946f608747c14e7ceb589ea0a6254cf16fe27f712d2db252db027bc72742d1818c3874b762fcc38054a69e4363cd5e39 SHA512 de9ffb84d7de468fa7aebfb205529edb1c372f3ff6990b0cac9d1f3012be9ced65db4d260fd852c91cc033805c023a02790770cca43c6ad6335fb58a9c694c95
+AUX nginx.conf-r3 1325 BLAKE2B 3aef6116b366ef325fea9c99e6c1f5a8ea4b6d12aced541e3ad89e20bff76f58f146b7cb6339b4ad99789ea64157864552ed099d47f9e534c893265f998c2db3 SHA512 4a185f6bb09576667e98afdd88a6bbf4909e0db251b04e7889c6e17baacb950986c8ac7a79ac4031746f848433c5d3653a73134690cf68f6c37844ad11fe0077
 AUX nginx.confd 1131 BLAKE2B fd9c9e620a0b8c630a609c3f38f91f62babfed12d4d8035f8c54609a9360b28a919cf2020c577575bdab70cdd9c34e5996852d6d35dc9f2f52a2096c9facccfd SHA512 9023b33b6e03de4fa4df8459118a34a24a52ec167eb0aa1d220fd5ba8555aa454ca3451cad4eecc87a445b74cae5132fd717286aec3f1fea390eb96547e4ae85
 AUX nginx.initd-r4 2192 BLAKE2B b482b9cc473a1df06764d60c7ce5c99a3f680778028bf440a2612b86273936ac4dbb350b81ecbe646dfa67d375492259b1609f3953f1b456c7427a02dd282d37 SHA512 e641829466e54093ad01e9f6c57acd2f0505e489a32e67dfee9279d5da57b216052a92eb05eb0c9c122c12f8b7bf8274b520b6e02fda161cc03187ce7c0660f1
 AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d618abd9e578f2e432ac0cf653a0f3842a0620d405759216bdc17afd50b33aaec3ad0c6757dfac3e34d8 SHA512 4892fc1700817c9a459a531df0320fe606a51be7f8b4e3ddf5852fe33def70dbff36fcefd2fce247c6846d6315ea92f3421eb21299a162d082b85fa27572cd95
@@ -22,20 +23,27 @@ DIST ngx_http_auth_pam-1.5.2.tar.gz 7016 BLAKE2B 1efc8d2d12aa09a2b2a36f6f6d0132a
 DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B f83b267f4c19a9d4af5964522695814c164d200ecd4108bf8f6b5c21388eba8af989bdda646dee18a03174211e8c090a04736bbeb44043cb0e19fbccdc66278e SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0
 DIST ngx_http_dav_ext-3.0.0.tar.gz 14558 BLAKE2B 0d370bfe34600d43a540dd19a386aa52ce135b2eae14e4e108a359d5ff3405939130d1c802062c7523057ec35d38322d3fbed8c13deb58ce7a08ebf9e3f106d4 SHA512 d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
 DIST ngx_http_echo-0.62.tar.gz 53329 BLAKE2B 7d92184f7fb878cb5261be1c68de4432d472469028e20c2150925ab3d9a1c472ef557a11b84ee60d7ae6b48d08b35890c50161540668918492f2092dd0272962 SHA512 240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b
+DIST ngx_http_echo-0.63.tar.gz 53421 BLAKE2B 613d4f265b9bcf9b4a44a18749314075e797dca4b350e6c4bc2e7ddd52edadc52660504ee57d0c859ec0a20f6b2e425727e5ec4b30282e67498010fc8d959baa SHA512 c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b589c2ab35da8d211436ed194d6fd062cad925af8152c5e789
 DIST ngx_http_fancyindex-0.4.4.tar.gz 26292 BLAKE2B a1ed76cb31cd4f7a349bcbe63d75f8e00331d0ba4ee9b7b1df41dac77fe64ebe6c72a6fd5f6ebc9de53e8d3a8a2ad5185fbaa533d8ff008fcf92f6956f267d80 SHA512 bf8ebb188c10fee5e6ebcb338fe20fdf859bb88d9b2b0e3da6f3e2f1847738d30760d2642d0dfe257092bdf2399b561631556a3a8e2fb33dc9cd0c59d371c173
 DIST ngx_http_geoip2_module-3.4.tar.gz 8877 BLAKE2B cd59ebbd2ca47f6af0b22b8b91768053d2c991f7adf19941625e3570d81dcb73989101795d641e4efce1eed37d454bca73d603b5d0e4511e3bd63100c7acf750 SHA512 18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72
+DIST ngx_http_headers_more-0.34.tar.gz 28827 BLAKE2B 48badf603b93601b11c837057760f768ef2579062786bb366795617635747b654cecafa3a230eec1a3e442ab768fb068867ceb93385b14b6452b621764acfd3f SHA512 2c0c140feeb29f0154a223dc3020ff956f894d63e0232a7bc0ca33fcb26f8b807bda868159ae30b6cac7456ec25b831c3d299ea18e234202ae5d14c1ff471a4b
 DIST ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz 28810 BLAKE2B cb71e6b8a9da6c72bc542e837391e932c5803d52cbf01eab0b70f501b620d7de03009a25d10e9ba9de46a6c9ffca109b50dea47cded687412eb55210ba6e68c8 SHA512 80193f95f9754b1d6fb784cde6b4c4d6f72b5cff406c26329a93ad87a5833cd87ef7a8113d719bbe6913fd8e1fb29f438fa81e6dada8c0fc39bf0f2e47fe08ae
 DIST ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz 718179 BLAKE2B ac4893892dd2836e46055d57feb492e3122ab2c3c91e56917e52cb8ccc683469ab77d26990b9ee4a4bb3bf639267cce7ded7b07463912cc5579a7a09730da8b2 SHA512 f547c4f0490a25600b4533050db3b5d2ea595ad72e0737fc0be8060eddf7b5712e3dcca59e4d29999415c9455798e232a7de53a9380cbd38f264b4ea371e86c1
 DIST ngx_http_naxsi-0.56.tar.gz 192120 BLAKE2B cdbfc278f346ccdc0d5407d70ddd4740816d9fe786d3d65189d47e6f3b030c02352a30ed86bf1650139a21a8408e74c1ec7d7aa3512df1428870279ab384dd15 SHA512 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd
+DIST ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz 166325 BLAKE2B f80353bfc1f3fc009b847de1c1c5d623a84682efc588649cbd156f669336c95f337442ebf350c79321bf59477215f083817929f13550b22dc7f393583aa16ba1 SHA512 6d6565189d9fabdcf318270107455bb4915d2a43284fb2f77b5cf025a4b4843e990c1c1dbc254e0f3879ca7d30ac7bcd7eb8637f491d5b7f05193aa9865be7cc
+DIST ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz 2123473 BLAKE2B 69208f09ca9f10f59f53a3e949894ebc6e51b0ed5708e551759fd8fbc002c83f5a0462fd22eaf52cae290992633729f47403b33c41539437e40700fb7763ac2a SHA512 ed643aaed8d70dae028ec3df48be3aa2c03955073039cd14fb6187bf162cfee9131ab3e5900ddc349526b171f4da0e01e13b39a669cb85838c1f254476a3c1b8
 DIST ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz 196994 BLAKE2B 90baeb4fb03aeb309bcf1a987420067ca81843ff9b85b8fc26ba703741571e631826e5928a439a3ae79f2f5e369a3acb2cd803789308642ae757d67722ac7f33 SHA512 ad5424d65909d1cf0c2b64d7a4bc3123f4d3e240f1c9d611f6b6fc41167d169f474c723b1c327d42bd295f973a6365ad32e3f095b8c7c7cddc7e54aea138ca31
 DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 BLAKE2B 54ec1bd0d1cc43cdaafc93ebd46b33374c57351c7f022eae0351d6961680abb03d896e7f058e67c43c4fee300253354feccb92d00e62bf91250e251e1860ec03 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d
 DIST ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz 17379 BLAKE2B 4790657b3f207eca460a26f5c4d1139dcd495e29fffedab8d716105e6dc3039cbeeecf5f6005d364470951e25b472860b46e3e08bc9573a5a7b4a23f53532f8a SHA512 6603e15aa33edca5e647fd04b4f008f1729c78c527be262ef481890f37a6d57e89609cebfb7459fad18b249024fbe3722e09473987401e8d8dfdd7cf50e4df4f
 DIST ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz 130073 BLAKE2B 3c93cef79425a46e22ae39adf13d5ebb0e5d36f5d6be8555ec068dd0017918f5355d82fbbe90ba934e58c52e89c2096e24012f75390c7159d1ebacfaaa112308 SHA512 fad2a0d3ac332b6e67c52e3525f6df8a432df3e92bc173190b8107fba7f24476ab9dae4824630299af68c15e856409bd47a3a79fb5b65e03a5133eb90142b8fc
+DIST ngx_http_vhost_traffic_status-0.2.1.tar.gz 179679 BLAKE2B 3f0f950745695997232f4ae07487e58d798a3a4f2cd0ba8d922865a39e010e1282932469fbeee615a115358f1e9e36f67876fa507fbefb7c146d701ea68a864d SHA512 fadd4727ffc56111b443364d90e5b0597f09b25006404b11377586f0ed754f5a85e0b84796360be927bd455f43eb28e18004991f086b611146cd340937a6e5e9
 DIST ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz 380721 BLAKE2B 8a63d9663aa896869345b97e4bb2a9ac93585d6d7ee16891c98f6445b90002ab90989d195399bf90c5a8ad32c4c908794b7cc33fa45183f9069c51906abb1606 SHA512 46451b3c9b7a3c57145fc8e1de9d8ee984286acff2fc3f4e6c4a39589eb42dd686844410312701d167eb369ab5943184b4fde1ef319359e272dad6fcdb8cad25
 DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1d9b11885fbce46fbe9fa4df3dce365320b5963c56aecde3b0039d4f9954943d95f25c5f4fada6256861257f82ebbb12 SHA512 a64ec8dffcd011db2cd12b501271bf5c408f2f31fd2bf477b8db4e88adc5bb5732c4c2181ed8378cab6a937869d8f747ef52b22fe256c90df8440b91890edbe7
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
+DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 DIST njs-0.7.7.tar.gz 609779 BLAKE2B 878c1a106237d42f03074051d12a2de409a1ce3088ec3fd8a43032183608b68e0a11f438668aaca3135ac2280875f248467d6fa801539fcfc6d1436db1579199 SHA512 3fd9e9b84e416e95dbdffced78eabd76a519cccec7c386d8acaccd0d891dea5ceeb702408d4450107c7e3909586753e4eeb5e38c06657cd8f273180beb8fae74
+EBUILD nginx-1.23.2-r1.ebuild 40499 BLAKE2B a09bb6f5d8b77b91c93596e2ff2c5518b521396cac7fdaec02897f75fab8baf2f037d01ee3b5546ac8fb8f58599535d12f08b34991f1057966ca5a2e113313dc SHA512 f372bd09341af2115b946e27338acb729d9b3058442ffc55abfb8c75b1203c9609662b02c46c03ef2d1ae3d8e24c26f9584616d2dbf8481fe6ad75def53b2f0c
 EBUILD nginx-1.23.2.ebuild 39690 BLAKE2B bc9ea5141f66d21cb003b09c37e9a23da3405323364cb3f9fab3c5f161e6b4d2a261a720a3b31e204906b98a6ba9c4da7d614a1e5732038fb6af482ae1664823 SHA512 d2df73e079653c42258661511df7c1ba4ea558cbd28f48b862d721d95726906c3e4e293f4c3f71cb97050b313eba11110091bc04191ba264c99a073ed18ad06a
 MISC metadata.xml 1012 BLAKE2B 5fe75eb9105a998668cfebf02c6976784f4ef3332edd0b6c21a23a5ffb0838b4ae8bc9e52f5157b43c3c0d060825ac46bccabc94bcf8b59447311e0f9ac94f29 SHA512 0d243d1d5271d05d51a46b5825fe32ac5283211434672e99e7314c57f5d1f1f88f48c189fffcdb12747c8d33c9dafe0c8df12376cbbec2912732da0ed6de0642
diff --git a/www-servers/nginx/files/nginx.conf-r3 b/www-servers/nginx/files/nginx.conf-r3
new file mode 100644
index 000000000000..aedaad4f64ef
--- /dev/null
+++ b/www-servers/nginx/files/nginx.conf-r3
@@ -0,0 +1,70 @@
+user nginx nginx;
+worker_processes 1;
+
+error_log /var/log/nginx/error_log info;
+
+events {
+	worker_connections 1024;
+	use epoll;
+}
+
+http {
+	include /etc/nginx/mime.types.nginx;
+	types_hash_max_size 4096;
+	default_type application/octet-stream;
+
+	log_format main
+		'$remote_addr - $remote_user [$time_local] '
+		'"$request" $status $bytes_sent '
+		'"$http_referer" "$http_user_agent" '
+		'"$gzip_ratio"';
+
+	client_header_timeout 10m;
+	client_body_timeout 10m;
+	send_timeout 10m;
+
+	connection_pool_size 256;
+	client_header_buffer_size 1k;
+	large_client_header_buffers 4 2k;
+	request_pool_size 4k;
+
+	gzip off;
+
+	output_buffers 1 32k;
+	postpone_output 1460;
+
+	sendfile on;
+	tcp_nopush on;
+	tcp_nodelay on;
+
+	keepalive_timeout 75 20;
+
+	ignore_invalid_headers on;
+
+	index index.html;
+
+	server {
+		listen 127.0.0.1;
+		server_name localhost;
+
+		access_log /var/log/nginx/localhost.access_log main;
+		error_log /var/log/nginx/localhost.error_log info;
+
+		root /var/www/localhost/htdocs;
+	}
+
+	# SSL example
+	#server {
+	#	listen 127.0.0.1:443;
+	#	server_name localhost;
+
+	#	ssl on;
+	#	ssl_certificate /etc/ssl/nginx/nginx.pem;
+	#	ssl_certificate_key /etc/ssl/nginx/nginx.key;
+
+	#	access_log /var/log/nginx/localhost.ssl_access_log main;
+	#	error_log /var/log/nginx/localhost.ssl_error_log info;
+
+	#	root /var/www/localhost/htdocs;
+	#}
+}
diff --git a/www-servers/nginx/nginx-1.23.2-r1.ebuild b/www-servers/nginx/nginx-1.23.2-r1.ebuild
new file mode 100644
index 000000000000..5fb4b79bbe86
--- /dev/null
+++ b/www-servers/nginx/nginx-1.23.2-r1.ebuild
@@ -0,0 +1,1066 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="1.0.0rc"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="68b3ab3b64a0cee7f785d161401c8be357bbed12"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.34"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.4"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="b6d167cf1a93c0c885c28db5a439f2404874cb26"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+LUA_COMPAT=( luajit )
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.2.1"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/wargio/naxsi, GPL-3)
+HTTP_NAXSI_MODULE_PV="4140b2ded624eb36f04c783c460379b9403012d0"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/wargio/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+HTTP_NAXSI_LIBINJECTION_MODULE_PV="49904c42a6e68dc8f16c022c693e897e4010a06c"
+HTTP_NAXSI_LIBINJECTION_MODULE_P="ngx_http_naxsi_libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV}"
+HTTP_NAXSI_LIBINJECTION_MODULE_URI="https://github.com/libinjection/libinjection/archive/${HTTP_NAXSI_LIBINJECTION_MODULE_PV}.tar.gz"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.2"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.63"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
+HTTP_SECURITY_MODULE_PV="1.0.3"
+HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.4"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.7.7"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? (
+		${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz
+		${HTTP_NAXSI_LIBINJECTION_MODULE_URI} -> ${HTTP_NAXSI_LIBINJECTION_MODULE_P}.tar.gz
+	)
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 +http-cache libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	acct-group/nginx
+	acct-user/nginx
+	virtual/libcrypt:=
+	pcre? ( dev-libs/libpcre:= )
+	pcre2? ( dev-libs/libpcre2:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	http2? (
+		>=dev-libs/openssl-1.0.1c:0=
+	)
+	http-cache? (
+		dev-libs/openssl:0=
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( ${LUA_DEPS} )
+	nginx_modules_http_auth_pam? ( sys-libs/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? ( dev-libs/modsecurity )
+	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	app-misc/mime-types[nginx]
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		${LUA_REQUIRED_USE}
+		nginx_modules_http_rewrite
+		pcre
+		!pcre2
+	)
+	nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+
+	use nginx_modules_http_lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_sticky; then
+		cd "${HTTP_STICKY_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		cd "${HTTP_NAXSI_MODULE_WD}" || die
+		rm -r libinjection || die
+		mv ../../libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV} libinjection || die
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		cd "${NJS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_javascript_cve_2022-38890.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre --without-pcre2 )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
+		export LUAJIT_INC=$(lua_get_include_dir)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export AR CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${ESYSROOT}/usr/include" \
+		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cp "${FILESDIR}"/nginx.conf-r3 "${ED}"/etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${ED}"/usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	# Don't create /run
+	rm -rf "${ED}"/run || die
+
+	if use lua_single_target_luajit; then
+		pax-mark m "${ED}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx/naxsi
+		doins "${HTTP_NAXSI_MODULE_WD}"/../distros/nginx/*
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/naxsi_core.rules
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/blocking
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/whitelists
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-10-24 03:51:17 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-24 03:51:17 +0100
commit	1e9275d80771f014d7754407ca8ab9d7c43247b0 (patch)
tree	2843c5027c4bae59c7cc5dc677e3021510cf96ee
parent	ba3d6ddada23eaa04f85228bee3438ab479b4442 (diff)