gentoo auto-resync : 19:09:2024 - 12:11:50

10 files changed, 17 insertions, 157 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 5fb800a62d84..9aeaaf0dd384 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
index 1c59a09b826e..1d8bc7ee44f7 100644
--- a/www-servers/fnord/Manifest
+++ b/www-servers/fnord/Manifest
@@ -1,6 +1,5 @@
 AUX fnord-1.10-gentoo.diff 3204 BLAKE2B 98b868e50712d8048a3f3924d8af93f5a5b34d083cba7b2d64a4f02ccc672e20d8a3eaf5a1c2411537763d85ea74a577de6f8b5bb57bd2c1554e038bcbb00f5a SHA512 93921b050e8b165124b738fcd96c0d828289ee238284088c6859777fd5ca647f9156a0419e4cd6ee65df6e9d944913b8f1e7c6382c358b8c549425cac7414a7b
 AUX fnord-1.11-clang-16-build-fix.patch 1754 BLAKE2B f19c6f02451876ccc28a8c17c042ee8901347202215064f69f29d5bf29529c2524dd3c45bdcfd1b02a8fb0aa4f5aff786a5b44037ef9b1d90f0108e22532283c SHA512 d8f0e8ab340d7610986338a9c8a76d0431a4cff75bdcf4b28a499c6f0919fb3cdb75deaaa9b68d6ab8550926384f33e5a02e839c7a05b5d854bfc1d44d111e26
 DIST fnord-1.11.tar.bz2 28845 BLAKE2B 1f9ce7ca3476f03af0528f9ea6701be25babbd8a38398df3f87d1b1a18a28182a54bdfe814165ca6422f427bcdabd013f9eed2c1f178f0403829b38d618c2d08 SHA512 12a3751a2f98acb3ba2d468972bb785b656fa01bfb0828bc9ba5488dc7a2a66e9f226a6cc49ceda57aa7875d8d90954a9e79806c9506a7906cfff346cd400154
-EBUILD fnord-1.11-r2.ebuild 805 BLAKE2B e0473666a591bebe48849e06aa769dab5acc21785d36919bbf303044d055cb03dbe3d2255a5b24bc7b9905b09492222f378fed056c816277b0d97f69cf0a24e9 SHA512 268db514666d3316a1905dbf0464050a836cef714e5fbc2e579d0dac6acfe1d4d5313697895324a2fd15227f01213b547da7d5f99eb89960b4113e7080f5b81c
-EBUILD fnord-1.11-r3.ebuild 857 BLAKE2B 77ebb0901eec931ac4639366113d01f918be628498a368d69c56de36900fd9b0d9bf229d18ca379606d05b7d649eda5765abae2e9db72dae09397c2585de8ded SHA512 0815381f18387396a15e3f155b8ea0b962aced1670357261035f4b605a0bec143a52cb8913617b88e49b1db3a7188bd6089bf2eb9a2eb1ff924ade9b57f07849
+EBUILD fnord-1.11-r3.ebuild 859 BLAKE2B 161587caca29aca8c435a824ed749318d7bb84a6aebe3a34a74b8738e52f67a5b8fd425770f118f55db9e3e6050497b5172819bd44213d4c1bb3a3aec467e76b SHA512 f3efd965108b149b0d5171465bcad680bd6a88231f4697fcffffba86f18eb201b1679e066ff8349c38f3398e87672af4c8d0419adb218fd48d89965219835264
 MISC metadata.xml 243 BLAKE2B d17ea14b6fef5fd20e29cbfb80aab78752009e81a210b5055625b47201865313b046606242dc67e6c05abbf750bb63168b04ed0b72d95ef25cfd726e9f92fa0e SHA512 0739754999c376e2625535b6e79eba598576d24e09479e8c695479fcb07c39336af2558b287e1199f8db38ea931804f35412047d52d11d2712f9e7f137406047
diff --git a/www-servers/fnord/fnord-1.11-r2.ebuild b/www-servers/fnord/fnord-1.11-r2.ebuild
deleted file mode 100644
index f458bde99dc3..000000000000
--- a/www-servers/fnord/fnord-1.11-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Yet another small httpd"
-HOMEPAGE="http://www.fefe.de/fnord/"
-SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~riscv sparc x86"
-IUSE="auth"
-
-RDEPEND="
-	acct-group/nofiles
-	acct-user/fnord
-	acct-user/fnordlog
-	sys-apps/ucspi-tcp
-	virtual/daemontools
-"
-
-DOCS=( TODO README README.auth SPEED CHANGES )
-
-PATCHES=( "${FILESDIR}/${PN}"-1.10-gentoo.diff )
-
-src_compile() {
-	# Fix for bug #45716
-	use sparc && replace-sparc64-flags
-	use auth && append-flags -DAUTH
-
-	emake DIET="" CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin fnord-conf fnord
-	einstalldocs
-}
diff --git a/www-servers/fnord/fnord-1.11-r3.ebuild b/www-servers/fnord/fnord-1.11-r3.ebuild
index 45aa8d0b571d..f433e4d75938 100644
--- a/www-servers/fnord/fnord-1.11-r3.ebuild
+++ b/www-servers/fnord/fnord-1.11-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Yet another small httpd"
-HOMEPAGE="http://www.fefe.de/fnord/"
-SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
+HOMEPAGE="https://www.fefe.de/fnord/"
+SRC_URI="https://www.fefe.de/fnord/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 2c267eb6c290..7b551ef54e78 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -7,14 +7,14 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.28-src.tar.gz 6330343 BLAKE2B 0472035a9577683c7efa6a2ada4cf97c031a4df7c1678185b56da4dcb66d50516b72769aaeac6cfa8831097044b408b9fcab9c4b47fc7a21a86acf5c5cd83568 SHA512 fd69a7068fdfb89ceb2e71f64c7a9c17c54a4ebe65d7ea9936df266630073c6fb7412903a028fce4c465b1f46abb15d13c46fb408668dd937fa7f6bba4a75df6
 DIST apache-tomcat-10.1.28-src.tar.gz.asc 833 BLAKE2B ae94b9f7d3b413e6209215edbf5453e5f90acd975d30a036797a628981560363af2d5da88f82af7114f2032157177151bb25d8cc046c032129bb22ae95e716c2 SHA512 a7ed73b51f78b2bb1461f28ed4b12516b77a5c65c3484269a8c889f111df14e81901cfda17831ba1b964b1d0acf717ae48386eea733255ad12df9e2b46ae2806
-DIST apache-tomcat-10.1.29-src.tar.gz 6321636 BLAKE2B 5d3bee8eeb8748edfaebd51f70025de85abeb42bcc1748f7b3cbef5bed4e6fde20f49439ff573f36e605ef307e4062a1d9243e7b1cb375ad8f67bfb947b99c30 SHA512 11dbbc2420043a71cf1a174e0066bf3fb6d0df07e87fa5a76769b899af357ed1065b379986e122a6c63d1cdd9890e793a18c6a31793b6f2707950398d0ebada2
-DIST apache-tomcat-10.1.29-src.tar.gz.asc 833 BLAKE2B 638afbd5cbf35040388a712e5369e546da361e4b43983204a4b5e1341e6665b558d288c067bdd916411d42724482078340eeef03a1ebf35115d3e998ebb59aa1 SHA512 108bd120997f407a776ad3ac7b6b2aeb4e17c4c44ca5cf75f3505f6ef8a3141203210099d2c01ad2387ebbed95f0f81865c687e6746161a508de8a0b1745b322
+DIST apache-tomcat-10.1.30-src.tar.gz 6924092 BLAKE2B ef1473ba50e7916691e10dc53345b76707a60c9809edab6202ec9daacc18066e713319fb25e341606124fd840148223fc63e52dd6970de6fc570d03cf87d1b17 SHA512 df26414d934e02797d1133ae9bcc110f9c3ef835de2d416c914e9c37872d4224a89b246942db57c6f85beb3c5686a7ff7a9e60d586349848913379de3211419b
+DIST apache-tomcat-10.1.30-src.tar.gz.asc 833 BLAKE2B d12710695f14d662f2e8a410ef4fac63db7fbd1086ac5d9175aadf94a0cee7bfb1b21347aa0e6fa9f64a94ee282efc62b46115a343141d75193ffccb8ef0553e SHA512 1e959b29fa706c6cb1130b27863a3b51e105153eea5f14961058c3f65bb2d93eaba6a7b0b37380e5d8a84610986f423a3a548a8e1940254fc30dfc4f05ecaa9c
 DIST apache-tomcat-9.0.93-src.tar.gz 6472760 BLAKE2B 85e7da7eca0ac2a6d73b92b7eec73808309399513f326809e5f9343177cca6c8cf321489f6f1bae86426d626f5afda10f844bc77792d05cfdc8ccefb60d51d2a SHA512 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac
 DIST apache-tomcat-9.0.93-src.tar.gz.asc 833 BLAKE2B 93f12701716013d17c4b3dc9b18713274fd1ad0f4455c3ef1bd9469920fc337f8f75784b961a8b83de90da28aff5b9e6e6a12cfc9aa217f9af4826fc6ee51871 SHA512 90977bc66413f1962cc1a00e645718e0f9cec93295110c29685df6cd62602994d142b6909087d7eece05b28fae5194d2c9a42c12027e6cb6e82c177d1fcd4f51
-DIST apache-tomcat-9.0.94-src.tar.gz 6463031 BLAKE2B 4c2e43418c073ab41fc566157b7d8a4dd6134c58f4dfc247b6ccf09c165d350b3741c43cfc619d60b5d8d0837d7774d886ae223f7208663354098bba1bec0bb8 SHA512 d731f4e8693326d5d9641a06ae77de9ef94088ffa0ddfdf52bcec3f5bc22c3139008750cefb156a078de0bb60d84131c3953305499a3bd912763b9a1c49504f6
-DIST apache-tomcat-9.0.94-src.tar.gz.asc 833 BLAKE2B bf413914af1deec7bddb2544d857674509abd5d09f0c2a66e28cbe1d81440ccf3676635b837b3035c77a516480da00ea85ef9de38edd18c0bf5c48e5906c86b7 SHA512 a46770cca1fc5d5d9af59f4dfc772a3b97c5908698f3d44590fce7811ec37d57ddcf251c2c96b1144583c94e2ca0a517c28bdd46800c804689740d9840063a36
+DIST apache-tomcat-9.0.95-src.tar.gz 7066563 BLAKE2B 9d00ad14c8bdbd9f63d9a9dc1651a36430eee09ebeb6c0b313802236544243866d75d7ca33544bcc8e9cdf4d3f636b9ccd8f754ea3212fe1c221b292d8a74984 SHA512 8ab69edd3761f2be112dbef9047cf331ad4d5ff8feb83dc35bebcdc1384853ed33313cc152f38f0604629d94e32a5eaf242a1dda8e7b04b9442dc03eb6b3b7db
+DIST apache-tomcat-9.0.95-src.tar.gz.asc 833 BLAKE2B 51dcbb097426b7678296926690da9b18f617962a207eeaa3b6f9744dd285f3aa33b21da52573e066d536724e85c702dfde9995b674d79c47b48d8e29e09c3ebd SHA512 441ce2923fc5ae1d1fde9b3ee9de8eb0867528094f62cdc02fa7117a40523cbd16e81a5b815e40db02f85e9bed20ebee41115d87a4652ab5b7375e777e93ce16
 EBUILD tomcat-10.1.28-r1.ebuild 5439 BLAKE2B 17a5783bbae43b82b7062ebf0c3ee13071cd15dd0f82b1333a97f9fe1674ac094d657c4dff11002447deda862c97f2aedeeb3deeaf2a3e2c75bbb61f54f98a78 SHA512 ef59f82555de4f6341ed7ad088bc5c28f18b5b62c266e06dfac791179c81104d49b59f787e0dcaa2e06877f7a7f5fcf5636b746c5bd6d17c8fbc21e9cd615718
-EBUILD tomcat-10.1.29.ebuild 5440 BLAKE2B c0752dce05c3110479456e462bf0a84935fb9776507bd1483b90d492b1a305fd777b5bbaf08392780d9a5bd9affcfcbe0743dc7c0ddc0d12af64869e43d28970 SHA512 784db46a715805c025a16ab96ffe2171b74b43b3f1373a474f28a10c4136cc7bb2da347d4c3a7f7f508d7839c9e7104c6f549da706feeaa783203ce00e6cffbe
+EBUILD tomcat-10.1.30.ebuild 5440 BLAKE2B c0752dce05c3110479456e462bf0a84935fb9776507bd1483b90d492b1a305fd777b5bbaf08392780d9a5bd9affcfcbe0743dc7c0ddc0d12af64869e43d28970 SHA512 784db46a715805c025a16ab96ffe2171b74b43b3f1373a474f28a10c4136cc7bb2da347d4c3a7f7f508d7839c9e7104c6f549da706feeaa783203ce00e6cffbe
 EBUILD tomcat-9.0.93-r1.ebuild 5024 BLAKE2B 991d775e579c0edaaa0f2af4fcb6860208e3907ddd934e5c13f9e646092c0d43284d6d18e6ed0a5d22a02766ae9a53143a7ef7bc17917810e7d6098383b29c0c SHA512 acc0aadafb8f56b4e7545202e3a7c9af545592a9ed17b445df86207e89f78bba81e5b8838bdc852d19127501e1ffa5c89efafc7ea37943fb2934dc30ee80fa1a
-EBUILD tomcat-9.0.94.ebuild 5025 BLAKE2B e2ffa52dbce4ce65ccfcb8c9f266f655227482b0f93ca6974e590e76fe2af617441a00b4f701a65b29850d8b8a2ad31f10ab560d7ea2df52cca6eb8c3602c11c SHA512 197a6fa5f8877cd1391e935ea7d09c7f7157197ba16c221382ffeab88e1a1e8264a5c64198e7dd9067cc1c7ea0dedf0ae2cf29050884087c2f6ab3a50349b860
+EBUILD tomcat-9.0.95.ebuild 5025 BLAKE2B e2ffa52dbce4ce65ccfcb8c9f266f655227482b0f93ca6974e590e76fe2af617441a00b4f701a65b29850d8b8a2ad31f10ab560d7ea2df52cca6eb8c3602c11c SHA512 197a6fa5f8877cd1391e935ea7d09c7f7157197ba16c221382ffeab88e1a1e8264a5c64198e7dd9067cc1c7ea0dedf0ae2cf29050884087c2f6ab3a50349b860
 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0
diff --git a/www-servers/tomcat/tomcat-10.1.29.ebuild b/www-servers/tomcat/tomcat-10.1.30.ebuild
index 1c4d65ce7969..1c4d65ce7969 100644
--- a/www-servers/tomcat/tomcat-10.1.29.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.30.ebuild
diff --git a/www-servers/tomcat/tomcat-9.0.94.ebuild b/www-servers/tomcat/tomcat-9.0.95.ebuild
index 14e23d60b567..14e23d60b567 100644
--- a/www-servers/tomcat/tomcat-9.0.94.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.95.ebuild
diff --git a/www-servers/xsp/Manifest b/www-servers/xsp/Manifest
index 10e6ed191398..d7292f6742a0 100644
--- a/www-servers/xsp/Manifest
+++ b/www-servers/xsp/Manifest
@@ -1,13 +1,11 @@
 AUX 2.2/mod-mono-server-r1.initd 2002 BLAKE2B 7dc59b1e4b1a356fd015deed2c86512586ca96396ee143e5c1f1cb3fc821281ba003b476933f07ec1b5142101324062e3088460d6ab358972a237ae42bee9ac3 SHA512 570daa64eb7ade8281f2d874cb7ac24afb52f385360a8a49a9a43141f4c9ea18b87cc897e4daf4c53d2a1b8c0cf45f3e0a06f2908f63cf80c17b26cce5e4df14
 AUX 2.2/mod-mono-server.confd 1214 BLAKE2B 874bb6e6fae3430d7a5cc9f6f0c19f6ddba1e2118cf7e116a54cf2d4d54d479918ddfd412602e9c14f94c43180e0ac0faaed38dc3b2aca005872ee6ff32a0a4a SHA512 1dfffca9e07e9bc0af779be37683beafe40e436d51f80c0b5d5ea0f00e5726b85a9f1265c660799ff76a6ec0261fc0749bb3f94cd5d158b606a55e5d98cc54ce
-AUX 2.2/mod-mono-server.initd 1906 BLAKE2B 2e21f2c41786ffaaff8903fd0b971b59c2d58014cbeee5dc6eaaf9fb789ee14c98226af73fe24677622cd55bfcc6782fbf961eb073cf49e4f4d0372c32b8572d SHA512 15922bb445f97f084295185a1211692197dda58e8d794fb6c20e44801db4a802547253814d70608a10540bb340e7ac71294c8be58689f7700b9c9faa424b0eb5
 AUX 2.2/xsp.confd 306 BLAKE2B 185ed6b9c9d5404d83b0c6c9973e28f8c0ab5804533c6c587ff602811f4f6c77a6a647062aed380b0dc047fb7bb4bbac0b95ce6398e70f15b94aefbe84772a8c SHA512 4c82a22b3da305e7b73dde941e30058e7a717c032980ebfd4a99c5be3fd84aec77fd3d6f3787d165503790e07bfde4193c72ed4d2bfb3c08033b964ac933ec9a
 AUX 2.2/xsp.initd 796 BLAKE2B f87d56d984486b2d33d145a5d164061d074136adaf5f2687d976fa21361d0cf86365bbfae597fe51467e004f24cd4a41a19481a387d4afe4dc4170e37965f555 SHA512 d28fbce8838c6796362ec7bedcedfedee5e60524758b16ff6a24952ff20acfea658b824f070ffc59b9df381895a0e0346177a7aa1129de59f67543102c581f44
 AUX aclocal-fix.patch 227 BLAKE2B 1fc1f76db1df3c09edaa7ffe6f8f9a0355d34797c82118be6af472cf87acaa8a242e9143655c152135f48735addd4d2fbc73f155feda512610af4d9445400f73 SHA512 2ec9bba4bebd4d0b9ee86127972018d26f133e922af0c8f77f32cceaa6a057fa806f9e845b2984bdf02ebf11ea0cd737c9d31c972de032e376adbb49a5a70020
 AUX systemd/mono-xsp4.service 340 BLAKE2B 96674d1c6cdfffcfa0a2530ea58c99b4cea8e7c4d3cc1ee8a9b694919b045cb5ead55a715fdfc125fe8c8cd2e4277bf8620e3a4e06471697ba7799acdc7abcac SHA512 d4df0cad0ca0c72cf282ecf377409d255375402910a7f762f9d395a407e63eb3c314932cfee69ec733cb9f1cb7cf88af7125fc2723335efc049cc6ebce2756b4
 AUX systemd/mono.webapp 315 BLAKE2B 159a9c27bba5956dad1b7a2ec1587bd35782d1cb236b9c957c1906b52faeceb4d333e91872b9505e73153a4d16bc1ed6aa76b3b296c1641cb0dc04fc4f56744f SHA512 e7b33fa0f36b27854c8a215cacab25760b5ff91f12415dbd9406e1f92cb0faf035bcfb14b8e0b37c22ff73f0a9c31a1cf9ac213c9167e5f8618a943440e0384d
-DIST xsp-3.8_p2014120900.tar.gz 307722 BLAKE2B a6c7723e41490022ea969961f93fa3cb5b5eb583edd6ad1ef40dc38adc29cc9c0de16b7da5e98074b0848cdb7cce1e4c5e0298dc6f7f71d6a5c5e542a662005e SHA512 bf7a8cbeda330be98eb6fb1942ca9d6d8107ceabfb47db36d4b9b1f9d99afb329bad7737a4c9bfbf3ac205e9499dd58b2aa1cf7dfd83e41ee50b3820b05d4596
 DIST xsp-4.7.1.tar.gz 307143 BLAKE2B f8a3a09d644d567728e6462df553ff52fdbd17e974dc25aeebd011e7b6c22ef76be69cc49acfd1cdd9edbd30728ce6b7ef5f33ecda50653db219863b17442b36 SHA512 f106b073bc17ae8fafcffdf2f0db7284f36b62b648fd79321a0de7f5ed15085a9116deccf464e72b3e6f5daf8d65d0a6a3d55c1b275546a4762fa3236bd58e2b
-EBUILD xsp-3.8_p2014120900-r1.ebuild 2248 BLAKE2B db2f3e6e8a0901d485f3273de43089efcaee56ba3b53e2a62645a6a8550b6e546b5e6e1e59a6e2bc238d7cbb60339a00cd3df794ec8600f9079b8cdb6b8fe9b3 SHA512 97ea17d17ec5fd5d85d93f421562bcce19d191599a486241d7abd8d7ef6b085a709d14822b1b4d5cba276d385b90fa0745c37675db44a4dbc1fc847ec5da925c
 EBUILD xsp-4.7.1-r1.ebuild 2061 BLAKE2B f921c8dc2fd3f88dbec462a9ba3d4d59a88904bdfdf49c2908b6c9593802cb54cfce6f18d6461e1887a3d57810d3a7942651ea986ec6b59d1bfd60d03ef06f72 SHA512 4c26b8df50a007c822a8350287c4f3863daf0b057c43e2a1d9a1d97c0e787a0ed82b00149053c4eef55760a8e605c7761d56075e4be53e6bfcb2f5f35f62e5fc
+EBUILD xsp-4.7.1-r2.ebuild 1800 BLAKE2B f3bd4bad326f1341faddf43afffdfd10dc417f16c57fb5fa05392007179271a488245912c268dae91a924fcca8775f514dca5d76c2e3b54cc12f32f78b8bc32a SHA512 772972ca52ff99e8a0e2e82454025977b34656139fbfeff8eebc90a590326265846cf16706f9355df032b6c7a911f1e0bd00427c810d5d450c19e1c50b993a1f
 MISC metadata.xml 489 BLAKE2B ca2b5fae7e5a66229675cffa57d826d95e68662da79d8ec73607295e4bbd8d659c6e672cc77074a9da8835a77c9af74ceed8f3b8466a8067756cb76e0c6a7fbd SHA512 8bd47d77cc8d6f1a22c2e84315509714c1c29dbbbdb89d2b9ed795f8775614eaaf59a2c061570dafb3476776bfb2d4756196ab79a170377ffd6844e6fe7e48ed
diff --git a/www-servers/xsp/files/2.2/mod-mono-server.initd b/www-servers/xsp/files/2.2/mod-mono-server.initd
deleted file mode 100644
index fb1c44935e09..000000000000
--- a/www-servers/xsp/files/2.2/mod-mono-server.initd
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	after dotnet
-}
-
-start() {
-	[ -z "$MonoServerRootDir" ] && \
-	MonoServerRootDir="/usr/lib/xsp/test"
-	[ -z "$MonoApplications" ] && \
-	MonoApplications="/mono:/usr/lib/xsp/test,/:."
-	[ -z "$UnixSocketFileName" ] && \
-	UnixSocketFileName="/tmp/mod_mono_server"
-	[ -z "$MonoServerAddress" ] && \
-	MonoServerAddress=127.0.0.1
-	[ -z "$MonoServerPort" ] && \
-	MonoServerPort=8080
-	[ -z "$MonoServerVersion" ] && \
-	MonoServerVersion=1
-
-	MONO_SERVER_OPTS="--root ${MonoServerRootDir} \
---applications ${MonoApplications} --nonstop"
-
-	[ -n "$MonoApplicationsConfigDir" ] && \
-	MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---appconfigdir ${MonoApplicationsConfigDir}"
-
-	case "$MonoServerChannel" in
-	"tcp" )
-		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---address ${MonoServerAddress} --port ${MonoServerPort}"
-		;;
-	
-	"unix" )
-		[ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName
-		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
---filename ${UnixSocketFileName}"
-		;;
-
-	* )
-		eerror "Please set a valid value for MonoServerChannel"
-		return 1
-		;;
-	esac
-
-	if [ ${MonoServerVersion} -eq 1 ]; then
-		modmonoserverpath=1.0/mod-mono-server.exe
-	elif [ ${MonoServerVersion} -eq 2 ]; then
-		modmonoserverpath=2.0/mod-mono-server2.exe
-	else
-		eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/xsp"
-		return 1
-	fi
-
-	export MONO_SHARED_DIR=/tmp
-
-	ebegin "Starting mod-mono-server"
-
-	start-stop-daemon --quiet --start \
-		--background \
-		--make-pidfile \
-		--pidfile /var/run/aspnet/mod-mono-server.pid \
-		--chuid aspnet \
-		--exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \
-		-- $MONO_SERVER_OPTS
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping mod-mono-server"
-
-	start-stop-daemon -o --quiet --stop \
-		--pidfile /var/run/aspnet/mod-mono-server.pid
-
-	eend $?
-}
diff --git a/www-servers/xsp/xsp-3.8_p2014120900-r1.ebuild b/www-servers/xsp/xsp-4.7.1-r2.ebuild
index 5a2a1649d828..8a89773c5328 100644
--- a/www-servers/xsp/xsp-3.8_p2014120900-r1.ebuild
+++ b/www-servers/xsp/xsp-4.7.1-r2.ebuild
@@ -3,21 +3,17 @@
 
 EAPI=7
 
-# TODO: We can probably yank the USE_DOTNET/dotnet.eclass stuff
-# but let's be conservative for now
 USE_DOTNET="net35 net40 net45"
 inherit autotools dotnet systemd
 
-EGIT_COMMIT="e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
 DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
-HOMEPAGE="https://www.mono-project.com/ASP.NET"
-SRC_URI="https://github.com/mono/xsp/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/xsp-${EGIT_COMMIT}"
+HOMEPAGE="https://www.mono-project.com/ASP.NET/"
+SRC_URI="https://github.com/mono/xsp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="developer doc test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 DEPEND="dev-db/sqlite:3"
@@ -47,25 +43,14 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		"--enable-maintainer-mode"
+		--enable-maintainer-mode
+		$(use_with test unit-tests)
+		$(use_enable doc docs)
 	)
 
-	use test && myeconfargs+=( "--with_unit_tests" )
-	use doc || myeconfargs+=( "--disable-docs" )
-
 	econf "${myeconfargs[@]}"
 }
 
-#src_compile() {
-#	exbuild xsp.sln
-
-#	if use developer ; then
-#		exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
-#	else
-#		exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
-#	fi
-#}
-
 src_install() {
 	default
 
@@ -90,6 +75,4 @@ src_install() {
 	#
 	# insinto /usr/lib/systemd/system
 	systemd_dounit "${FILESDIR}"/systemd/mono-xsp4.service
-
-	keepdir /var/run/aspnet
 }