gentoo auto-resync : 14:02:2023 - 19:58:48

6 files changed, 9 insertions, 9 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5d078a02ce82..e3fe380bc56f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 2927d70ec306..b1b10c6d0913 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -24,5 +24,5 @@ AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be6
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
 EBUILD ntp-4.2.8_p15-r2.ebuild 4452 BLAKE2B 0bf9938ef9509eddebac35edd67eb6f3fe5eea5b38bf9e01f11d4f89fcdeb6dcee2faf78b8f5c6871f8540f8eeea843532a2432a18e98dd36eff764a72924f31 SHA512 9ed7f41b4407cf45fea06e70fcc1a01bf1af317e3e8d507c2cbd1f1a51c88ff20ae30afb2e1b888c8f61809c27fcda0e900a8b247c537be729ba2ed6327704fd
-EBUILD ntp-4.2.8_p15-r6.ebuild 4624 BLAKE2B ea47504f0c80c4fe6305e3540dde3474c6cace2935a74b9366bc70f0efaf751ae9d60257971a9082f7478295c800f7b1e134ce3c72d6f732de7a88f956ebaeee SHA512 897696d9d2db2105296bfc7a2ac55e446a8a1c52a422681fade3cfb2b65df1019a28d368eabbd94c69dd145bf599307beb3211cb6c293c54bee5dd53cfc642c3
+EBUILD ntp-4.2.8_p15-r6.ebuild 4631 BLAKE2B b99afe652e52a3e78dcf784358ec10bf078443fcce76ecb130616967ca5c233c733ccffd5da2ba87c222d4786922b394a690ec77a963a272afa00c22157a580e SHA512 c84b0d989508e9981078b95378256ca1ee25bf3be10e9f5a2ebc735dcdef33374b3cde3cd887cd6fd473bcfd1475fd8e09052edc4b5cb3eb57393a17069b6179
 MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791
diff --git a/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild
index 64ff48c345f8..47cdd643d619 100644
--- a/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild
@@ -112,15 +112,13 @@ src_install() {
 	fi
 	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
 
-	newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf
-
 	if use openntpd ; then
 		cd "${ED}" || die
 		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
 		rm etc/{conf,init}.d/ntpd || die
 		rm usr/share/man/*/ntpd.8 || die
 	else
+		newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf
 		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
 		if use caps ; then
 			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
@@ -137,7 +135,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process ntp.conf
+	if ! use openntpd; then
+		tmpfiles_process ntp.conf
+	fi
 	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
 		eerror "The notrust option was found in your /etc/ntp.conf!"
 		ewarn "If your ntpd starts sending out weird responses,"
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index df731cb52d8a..265682c4871b 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,5 +1,5 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
 DIST pulseaudio-dlna-0.6.5-1.tar.gz 712483 BLAKE2B baf1fc94f41c9ac2ca7df5c239ace36b36da4d7a40e30cf19fa630f51a0e94fa44a1ba531943ad5c4425580e4bbe68af1d5de48f5f17163783aab7b471faa72e SHA512 6fd59ac6ff0dfa98baed7a5d929c6f7d9f3539016a6383770895732f7066bc260b3d56751691573d0834a0ee29a6e542ef26e66e48c7a7af97cc84ca23ff5c2d
-EBUILD pulseaudio-dlna-0.6.5_p1.ebuild 1843 BLAKE2B a7fd358253f96a90b7e032ea7807db690fa157ea306d24bf1392fa336c049058b82044ea9f3d76694d1255d2a3c8766a7be0f3b5159bd200da1ee123bb5e0fa1 SHA512 85528a80d49035fbf12647da69a1c88396d64e01f965103e0a5ce2b572a42d81b89ffb178cb0ed93793f1dae649f12f91a44206a6d43bd09b5a2e7f0b1c25d87
-EBUILD pulseaudio-dlna-9999.ebuild 1843 BLAKE2B a7fd358253f96a90b7e032ea7807db690fa157ea306d24bf1392fa336c049058b82044ea9f3d76694d1255d2a3c8766a7be0f3b5159bd200da1ee123bb5e0fa1 SHA512 85528a80d49035fbf12647da69a1c88396d64e01f965103e0a5ce2b572a42d81b89ffb178cb0ed93793f1dae649f12f91a44206a6d43bd09b5a2e7f0b1c25d87
+EBUILD pulseaudio-dlna-0.6.5_p1.ebuild 1836 BLAKE2B 3fe1fba9f1efed9dd33d2a76a5cad584c7fa7c5eda6eb340380ac69146dfa651a60952713ca66eec76655647d95396f905ae86cbbb087eba34730b28e96a9fc1 SHA512 79bba9ef6ede3cd41eeea85b431d52cd8c52b3bbd60bcbaabfd2945e8085dc9a82b4d42cc05a9cd6d9f9e9d213c3b2e0a74dce44eb00669541a45e125326da3a
+EBUILD pulseaudio-dlna-9999.ebuild 1836 BLAKE2B 3fe1fba9f1efed9dd33d2a76a5cad584c7fa7c5eda6eb340380ac69146dfa651a60952713ca66eec76655647d95396f905ae86cbbb087eba34730b28e96a9fc1 SHA512 79bba9ef6ede3cd41eeea85b431d52cd8c52b3bbd60bcbaabfd2945e8085dc9a82b4d42cc05a9cd6d9f9e9d213c3b2e0a74dce44eb00669541a45e125326da3a
 MISC metadata.xml 341 BLAKE2B 9add00de1558ff7ed828022b6e7818de975fb233b6b821f9c7bded156081dfd5edca2ae3237fa3cd2324aa615c6ed02008727a002ddb7b3331f6dd25a2ffcabc SHA512 58ad5457eb2dd3c0f926f32f40433899b1fe2a0456136d0b37b45ae3628994349bd60984e83388514e58b778b6c070ab99c53673f56bd1b7c03a927f1e4afe42
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
index 55ffefda223e..3836fd21fc68 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
@@ -38,7 +38,7 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pychromecast-10[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zeroconf-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
 	gnome-base/librsvg[introspection]
 	x11-libs/gtk+:3[introspection]
 	|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index 55ffefda223e..3836fd21fc68 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -38,7 +38,7 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pychromecast-10[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zeroconf-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
 	gnome-base/librsvg[introspection]
 	x11-libs/gtk+:3[introspection]
 	|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )