gentoo auto-resync : 06:11:2022 - 03:19:10

8 files changed, 28 insertions, 6 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 78c7e7bcb312..fc5ec6d1f24d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index f50197b8fc1f..04f999c8a589 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,5 +1,5 @@
 AUX android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch 5109 BLAKE2B 4deee34669ce000050d04cf01040920a22ca0caafca006ff2651198a60936dce9e8f783263b05beb91bef8c015e14362725aa4dc23c32be30c6796ad20e69ad7 SHA512 4b8afcf5290be113d98572a9a1ad5309c8bf75f0c17aed2f698d3302f796f8fb7ead3422d649c4909019cf766ae16fc0d75401fb15eb42130e58b451d628af21
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71
-EBUILD android-tools-33.0.3-r1.ebuild 2318 BLAKE2B 1d6f81a308ff293f657f9cf6234762ddf738089a0bf0241b5611c1b7b5fa974b5fdd63a5ccc493327c9783a3844735425cac43c70ff56e4cf271d59f742100ac SHA512 21c63781748f517abd7ab6fe638f96197aedb658cd48241145ffd730c6ba5f4b96e6cac04b626101270af18bf26df54560f3a5244023bd7d416d32ab85c2c2ea
+EBUILD android-tools-33.0.3-r1.ebuild 2333 BLAKE2B e52667422054baa21d6426be2246ecb61570f955608ed2a3c8abdf7bc16d05aaf1c32bbfa04f7587d352889287ddf0caad6dcedee6f65ff6f8c2acd4a4563924 SHA512 efd2dfa9b30d2c8a8a8256abba5661953e136e776f4c026c0f0928821fc864c175a01dc0c0094de9caf539eb3ac876cb8ab37ad971b997f7bbc6a333775de257
 MISC metadata.xml 724 BLAKE2B 7ef6e07d806dff51946236dfee2f5eaf207fd7c9cde6e73cb7f372fea5cd8b2b559e4f1fe81a315c41beed5beba92603cc93a16183d63953fbed4ba0d2941116 SHA512 d47cf87259ad2b2a8d6f8edf6b2c2084d0046773447ed9647cc232437ec8f3e8c452cb26ac7e0a619b220e073518903b77c55ba7c2e9f7663069fea2e7096e75
diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
index da11dd000d4e..a4f094a9d561 100644
--- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="python"
+IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # dev-libs/libpcre only required for e2fsdroid
@@ -34,7 +34,7 @@ DEPEND="
 	virtual/libusb:1=
 "
 RDEPEND="${DEPEND}
-	dev-util/android-udev-rules
+	udev? ( dev-util/android-udev-rules )
 	python? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index e01493ffaf89..716cfcb56a8e 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,5 +1,6 @@
 AUX ostree-2022.5-bashism.patch 1314 BLAKE2B ded18475b1ecfe381fbe9e763ae7ff2e30875055c4d491f819427065985d7dfc69b3fe280f2efe1f8a51725e7965d73647434ab130ef1d6b30822e4cbcfb725e SHA512 4e053eba1fe1d494d5bf0565a9ee076e8d01834c63d043b1c260ca2bbb9baa95f4903f6413b81cc12eaa0047de2c8c8061cd1a21a6f96ff153557487764baaf1
 AUX ostree-2022.5-glibc-2.36.patch 4381 BLAKE2B 66fce177399ad249ad22f62ffaddd780c57d87864fdef5cb9347e553e9fdb6fa1e94b12768a2bdd832a9968d29c77f49b83263b6d53428306efd73854bd77e23 SHA512 deb822f25ed0c7d14d4102766a5a4840e5f43193a7cedfbda20e8467c8df06e2fc6248bbf9c658ab5723330d5fcd96814bc3d0774c2b3d9e38611d1e34d0ca3a
+AUX ostree-2022.6-musl-allperms.patch 478 BLAKE2B 95191befc9281591480f3a80717817e262798b7d6fc3abf35cb5c0462267822092a102de446f5334e3807816418e7b2b5b4dd59cd66796734b85131873e2dc9a SHA512 275e4fd6c1547c852ec9d2a8649c45c5bec6fdc2351e9333adfc3ed31b0cbedefaca6db95ba97ec8a65fa16bd550827909f7172b46a6b64a184840272578b7cc
 DIST ostree-2021.3.tar.xz 2089804 BLAKE2B 5df33b676173b1ec08ac7592d4ddf8e3bfdcd84df1b3ce19e2f24c85780fed1f210b8adce1baf4ec87869c72984502276bf6e5a72268daaae6ce9b3d6dc6f88b SHA512 0df0d8f9bd82b16562dd5146997eddfb7cb6cffc1886601307d97a1cb1dc926bda7d0c899db26c974ed0dff1012dee11937e47c11c4d03307fa3d2d430adc60e
 DIST ostree-2022.2.tar.xz 2059592 BLAKE2B 73bb563be473f3f62ab2d0e1ec6e2b659c8c12aaba828ae6fd5bab4b6bd3a978ffe5d76e17734e40c0569e3e74f13b85aaf9ae467747c5bbb309c73b373e9909 SHA512 07be16101aa00f541833dc6123f015ee1af65e40e2c237322a129e944fa19791e7cad6f0b29ced3c128adbe23bdb3c8708688fadd4ed80b160acab584b84abfe
 DIST ostree-2022.5.tar.xz 2072208 BLAKE2B be12432c87da82362ceb49b61b0cfc2ab77fdd7e55dfd3ca238d3c0f6fa5e64dd953d709c39727a46f82b99ef07bfbebf83b581f5e96a10a08322854e9a0e1f9 SHA512 39abd076491ebab5cd6e23bff6ce0a346fe8d1e6a372abb42626ef5a8643411070b272637513b37393dc37af9b8eaaa42c19e2f1c16b98d441358c2046653654
@@ -7,5 +8,5 @@ DIST ostree-2022.6.tar.xz 2124464 BLAKE2B c6ea1f11d08261e8532345ffc18bec9e77d04e
 EBUILD ostree-2021.3-r3.ebuild 2602 BLAKE2B ded68dcb03e707c7ff8cd573441e71152b18d8ed644488828821edce67f2c278e097ea85018251679fe708ea3500959b0848511640bf2d51abb220ab4a69dca8 SHA512 2cae33883d20ea5f29c468e086040f87c97e1168bcc31913fe5adfe25d4f6e6a915e1f6112d77e14d4f69a86e572ada54982a5afd947ca43e8aad82362f7ef18
 EBUILD ostree-2022.2.ebuild 2645 BLAKE2B 03f4a898d2553dc8fbd055c51b834270266237cf92e2fe06e614187e91ce84c276513f8bfb3d145b6786f12024a2997a6d4ded5850a875b45e1e9cb35d13ecde SHA512 e93f32725b1ab23082729e76f176c3563a0c65527dab55e090167d6a522441b3f5d9356e9809c2c2a7cb9a09fedf4390632c0791be63d54742eadb5e5b3439d4
 EBUILD ostree-2022.5-r1.ebuild 2734 BLAKE2B 3207e4271ee037096ca6f6ededc1a6b809469881ab8783afe9e611b89056ead85218dce7737c3d47612cbb489e986b4ca0099808ca5e872fafcc67355b7a4ece SHA512 a35f7529d14f7fad61231dec92f8c9bc8d68e007e943e5c9df938265153a0ae74e2d73790649781824c59e65337e04c69a76e6c8d00b656256ced11646097ca5
-EBUILD ostree-2022.6.ebuild 2654 BLAKE2B 9a1eca2ea89aca13291f010ec717c4d3fe011684627fe9a64c1a64d41544805f422674cc26a73a23e26527ee513bf8b4295cf53c79783e5a367f48873921c456 SHA512 d12a429b6906e66468d1328754fd26ddbe445401f6a28add8368d646d5a79cee2c8d2e56708765355738b68e690a9be2d36965c1e4a4772ba0d68141d253644f
+EBUILD ostree-2022.6.ebuild 2707 BLAKE2B fa93a723c40519dd94489574ca7930c4bcb05027b3bbab37507ef9ff91f2de0a6ec30214a5fa6cd38ae40f7f0662697b8f82164b94bd09d49a0f7ae8eeaa80c9 SHA512 6b262393e11f797fac5c29b70f1daf40032dd07d41741fa802064e5bca5efb2e600c0d5a33d520d17cc8c2e5e21eceff4c8171ed9722adfbb936902f81558cab
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch b/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch
new file mode 100644
index 000000000000..9f4f2a21eb14
--- /dev/null
+++ b/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/879321
+
+From: ernsteiswuerfel <erhard_f@mailbox.org>
+
+--- a/src/libostree/ostree-repo-checkout.c
++++ b/src/libostree/ostree-repo-checkout.c
+@@ -37,6 +37,10 @@
+ 
+ #define OVERLAYFS_WHITEOUT_PREFIX ".ostree-wh."
+ 
++#if !defined(ALLPERMS)
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
++#endif
++
+ /* Per-checkout call state/caching */
+ typedef struct {
+   GString *path_buf; /* buffer for real path if filtering enabled */
diff --git a/dev-util/ostree/ostree-2022.6.ebuild b/dev-util/ostree/ostree-2022.6.ebuild
index b673c6196958..f5456a6e416e 100644
--- a/dev-util/ostree/ostree-2022.6.ebuild
+++ b/dev-util/ostree/ostree-2022.6.ebuild
@@ -63,6 +63,10 @@ BDEPEND="
 
 S="${WORKDIR}/lib${P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-allperms.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 978cd04c78c3..9237e39437ed 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,6 +2,6 @@ AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031
 DIST pkgcheck-0.10.16.tar.gz 495095 BLAKE2B 361d0619454cd25a9b50d837e39501ad7065a0f4f04a7abfa0a24788800247d417d0dfdf0f94d45be1a224564c09b849c4fd111ce38646dfc7e7a6c41fee9470 SHA512 976acd7c8cc4dae9fb486d8ab9d3903286fa0050db43a402dc70e6287daa8613fdf107cd4aa51bb74820aab1e4d9585e9d574ce1c335a118340d7148c793667c
 DIST pkgcheck-0.10.17.tar.gz 497163 BLAKE2B 600b51c5c034356fcfbbbb741681e7e304ccf14b9390207305d35c48dff7675e808101fa76f6a4ce250691b2fd99deae7d59cc91560d609c1a2c3d7421859849 SHA512 3539d877b63e739877f79340ff59c3592f43ac9e00b507ab63d7afc2bb3eaa32f863e7cc8029c5a05bcf7068de70fd3149447054f0d9d304d4e3548a0a25d676
 EBUILD pkgcheck-0.10.16.ebuild 2197 BLAKE2B 1cef589de0990ab73811621f418bae99ae69f8b2e1837525ff580742f96ee93c3c06d1c76afefa967830421a4b355452ebd050c6588e3c6bd386d46bc727efae SHA512 3ca911a33b0808cf35a77fd28905f39816dac6237f35bf9438a8860250bba80747beaa048bb70cfdb90a6d20ae5c11f87eb6ac47861d458e343d69b65d292996
-EBUILD pkgcheck-0.10.17.ebuild 2261 BLAKE2B 409d6d2a057ebcfa8ee0e45558cd30c9503226d77455b9eca8936f1d96e9cc8cd6f14237cefa15a8ed7efcc336f801c080f5d44b8b92196fdc840ea9adb322bf SHA512 3e39b81850ddb974dfe12987f3fc3b39a6d7268ec27dd62243f49c17e076b79501fa6a0beb083a480781e905bf08060af8a39fbb13229a4fb63f51818108b403
+EBUILD pkgcheck-0.10.17.ebuild 2260 BLAKE2B 5004efe4de17aeb4812b62a512c6ba8ee2e12c6d63904b8ebf8b38411ad3c88bc20f94d7638e66c0bb57e15df68a927670456bc634aefb12aa64e3d3c18bd517 SHA512 4c9744cf7b5fefb95e36b5ff9937ee8d3f0b027db272862463d8e06e1714b96fcdb7af0ea2f0133f23e68c3a82ef5641f8220fe3408ee5d2ccbf31b757c6c810
 EBUILD pkgcheck-9999.ebuild 2264 BLAKE2B 2afd642fb511e06a914ff94ce59120ed77accca4ea09c76d9fd6dc7939205b0cff46d706a35101817e3d99aa8a977a8b5db78b0fbd19e8740273d7e314afb035 SHA512 78e559b2ecc15c56d1abec0708de1a5042b9643811fee0fa765773060e8b593eb0a8f72af1d97101289a14c5c93bfd03044187df49db69ff02fda5ca685278f9
 MISC metadata.xml 431 BLAKE2B d7d5cd3611d661ef181be38b7087169cd7a73351e54a5e5630915666a81e62761f6b797e255fb7e3172d0135e1a076045ec3727ed6bc9f6d741b5dc63090307c SHA512 8635c9e2b28a5477209d5c3d3a4daf8bbe7a876d1d43bcd0cad30d28155e2cb98c9ca3880418f58bd9ff536e210ae379c3477f2ccdfa3cae409b2b978eb14c64
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild
index fe63f8642353..fe4e443927ba 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi