gentoo resync : 01.08.2021

4 files changed, 18 insertions, 18 deletions

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 363b6946dff7..bd1612749002 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,7 +6,7 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-7.8.0.tar.gz 2893281 BLAKE2B cef1d56048a72ffa18c9fe2917e4f616dd4d778eddc91c88becf06a418471af1e2cf1688aa05ad3e71f24d5bb1923eaf35b8a1419ed05a72b299af970d1427e6 SHA512 189fabe199afefc77951ee3f2bf20c749f6efe290cc3a76f5ba58892c80cc76082b1ce77c23bca87f57f62816410bc5536e4206806fe31517915c72046ace08d
 DIST puppet-7.9.0.tar.gz 2899891 BLAKE2B 06f675fc9eaac4ddfa7957847abe33928f0779f3c18dbf339067525ec69b6b87d274294a1133ec8332fbbed6111b568c63478493f3de467c63e2948bcf446b71 SHA512 6329d89530d2cb008e28116de655024e9bf944b3f41d086e0e47c41c74af3da51c283a912ac966cf7bac52f86e54304df6cf31477a5663cae09fb4d18f958cf2
-EBUILD puppet-5.5.22.ebuild 3751 BLAKE2B bde3bbacdd70435fe0e804133106ebc887f72da5742c871bfdaed08a084866f178b68433453d392f7e98f8f5a2297ee10e7b6e035392fecd22a84780a2b431b2 SHA512 5bc024d0696e51de520ca6ba162cf312ddc9cca04ba5ee18f849ca48547f31e4a493664ffd0100022ef4fb69ad1c24b1efccf7a25d85652281da71c446b87f26
-EBUILD puppet-7.8.0.ebuild 3538 BLAKE2B a5419de57c88bcab6796a2df14afca910f1b466a0ca20fc40b3b937053059d126a4ef845ca9ad2903f2c4afe6b86f19fbfd61779e54a0e3b2a51622ac9dfe07b SHA512 70be4cbede4a005ab5d01daf6ad49e3349c818c56abbe62d9021ec748b8d1b431821baed282c813d53b488d803ef715253300a12bd0cc79216c927d2bb4ba7b8
-EBUILD puppet-7.9.0.ebuild 3540 BLAKE2B 1239d0f1d9a6cdb8dab7965c51c8c7879e20cf2089dd67a1c8903bf8da1aa03c53af3485f82621f1656ef71866c7df92777b66447858319e79c865174c42c458 SHA512 f13b7f037fa7b5f25d37752a6c5f4cdebec9e1ca4f272a1ab4023d3cf79f47c98c4b5df49e996565205e8e9e80296ecbebf5b9ca4ae98b1371b657662ed179da
+EBUILD puppet-5.5.22-r1.ebuild 3751 BLAKE2B f651b0c7d9196a83b00533a2cf6cb3b28e8b5de366cd792ed7194e84b93d971042c3e17a50abefe56e18f67bb0cd3d694604f19dc02c3ed7d72e11f1e0b71d22 SHA512 5d50d74214db6abac3fa66a5249b8b5dbfbc6340c6815e99611e2c62ff6347f2e9c96c53ad79221865e78eeed3e2796941cc50b5a979bdc8a589f57e6681ce06
+EBUILD puppet-7.8.0-r1.ebuild 3538 BLAKE2B ffa6662cfe92ab50890fdcdffdf397c709c93f1a37e0cc12c6029fa718f78367b2ff4548757d5c1a798f46ad7243a3483d8066bdf29e1a9d78866dca16a64b34 SHA512 80f2fe881dbfee31b3e7fb81d0f9e2d029c696fb3c54d63489da74845c296bba7eb821124170c58dc992887817d2725f1a2bbcdb4e1efbadd1bea69c87ee107e
+EBUILD puppet-7.9.0-r1.ebuild 3540 BLAKE2B 74d2e019ac3823979cb19d845d1acc1556003bd7c9fa4eb6083a34d3352d93f9e94315d50708c585acd72aa9756a416245b14d3f4e71e29e8c948fa0e6708cae SHA512 9e98044702d8b596c3acb31adbab0738977fdf1accedcd7e74a962f74d606d6d5453c322a5389434f494fa46403f362c089e88389b6eec2fd59e1a8d1ba6af6c
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-5.5.22.ebuild b/app-admin/puppet/puppet-5.5.22-r1.ebuild
index d0814cc9e781..3fc2f8062ec5 100644
--- a/app-admin/puppet/puppet-5.5.22.ebuild
+++ b/app-admin/puppet/puppet-5.5.22-r1.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_DOC="doc:all"
 
 RUBY_FAKEGEM_EXTRAINSTALL="locales"
 
-inherit ruby-fakegem
+inherit ruby-fakegem systemd tmpfiles
 
 DESCRIPTION="A system automation and configuration management software."
 HOMEPAGE="https://puppet.com/"
@@ -84,12 +84,10 @@ all_ruby_install() {
 	all_fakegem_install
 
 	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
 
 	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
 
 	# openrc init stuff
 	newinitd "${FILESDIR}"/puppet.init-4.x puppet
@@ -121,6 +119,8 @@ all_ruby_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process puppet.conf
+
 	elog
 	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
 	elog "cause puppet to hang while installing packages."
diff --git a/app-admin/puppet/puppet-7.8.0.ebuild b/app-admin/puppet/puppet-7.8.0-r1.ebuild
index d3f1ad182f3d..f2b79f3d4dc9 100644
--- a/app-admin/puppet/puppet-7.8.0.ebuild
+++ b/app-admin/puppet/puppet-7.8.0-r1.ebuild
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="doc:all"
 RUBY_FAKEGEM_EXTRAINSTALL="locales"
 
-inherit ruby-fakegem
+inherit ruby-fakegem systemd tmpfiles
 
 DESCRIPTION="A system automation and configuration management software."
 HOMEPAGE="https://puppet.com/"
@@ -81,12 +81,10 @@ all_ruby_install() {
 	all_fakegem_install
 
 	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
 
 	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
 
 	# openrc init stuff
 	newinitd "${FILESDIR}"/puppet.init-4.x puppet
@@ -118,6 +116,8 @@ all_ruby_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process puppet.conf
+
 	elog
 	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
 	elog "cause puppet to hang while installing packages."
diff --git a/app-admin/puppet/puppet-7.9.0.ebuild b/app-admin/puppet/puppet-7.9.0-r1.ebuild
index 125aa53e82ce..c1c0ce4f6d0c 100644
--- a/app-admin/puppet/puppet-7.9.0.ebuild
+++ b/app-admin/puppet/puppet-7.9.0-r1.ebuild
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="doc:all"
 RUBY_FAKEGEM_EXTRAINSTALL="locales"
 
-inherit ruby-fakegem
+inherit ruby-fakegem systemd tmpfiles
 
 DESCRIPTION="A system automation and configuration management software."
 HOMEPAGE="https://puppet.com/"
@@ -81,12 +81,10 @@ all_ruby_install() {
 	all_fakegem_install
 
 	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
 
 	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
 
 	# openrc init stuff
 	newinitd "${FILESDIR}"/puppet.init-4.x puppet
@@ -118,6 +116,8 @@ all_ruby_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process puppet.conf
+
 	elog
 	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
 	elog "cause puppet to hang while installing packages."