gentoo resync : 16.09.2020

3 files changed, 8 insertions, 7 deletions

diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 9fd9d402da7f..584588668139 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -1,8 +1,8 @@
-AUX vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch 915 BLAKE2B e7611c54b57e2bfe0b6d9e56c4bdcc22de6f24a2af1752e30b1f41aa4e22ca721a0b665f36dc713e7b3264408df5b4a729ef421dff3df8a52336476444a6ba07 SHA512 ce5724db1778f390ddd2b601d2402f06549f81cd2ea0098868922bb03e1ecdf7d3aade40aface2710e471052484b795ce9b3437d136e4f04c02d81a900429148
+AUX vpnc-0.5.3_p550-r2-var-run-fhs-3.0.patch 915 BLAKE2B e7611c54b57e2bfe0b6d9e56c4bdcc22de6f24a2af1752e30b1f41aa4e22ca721a0b665f36dc713e7b3264408df5b4a729ef421dff3df8a52336476444a6ba07 SHA512 ce5724db1778f390ddd2b601d2402f06549f81cd2ea0098868922bb03e1ecdf7d3aade40aface2710e471052484b795ce9b3437d136e4f04c02d81a900429148
 AUX vpnc-3.init 2197 BLAKE2B 8f88a7f27207e1ab4f2e9b4f31ceb06668f26fcace00dd169237766775ff72d9db1df0827f2ddea76144085270a85c801d1ffc14bbeb175dbbecdb21bb50c69f SHA512 d05a362606f314c0c275b2354308431c9aa53d8c83172fa86d34c28573f0ea527b1aa9e2dcb8341f212600bd3a50ba8ea3038a05b494ac008297b03e528abd97
 AUX vpnc-tmpfiles.conf 29 BLAKE2B cc5cf7d24be2117a95c339667771121df32d813680a32cbda995a1fd2e90cd6b93f6b9b749b28a4f34aea417001b330ca53ed5a3291de9d7b2d99965342f603f SHA512 21635c67b89ca04880eca6c53e47b2b4ed27f992415d466d27a634af3393b1aa7a75cf09b8ad1a6a80cd2f93c508eb8cc6876ae20bfe3a1c66b7cd09f1e7661d
 AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e263fc27c60500a3e6da59f1e905611aec39a62dfcc3c4b746a580a8a106fc6be9384d716955d SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633
 AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
-DIST vpnc-0.5.3_p550-r1.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
-EBUILD vpnc-0.5.3_p550-r1.ebuild 2185 BLAKE2B 408c5c45d31849ab31fb31716457baa0751e2ffb3dc517244feeb0dcf6f6679cea6fc59492ff4f54da01a6fe2879248e843f792c4616653ef57b1266749acafe SHA512 0989f0800bac556430206b7a4f8f5cc0b0ed87a51501cb695d2f280de83405d79787dd9be4a0ee482f2f90370738cbc9175fc2c013510c3887a759761bf6c89c
+DIST vpnc-0.5.3_p550-r2.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
+EBUILD vpnc-0.5.3_p550-r2.ebuild 2222 BLAKE2B dfb28bb7ca291d8aec19a35f85e594cb1cfbbf23bd29ad53f7af1b668091749ede2f7bc7151a849637510edb091b21eb655902eaa919c19b71bcf2ec88662260 SHA512 0ffa5a8a59f9935c004362a8ba063cf7c10d89698e000a87381157679efcd59290bd4e264641a3bba0caa035d8119dd5b938436f29d28f75c5eb42ee1af171c8
 MISC metadata.xml 364 BLAKE2B ad78bc77b84330fe5680966fa276e821746d7a950e326fde42fa8d330ed176fca5a7dc31831e9af97c28a243aabcb693ff0016d93fae1b702c10f968167b26fc SHA512 5d31b14522ea8c365ead3dd5bfa2370ed6347259f023b17bd19707628ce5e1d0141c340869846de508e3268f79ff298bb93026adc4a798e4774054ee06672174
diff --git a/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch b/net-vpn/vpnc/files/vpnc-0.5.3_p550-r2-var-run-fhs-3.0.patch
index e574b51fba63..e574b51fba63 100644
--- a/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch
+++ b/net-vpn/vpnc/files/vpnc-0.5.3_p550-r2-var-run-fhs-3.0.patch
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
index 8e9eeda195c7..529bf1d4e355 100644
--- a/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info systemd toolchain-funcs vcs-snapshot
+inherit linux-info systemd tmpfiles toolchain-funcs vcs-snapshot
 
 DESCRIPTION="Free client for Cisco VPN routing software"
 HOMEPAGE="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -23,8 +23,7 @@ DEPEND="
 	!gnutls? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}
 	resolvconf? ( virtual/resolvconf )
-	selinux? ( sec-policy/selinux-vpn )
-"
+	selinux? ( sec-policy/selinux-vpn )"
 
 CONFIG_CHECK="~TUN"
 
@@ -45,7 +44,7 @@ src_install() {
 	newconfd "${FILESDIR}"/vpnc.confd vpnc
 	sed -e "s:/usr/local:${EPREFIX}/usr:" -i "${ED}"/etc/vpnc/vpnc-script || die
 
-	systemd_dotmpfilesd "${FILESDIR}"/vpnc-tmpfiles.conf
+	dotmpfiles "${FILESDIR}"/vpnc-tmpfiles.conf
 	systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service
 
 	# COPYING file resides here, should not be installed
@@ -53,6 +52,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process vpnc-tmpfiles.conf
+
 	elog "You can generate a configuration file from the original Cisco profiles of your"
 	elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file"
 	elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc"