gentoo resync : 25.10.2021

2 files changed, 12 insertions, 22 deletions

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index e6d4b5850647..aea25677230a 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
-DIST PyQt5-5.15.5.dev2107091435.tar.gz 3264477 BLAKE2B 8289bcce9ebef9b8c289992d508ee1d365c86a127b03e175bb14382ad72150aea396d8358d560ce62b9ff33f3b54f3ebb0bbad8ab26a23edc73217c8325d9853 SHA512 5baf434f57c72a0e01753c69f8b40bc37321441efb652e002e3fff330edb8b7b318af3803fc8702897545763a952f99b68a0043a08e364e6fc1feb1e5d8520f5
+DIST PyQt5-5.15.5.tar.gz 3239628 BLAKE2B 8992eb9293bb823f1298108a48d0c8578d0acfcccbabc6cb7c209bb591bfed61caf3ab8b8717205698149b5e4b59b4181e67491332e38ae87856b8169d74ba86 SHA512 67600668c769deb37052e6099a35756519987a0796045cdc291add1763bad103df1226f1b6e304e74808279d6ce56231e614617011ce238e1cf91a302981dd26
 EBUILD PyQt5-5.15.4-r1.ebuild 5441 BLAKE2B 90338bd83e4cefbca3f207be293dfa17ce05f4058522da44129607d1949107c0794c06a8d4e2d79450c5f969520d6d982d4282385d1cc439c6d737144739887f SHA512 5da215138c6c2fbfbd23d3206f69fde4c805725f6a7787186f2306c7cd3daa92a4458c6fdf38b40d640c00a9cb357b00db96a18cd4bb7d30bd8e29f7b82745fb
-EBUILD PyQt5-5.15.5_pre2107091435.ebuild 5401 BLAKE2B 5feec52e824c809419d0591b97359feea3d099c7ca919f1373674165f1168eadc436d7d4d2f6ee9b09a2107a62eb688031ae3f7391d6f26d02c2ddeb712b2232 SHA512 39a09886fc3bcf4adc8cf9c6f90119c52c3ecb3f15e8d676b1ac4e2aca7859acfed19962f7cdbb0d8693d6ba3af156d0d4a30f1aaa78146d55279ec9f1c6db3a
+EBUILD PyQt5-5.15.5.ebuild 5249 BLAKE2B ae3d2ef1b773c1d3313f2420beec19533787de75959729dc937cc65e23855bbf08e85731141875145713f341834a82741f66a1be6ad59bf2194975b7bc47569a SHA512 8452ca7b55883950b5c3bd76fd442010b6c430983d8fa312dbfe9eee8459add4e662991916f2c902272e10172d2eb744e11581d2451dd03bd7340e166c75bc56
 MISC metadata.xml 2287 BLAKE2B b4090aa2c55d05554a152bc3adfa76c68dc78175d26bb4ea6d25858ce2db922c168cc4ded6c7fa9114cf651417e0a6e435baebe460c8efbbd94be17adafd6f43 SHA512 12e3559ff04c32ebce2a382bf3b01730b0b69829c77cdf75f0061143cc19000e126daebbf9014beeae8bd1fba2675ef2ecfe7943296a8dc66000439c104c1351
diff --git a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild b/dev-python/PyQt5/PyQt5-5.15.5.ebuild
index 7d1bf6e760cb..c4effe4968bc 100644
--- a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.5.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
 	multimedia network opengl positioning printsupport sensors serialport speech
-	sql svg testlib webchannel websockets widgets x11extras xmlpatterns"
+	sql +ssl svg testlib webchannel websockets widgets x11extras xmlpatterns"
 
 # The requirements below were extracted from the qmake_QT declarations
 # in project.py and from the output of 'grep -r "%Import " ${S}/sip'
@@ -67,7 +67,7 @@ DEPEND="${PYTHON_DEPS}
 	help? ( >=dev-qt/qthelp-${QT_PV} )
 	location? ( >=dev-qt/qtlocation-${QT_PV} )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
 	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
 	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
 	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
@@ -88,23 +88,11 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.2[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	dbus? ( virtual/pkgconfig )
 "
 
-src_prepare() {
-	default
-
-	if use gles2-only; then
-		# sip-build doesn't have a command line option for this
-		cat >> pyproject.toml <<-_EOF_ || die
-			[tool.sip.bindings.QtCore]
-			disabled-features = ["PyQt_Desktop_OpenGL"]
-		_EOF_
-	fi
-}
-
 src_configure() {
 	pyqt_use_enable() {
 		use "$1" || return
@@ -127,15 +115,19 @@ src_configure() {
 			--qmake="$(qt5_get_bindir)"/qmake
 			--no-make
 			$(usev debug '--debug --qml-debug --tracing')
+			$(usev !dbus --no-dbus-python)
+			$(usev !declarative --no-qml-plugin)
+			$(usev !designer --no-designer-plugin)
+			$(usev gles2-only --disabled-feature=PyQt_Desktop_OpenGL)
+			$(usev !ssl --disabled-feature=PyQt_SSL)
+			--enable=pylupdate
+			--enable=pyrcc
 			--enable=Qt
 			$(pyqt_use_enable bluetooth)
 			--enable=QtCore
 			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-dbus-python)
 			$(pyqt_use_enable declarative QtQml QtQuick $(usev widgets QtQuickWidgets))
-			$(usex declarative '' --no-qml-plugin)
 			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
 			$(pyqt_use_enable gui)
 			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
 			$(pyqt_use_enable help)
@@ -157,8 +149,6 @@ src_configure() {
 			$(pyqt_use_enable x11extras QtX11Extras)
 			--enable=QtXml
 			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-			--enable=pylupdate
-			--enable=pyrcc
 		)
 		echo "${myconf[@]}"
 		"${myconf[@]}" || die