gentoo auto-resync : 22:06:2023 - 01:20:39

4 files changed, 16 insertions, 7 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f360b8673b73..2ee7143820ad 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 441b755bd4c3..fa2717512ba1 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -3,8 +3,8 @@ AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29d
 AUX libvirt-8.2.0-do-not-use-sysconfig.patch 8420 BLAKE2B 37856003bc58b69531be6b55fcc3304b71558b7a5306c2da3fbad2d5eac006ca3ebb54bd56f8e761363311a5c865d2cd072c418794fcb605562fc32f997c88a9 SHA512 84a693b870aebe0f87f518473d28d97e613b6069f497e6e49c3e8feffc96c2e709d0a7a3530c52d4d034c6b0bc7374ab61f40ddd2f071735c5baacdebcfca8b6
 AUX libvirt-8.2.0-fix-paths-for-apparmor.patch 2785 BLAKE2B 2b1daa96385ce09a078e1c152b222b274fcde1803497de8709d7569debc1537e9ee4f65a1f775636521ba351310ad13806005e1c02fa00224551244a79ace109 SHA512 be537022563bcf782381cdb99188becf1785de950124626e5ea13219a870a1c6c13834f2cb3c9cf4c364a66b5a7647bfa856a4c5e634dfac6a591c8c93e5ce9f
 AUX libvirt-9.4.0-do-not-use-sysconfig.patch 8195 BLAKE2B b731d57dc86fe725d3cbd47b6e691a414107d3594377bd1c73e19735368937a0983e407ec05700213d2ec5802e90f429fd5c7354cd03fb25d3acced952ab6f38 SHA512 2a2e08a6034ed37cafebde3b0fd27913d972d1e9f8816e10a9af951e99f10bd3b9bc7ada1ac50c5085e3fdd3d02301365d031eb6ce3b71102e4b3072d609f21b
+AUX libvirt-9.4.0-fix-paths-for-apparmor.patch 3850 BLAKE2B eb9387758dcea63a91a3697c455ca85b8e000da9e761d7f1a701748506e2ee3a8be67c1fe645da2b731f93fcc4df79339c30a381fd3ff8f3033a55e2a3f93aa9 SHA512 4b3878978472157aa89a87645393cb52f819bcd8a36540a1f2517f688aaf3f15def8f0d410daa24bd84c1bfd9a2a84f1aa25552f4ced42baa7b7f8dd513e7794
 AUX libvirt-9.4.0-fix_paths_in_libvirt-guests_sh.patch 988 BLAKE2B 5936eafa5c300edad7ed368ec13063d31aea59e3daefeac59cf515ea44667f61aa63b0e2c2a5c88ace24c48cc132789cc5fa1a7c6c04c17e9ac61b114778e46d SHA512 5b80a5ec2898c1c821d0d49b9de67a256f82cb60879215ddde07c2a51f2e8a8b6893fec65617c27edec50cd51a362fb1fcdd21827e8de954f26879adcfa12418
-AUX libvirt-9.5.0-fix-paths-for-apparmor.patch 3618 BLAKE2B 23a7d0219252c1b46686c7554d5072dc5f8df37881d8faf11482465521167cd46f6bf1d1ffcc09e71f2bb32e392ba8d6a2493c9e5fdec1bba3afa1cf7fae17a4 SHA512 6c31e036da2c98aa3f9fdcab4b25ac7c7154930452850f33f6016374f76f820edfa4ad65b5326770dd6613ff9b1741aaa4ec741bee67a240dcc61331e16ede61
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0
 AUX libvirtd.confd-r5 740 BLAKE2B 74a069f4902dd1352f06029c886200615a35870ff88496c91956d23a3172db0789086622422f545498e92b7f8de41225022185fe291dd580cbacdeb783163f4b SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91
@@ -17,6 +17,6 @@ DIST libvirt-9.3.0.tar.xz.asc 833 BLAKE2B 25810919210bd489ecfd85f172c472d52e911e
 DIST libvirt-9.4.0.tar.xz 9250724 BLAKE2B 837a6eef509a43a0cd25a2ecaac9de95f21e903b553d5e56b404a689495e66bb0053866c9aea672cbe69130286d5a2ff2eb38ff447c77100e92bcb56cd244ee3 SHA512 8a8e3983c47c5ed5f4b50d90cb04e435717afddd27e16112ceeddda458d45c693daf65575f5d50274cfffcd1c83cbdd290819d8ece63f3bf9441b6bdaa309852
 DIST libvirt-9.4.0.tar.xz.asc 833 BLAKE2B 3a31f4097d8684a3a5e4b696c9bb49316a07c611a0cf1703e18653536af93d018ec44cbe5d0ce031e6f2c23a7c72691ded4c219faafa4bc770ad0dd7b616d0ce SHA512 710861b6b1c866be452e2da18a631076ad3ca3fbeb1728e561de08b34d16d2b49a0c390e7fa36eb35d0dc58fa35d5866ea6c573c84e9312b02880cdb969f7342
 EBUILD libvirt-9.3.0.ebuild 9338 BLAKE2B 199fe95d127cff893f2134bcf6cb5bc6226b505e576959f7495ffa6781cc4732128448f77d90356ad6de2527a2d94e2a0d32ae9ca6ecf394604980c7d982bf34 SHA512 0557c857c21bdd7237ce6dc6b13f229aa3528061bde1756ac401e3f2fb296c79d7570aaec8572b1b6e61e2aaa0134a0f823437dd05d5de0cb9f34649865f0e09
-EBUILD libvirt-9.4.0-r1.ebuild 9400 BLAKE2B de546ce87a8e8b1bae0f7545ed36fcee4a709ef982ed7a45fc35477b84270fbfdd956f52eb916b936858a29a032dcdc49e4200d31be84f573e70915c91ce1434 SHA512 c767c8ab6ffc917ae03ef93efb6835ec704ccbe5966e97d38c84b1a4c419043783d9cbb7b19684ad0351c6b40e3c533a25f5553d0a3d57b09758754286ae183c
+EBUILD libvirt-9.4.0-r2.ebuild 9400 BLAKE2B 27447d18b321a9d69a4a8d4d9baf827ac5544866a10420720d26da870c3751e522fecc0e065280b41b8633db0fc9797e9a137fe5dab90cc5af5f2ff130a3ef71 SHA512 51f89121a3757f3c38ab8538c19186de9e204a37e2554d196d0bb32f8d03b7e4d987a52e2bedb78d80b5f132022e81d6e7572e173da1946bd79435de18ef3007
 EBUILD libvirt-9999.ebuild 9382 BLAKE2B a3a1fc5991bb5a6ddd993f7287198b1abd45e22261809a7c44f66921bfe9db5d24c6175c38c1bf2aaf76445785cdf06bfd3a6f1ecc40bbefb1b16e453064ded7 SHA512 4a02df0467c64de5eae61ec4f176f714356ea8a827c1ab7813183a2f218292c62ff99fdefac6a1cb709c7cb748a59585bb9d80b89365086681713dd812c261dd
 MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1
diff --git a/app-emulation/libvirt/files/libvirt-9.5.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-9.4.0-fix-paths-for-apparmor.patch
index 52a12beb2cca..dd2562f395fb 100644
--- a/app-emulation/libvirt/files/libvirt-9.5.0-fix-paths-for-apparmor.patch
+++ b/app-emulation/libvirt/files/libvirt-9.4.0-fix-paths-for-apparmor.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] libvirt-9.5.0-fix-paths-for-apparmor.patch
 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 ---
  src/security/apparmor/libvirt-qemu                            | 1 +
- src/security/apparmor/meson.build                             | 2 +-
+ src/security/apparmor/meson.build                             | 4 ++--
  src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local    | 1 -
  ...irt-aa-helper.in => usr.libexec.libvirt.virt-aa-helper.in} | 4 ++--
  .../apparmor/usr.libexec.libvirt.virt-aa-helper.local         | 1 +
- 5 files changed, 5 insertions(+), 4 deletions(-)
+ 5 files changed, 6 insertions(+), 5 deletions(-)
  delete mode 100644 src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
  rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper.in => usr.libexec.libvirt.virt-aa-helper.in} (94%)
  create mode 100644 src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
@@ -29,7 +29,7 @@ index 44056b5f14..1f0db2cda2 100644
    # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
    /etc/pki/CA/ r,
 diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
-index 02a6d098ad..39214a679f 100644
+index 58b4024b85..6f4ebb7fa9 100644
 --- a/src/security/apparmor/meson.build
 +++ b/src/security/apparmor/meson.build
 @@ -1,5 +1,5 @@
@@ -39,6 +39,15 @@ index 02a6d098ad..39214a679f 100644
    'usr.sbin.libvirtd',
    'usr.sbin.virtqemud',
    'usr.sbin.virtxend',
+@@ -35,7 +35,7 @@ install_data(
+ )
+ 
+ install_data(
+-  'usr.lib.libvirt.virt-aa-helper.local',
++  'usr.libexec.libvirt.virt-aa-helper.local',
+   install_dir: apparmor_dir / 'local',
+   rename: 'usr.lib.libvirt.virt-aa-helper',
+ )
 diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
 deleted file mode 100644
 index c0990e51d0..0000000000
@@ -77,5 +86,5 @@ index 0000000000..974653d797
 @@ -0,0 +1 @@
 +# Site-specific additions and overrides for 'usr.libexec.libvirt.virt-aa-helper'
 -- 
-2.39.3
+2.41.0
 
diff --git a/app-emulation/libvirt/libvirt-9.4.0-r1.ebuild b/app-emulation/libvirt/libvirt-9.4.0-r2.ebuild
index 6c17559eba62..0a0255e18fcf 100644
--- a/app-emulation/libvirt/libvirt-9.4.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-9.4.0-r2.ebuild
@@ -145,7 +145,7 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.5.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-9.4.0-fix-paths-for-apparmor.patch
 )
 
 pkg_setup() {