gentoo auto-resync : 12:08:2022 - 20:22:37

3 files changed, 32 insertions, 9 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bd52e19f6f3b..06cfe574f496 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 23d2ee7c1f6c..5f9afe5f13b4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org>
+# Masked for testing, depends on dev-qt/qt*:6
+# Pyside6 is stuck on python3_10 for the moment being
+dev-python/shiboken6
+dev-python/pyside6
+dev-python/pyside6-tools
+
 # Michał Górny <mgorny@gentoo.org> (2022-08-11)
 # Niche library with no revdeps left.  Last commit in 2015.
 # Removal on 2022-09-10.  Bug #864889.
@@ -591,15 +598,6 @@ dev-ml/patience_diff:0/0.15
 dev-util/patdiff:0/0.15
 =dev-ml/alcotest-1.6.0*
 
-# Sam James <sam@gentoo.org> (2022-04-13)
-# 2.35.2 was a quick release to mitigate a security issue (bug #838127), but
-# introduces problems of its own with e.g. Portage. bug #838223. Pending
-# investigation both on the Portage side and potentially upstream (as there's
-# at least some UX issues with 2.35.2+ with the new "safe directory" mechanism).
-# Earlier versions are still safe as long as you do not use git commands
-# on a local repository controlled by a user you do not trust.
->=dev-vcs/git-2.35.2
-
 # David Seifert <soap@gentoo.org> (2022-04-06)
 # Unsupported branches, no consumers left, removal on 2023-01-01.
 sys-devel/automake:1.13
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 140a5896fb3d..8392e223544d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2497,6 +2497,27 @@ dev-python/pyside2:widgets - Build QtWidgets module
 dev-python/pyside2:x11extras - Build QtX11Extras module
 dev-python/pyside2:xml - Build QtXml module
 dev-python/pyside2:xmlpatterns - Build QtXmlPatterns module
+dev-python/pyside6:concurrent - Build QtConcurrent module
+dev-python/pyside6:designer - Build QtDesigner and QtUiTools modules
+dev-python/pyside6:gles2-only - Build QtGui "QOpenGL*" classes
+dev-python/pyside6:gui - Build QtGui module
+dev-python/pyside6:help - Build QtHelp module
+dev-python/pyside6:multimedia - Build QtMultimedia and QtMultimediaWidgets modules
+dev-python/pyside6:network - Build QtNetwork module
+dev-python/pyside6:positioning - Build QtPositioning module
+dev-python/pyside6:printsupport - Build QtPrintSupport module
+dev-python/pyside6:qml - Build QtQml module
+dev-python/pyside6:quick - Build QtQuick and QtQuickWidgets modules
+dev-python/pyside6:quick3d - Build QtQuick3D and QtQuickWidgets modules
+dev-python/pyside6:serialport - Build QtSerialPort modules
+dev-python/pyside6:sql - Build QtSql module
+dev-python/pyside6:svg - Build QtSvg module
+dev-python/pyside6:testlib - Build QtTest module
+dev-python/pyside6:webchannel - Build QtWebChannel module
+dev-python/pyside6:webengine - Build QtWebEngine and QtWebEngineWidgets modules
+dev-python/pyside6:websockets - Build QtWebSockets module
+dev-python/pyside6:widgets - Build QtWidgets module
+dev-python/pyside6:xml - Build QtXml module
 dev-python/python-lsp-server:all-plugins - Pull in all optional plugins
 dev-python/python-mpd:twisted - Enable twisted support
 dev-python/python-stdnum:vies - Enable VIES
@@ -2512,6 +2533,9 @@ dev-python/scipy:sparse - Adds support for sparse solving with sci-libs/umfpack
 dev-python/shiboken2:docstrings - Expose documentation as Python docstrings (recommended)
 dev-python/shiboken2:numpy - Implicitly convert passed NumPy arrays to Qt lists
 dev-python/shiboken2:vulkan - Generate "QSurface::VulkanSurface" bindings
+dev-python/shiboken6:docstrings - Expose documentation as Python docstrings (recommended)
+dev-python/shiboken6:numpy - Implicitly convert passed NumPy arrays to Qt lists
+dev-python/shiboken6:vulkan - Generate "QSurface::VulkanSurface" bindings
 dev-python/subprocess-tee:test-full - Enable full test mode. Pulls in many additional dependencies, and requires having been emerged without this flag first in order to avoid a circular dependency.
 dev-python/sympy:aesara - Add support for dev-python/aesara
 dev-python/sympy:imaging - Add support for dev-python/pillow
@@ -2949,6 +2973,7 @@ dev-vcs/git:mediawiki - Support pulling and pushing from MediaWiki
 dev-vcs/git:mediawiki-experimental - Add experimental patches for improved MediaWiki support
 dev-vcs/git:perforce - Add support for Perforce version control system (requires manual installation of Perforce client)
 dev-vcs/git:ppcsha1 - Make use of a bundled routine that is optimized for the PPC arch
+dev-vcs/git:safe-directory - Respect the safe.directory setting
 dev-vcs/git:subversion - Include git-svn for dev-vcs/subversion support
 dev-vcs/git:tk - Include the 'gitk' and 'git gui' tools
 dev-vcs/git:webdav - Adds support for push'ing to HTTP/HTTPS repositories via DAV