gentoo auto-resync : 16:09:2024 - 12:11:35

3 files changed, 19 insertions, 16 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 458cbf92c3a4..d6ac532fa810 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 9d09227b1ae9..4083ee816893 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -5,10 +5,10 @@ AUX nzbget.confd 337 BLAKE2B 4986f3c00019f8f2d0c3d71f9d623186823748722dc4c8aea82
 AUX nzbget.initd-r1 742 BLAKE2B eef074b7e25cd085b92850892ee8917772451b0f58a7f7c3b96c55bcdb115cc99d12e0569f59cc546f9655460230e5f29a82c4d749a654e2019e7c06651c165a SHA512 df4965d25a221c033586da85596584a712bc5c5d9c2e0950850f96fa872f29a04571649e7add504d9fe8be3639654e5653a766a6accf4dea344ca771088b432a
 AUX nzbget.service 466 BLAKE2B 928ff8fd5f48b9190324ccaa98f1215aa35e30eb9959278fe2b9d77f175ee97a28e0efe3ac034ceb2da023c9d7737aa3f803861489284578412559e257700003 SHA512 5a59562580596bc5524086dcb2b2550b242a5f62750fd42a5b2e9ecb786b40107a21fcab7496d0cd396434da7ed3ee5d1046059d94f5f2bcb76ad496862d19e1
 DIST nzbget-21.1.tar.gz 1988916 BLAKE2B 74298c5c7f3986831f36832a8ffe596543196b5b46500925de478bf11cab8e66fb36dee9458533a4194d82123765b29e37914463d72fd206e218b4875861001a SHA512 d8dc1ad324f675c5505e623049a14c022475267aa03dcd5d8fd6cf9ed3b776cc2776077b61d035e252937ea4b6bf8f90bd33e715cfd842d2e012615df3ffeafb
-DIST nzbget-24.1.tar.gz 5365282 BLAKE2B 4fe260c361888d99eaf457a520b39560320b86d181cd12891b35962c9d4c6d773aeb389bf2254029fc58643bb5b04eb24917db9319f1a1068014feed08521dde SHA512 eb4a60cb3a529e2fb8242615e57758ceed615a573fabbe7170490e7af8c228edc90a096860ab7cf49ee85fc834cb8db30aa866c4f149679396139e54c166cf5c
 DIST nzbget-24.2.tar.gz 5512752 BLAKE2B ef4c6e562976030b790a93747d11d6b7059be7cb8bc9076068c037a0e8d25f09054ff280417b52f534af50aec0f11cd21959f995ae8252a21ea274aa7efdfc84 SHA512 ad280315f9a60bf206a134e3703337af2e2dfb8282dd5efc55af071f82f5f7e7857f819dd843f6ae70cd7fcea2c84de4db535d7658fb5255a380ffcf685a680f
+DIST nzbget-24.3.tar.gz 5533518 BLAKE2B 67614aecebb28b2664ab629beddeea6c492e1f32ba71854d1812c7c4e5b41219c1773c33d5952f6e2805bf5804d3fb1e410f9c6cdc0850a4d3036d4253f9c0ba SHA512 6a79f7fcc58c494af19179b6a98d5235423fc8d3a45c6ba969cf687948da25faaf9bcec074b7c9b8ccf2d3621e6bc2dc9c2ae67e877e89fa9a00b8f3ff4ca85a
 EBUILD nzbget-21.1-r1.ebuild 2445 BLAKE2B 3caa46ddd86a962d8627826e98bc8c2444598392c08e2f883ce7b1bdc3bf3054464bbb3eba1ba057ed807244a5f805a9ce0bd607ebf454b23cdbe91c9d5d5fac SHA512 1e983dd0db364d347a8745ce8d37f14f944cb62be57a4452a4df211c85d5c8bce0e14f16861cf5429d2de75b108dcbbf5f34118376bf69b77b2b25293fad4685
 EBUILD nzbget-21.1-r2.ebuild 2581 BLAKE2B 6f09eb6471326471b3c3110b7b4df5b8ea5e09f6655fdaab11b9621033644cedf299b46902001ca76f70490a5b33e9d4c0ac4c63a4156f030ee96b4085e3094a SHA512 b78cc4a774e86f386ae0d61d09f650998257f2e918ae60e1f5f02dd31300dad78cb53229d3552fc997a21aafcdc8028e8da0bd79bc06a8f5ad6df7c4f0fe24a8
-EBUILD nzbget-24.1.ebuild 2566 BLAKE2B f4c8f8c04fe7bee5422868641586b45fd5f21ab785f2065d197b96b7630d4b595b6d15aebf3f1d10c0fb4132bd7e38706b3d286959d8e92fc3ea4a3ad0a71038 SHA512 e9643c4e08631815380427fe7f25f90902112461ffeddcf4b6f017014bff8cbf4379c651a9e70549f8a07375a55e91a62505381b38f6b8d4ffd7e5efe250b134
 EBUILD nzbget-24.2.ebuild 2807 BLAKE2B 38a27e2d5cce8413662eaefa5573d0b4d1d403d4288ff96ee6d098617a17916064811fe4c6a76dc4bb461c6b55cf02eb688fc9ded9fb999b24238f988c99c546 SHA512 c094b9f1533b4e1b80bcbb993a3f2f5200271a45c52e950d5b96d75a8f1ebf94ef5fa651a2eca1a4139023ffed4c4b5fb578c4290d45dde367165046c981fa9a
+EBUILD nzbget-24.3.ebuild 2736 BLAKE2B 255a33da8fb5c5a121d87ded692f661c2ca75a87a0efcef17fa4f593841394b69055d5c5c259c8002b5a522155be723795ee771ffa59244cbf17d3413307725d SHA512 83767bc965de41b0619fc24af0d86c35b05bb67c0fe616f0a13eae37539628cc087224729caefccc9927f83ebde3c256429b1b6127642b765309c0d350d71605
 MISC metadata.xml 586 BLAKE2B 462398c1c6fe7417d36ead5304ba425c9edb034b095dabbfceade1dd8f892c3c1f09eef71b466f49ef2e9599d395b822e264101f181b04f9e33793a89d36529e SHA512 2acf6e839312db5cc6de6c76effe9c40805b976e3421e51a2e3a1deb12f05fb5ed5eb0da37aec17f42debcd38420877c861a30570a9f04325ac8c8ad83bdb56f
diff --git a/net-nntp/nzbget/nzbget-24.1.ebuild b/net-nntp/nzbget/nzbget-24.3.ebuild
index a2fbf9d1ad90..63600a57ae90 100644
--- a/net-nntp/nzbget/nzbget-24.1.ebuild
+++ b/net-nntp/nzbget/nzbget-24.3.ebuild
@@ -44,24 +44,21 @@ BDEPEND="
 
 DOCS=( ChangeLog.md README.md nzbget.conf )
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-allocah.patch"
-)
-
 src_prepare() {
-	# Do not install a configuration file in /usr/etc
-	sed -i '\:install(FILES ${CMAKE_BINARY_DIR}/nzbget.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc):d' cmake/install.cmake || die
 	cmake_src_prepare
 
-	sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
-
-	sed \
-		-e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
-		-e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
-		-e 's:^WebDir=.*:WebDir=/usr/share/nzbget/webui:' \
-		-e 's:^ConfigTemplate=.*:ConfigTemplate=/usr/share/nzbget/nzbget.conf:' \
+	# Update the main configuration file with the correct paths
+	sed -i nzbget.conf \
+		-e "s:^WebDir=.*:WebDir=${EPREFIX}/usr/share/nzbget/webui:" \
+		-e "s:^ConfigTemplate=.*:ConfigTemplate=${EPREFIX}/usr/share/nzbget/nzbget.conf:" \
+		|| die
+	# Update the daemon-specific configuration file (used by the OpenRC and
+	# systemd services)
+	sed nzbget.conf > nzbgetd.conf \
+		-e "s:^MainDir=.*:MainDir=${EPREFIX}/var/lib/nzbget:" \
+		-e "s:^LogFile=.*:LogFile=${EPREFIX}/var/log/nzbget/nzbget.log:" \
 		-e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \
-		nzbget.conf > nzbgetd.conf || die
+		|| die
 }
 
 src_configure() {
@@ -84,6 +81,12 @@ src_install() {
 	doins nzbget.conf
 	doins nzbgetd.conf
 
+	# The configuration file's "ConfigTemplate" option points to this, we must
+	# make sure it exists as the Web UI reads it. It is not installed by
+	# default, see the "install-conf" target in cmake/install.cmake.
+	insinto /usr/share/nzbget
+	doins nzbget.conf
+
 	keepdir /var/log/nzbget
 
 	newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget