Patch out QGtkStyle support to make pyside compile with Qt 4.8.6. Users who need...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog
index 55b5d5a1686f98411dd8e7890e33405e8f27540a..190e28235cd66ee2c38a1edbddc0b0a9a62a6291 100644 (file)
--- a/dev-python/pyside/ChangeLog
+++ b/dev-python/pyside/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pyside
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.67 2015/02/16 15:05:29 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.68 2015/03/22 04:22:21 yngwin Exp $
+
+*pyside-1.2.2-r1 (22 Mar 2015)
+
+  22 Mar 2015; Ben de Groot <yngwin@gentoo.org> +files/qgtkstyle-1.2.2.patch,
+  +pyside-1.2.2-r1.ebuild:
+  Patch out QGtkStyle support to make pyside compile with Qt 4.8.6. Users who
+  need QGtkStyle support should stay with Qt 4.8.5 and mask this ebuild, until
+  bug #530764 has a proper fix.
 
   16 Feb 2015; Davide Pesavento <pesa@gentoo.org> -pyside-1.1.2-r1.ebuild,
   -pyside-1.2.1-r1.ebuild, metadata.xml:

diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
index 8b718518292fa9b9960daa1bb95a41e156a6432d..0e1fbd5c4b7fcec0f50cdc99deff22b72ec77906 100644 (file)
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qgtkstyle-1.2.2.patch 1650 SHA256 e01a60c20de3ae33767d5948e20235220ac43e7f40e59372ec3cdcba6892bcda SHA512 ee039cc67bf00ab43d3c6355e7b3e01d753049b2384e23c1a15f78c119b2e85f16b7bb36f0b775bc7d544674161e94eb36265b6590e3b7e593da3b131004bccc WHIRLPOOL 900f90724bc0e071aebcdd11da5436e50f2d624490649f1121fba9474c5a87af05c95b4094dd862468ac1a817e439bb6bd5fa657ad645f47d0c2753cbab62fa8
 AUX rpath.cmake 393 SHA256 b89f3698d321e30afef0f7c32be009d5d926f92ba310ad44b384cdbc1a6a104d SHA512 b9f2d3b34fd31a7e289e3aa1c96110f92bc66f45e5bfaf796f86d52eb832e960caca0e314b87248d0a41c13c95f04402607cbb5ad7d0b3238d5bab5580c3a65f WHIRLPOOL 79dbd32a58b6bf8a408f8fef3dd918c1946c89c32731b515984cb0ed8230c63cd724150db636523484d525c2ebad1f78217c7ccb6a294221aa8d2ca8dcce6a1d
 DIST pyside-qt4.8+1.2.2.tar.bz2 3765472 SHA256 a1a9df746378efe52211f1a229f77571d1306fb72830bbf73f0d512ed9856ae1 SHA512 3a1d46c48ac71c3b138e1dc398d1d2a87aff558eace275303e233f78d03e32c6d53cf390db5e7112f44da9b17aa88ed16a30f6f83b2073c1f494e61b962e4c46 WHIRLPOOL 5ac5eb5032fbc791e955eb0b2b0f1443e43867408a7b6c41854db1cab466714509c035e8271f5b0b3078309be001d5bcea498601b97f540e7775e87bdbc1c0c8
+EBUILD pyside-1.2.2-r1.ebuild 3765 SHA256 06db2529efdee3020faa3ea7a5f3f79aa0932e2538914eac5249fd188a1c9112 SHA512 a653010f73ea9f4658ca55ab70ec442915d4ab154da03c2dc580f3069e06475c2dcf99935e1d2ae1d152e928701500a9497f4ad54525d613dc380bc28131f496 WHIRLPOOL 30994d04c25742a64504dd170d4602e92de43803f92b1088f1da71483fbf019a74a27dabbb7c8fd5e79b4a269fb3052fe4f4d65386a5377e7cdc9812e53589e7
 EBUILD pyside-1.2.2.ebuild 3699 SHA256 dedf1c467d9d6f05e812f3d11d2214fa8457db5009971f6bfee4c917ee1bb69d SHA512 435c0039e20cdea55959800b985ad0b60939432f842558aab902f359b6a171a5c60162cbb4e4830adc678d55480ee007886d607664845aad6a5659414ccf8419 WHIRLPOOL d642be9b6531db512196579925d16d349a8e2cfa10213b0864dedcb1ccd782a6e59da40842506393f1758b5e55be0fd30a339ed011ce143df7cda87b2428df66
-MISC ChangeLog 9292 SHA256 582f2f2fae350cf942422d625211ec897780cc2b92e9a43ddc70d79540593aa2 SHA512 74691b0035b83a03062d6f2afa61d01ff3aa8a984056bc3c9a7821681fe5a79bdbdb4788aee9d20e205d367313eb6e964f50086ae6c05e136281d3ec4d3e80ed WHIRLPOOL c68da76e6fcea332621f696856291520e6f7815ad0801bd1326947c759115dbef158caf69a9cb21cb8adb1f653cdd779775f4c429a25261e85999f3470aa5bce
+MISC ChangeLog 9621 SHA256 30934f30ef8c0aa5c7cec6787b39632561dc7193552115fc1dbc143768cdad95 SHA512 5b6d4310e424083470a34099f8cc97f69b3a005daf04d576eef10f9039c3393458f9a8f445f05818df86fd1a7719d9524cfcafee70cdcc89a720ec9032154a78 WHIRLPOOL c97c9757d1c842b6d4cc097d8163a15481155f3371e8d554e7049863cee63b9c2129695dba3577f509b04c39998d1f0670c6615a93ce3f9b06989d5fc1cf8705
 MISC metadata.xml 877 SHA256 97b51185277f5fced6124b692b16c48f34e2c3b6b6dc45534dac96c04e0d7ede SHA512 145aae0259472f9b18d7cdda1d184c10b4301df653180486c51ece51c35a20483a98d2ea4b2d2383ce05ee721ce5a859d7fb1c749ebac710afa4eae57600cab4 WHIRLPOOL 3d67e96ff041ae5d74588075572eed87b620f18e919fa39c3c75da0b5f64736254489ead12ff453183c917dda9b910d0555d7d664ebb49b276c659f7dba748e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU4gdBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Q3wP+wVA2FUCl1aasFsM0Ak/D88Y
-Mn/CXecOR/finP1/XZPt3XEaRGyJGUw/wl6PKhtZtL0MyRpnnaeCogzIhQUcnysW
-ziLo88GWKP7VgXT9wKzeGTZysEi7LMwPoVdpp2WX9tJz2OwoaLNxkDyVD9WCDHGM
-ri02PQV9gJQ3l+vOEEnBHBjXCqyEe7G6eGY+aD5GKkNIzmqlTGd8KkUJejvnl0qJ
-evzEMjPrIJNQ3UA+IE1yPQbRdq4QY/8VI7WUJfP/JqTNwe/O+M8SD12DuxQI2yjs
-Hda++at7ZBhYpOQ6dvw+xdLrnkaDlqCPGrPLOSw8zfigu2gSHlQ3372FgjOWq1x9
-YcrAeq1tWZlS7zPfnvAbTcTH5b8pgpantw4tg5UlH/y+o1XeNMBVFmv4IEDjEzY9
-7bRIjEZzE+2A8lF7opCOmr0L2u7zV0fg5NxzW+ZaOKt/yKBG8ShZU8ZVCPHRLUUq
-4yCo9TTpDfMU8MkDSa0b7erNaShiEupSPhke+kcGQu927PtBrqv9tCBeN4g5OBe+
-ApCJNZk04HC61Abdupun3ijDShejZgRDgdNb7hah03mTFD/zmNqUUZ8Pv7CIGS0C
-JncG53bM4Rh6jZuaUxEr6YnYyvgZ0cPTyLD0FD9tTKMwUewVXKaELXiEvSziWVzJ
-6TomUvbKoZQqJLTZ02tH
-=4jku
+iQJ8BAEBCABmBQJVDkODXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOcB0QAMebgbmXjJzCwgusfkFe8ZQH
+XMDd5bRq/RKn3FCLcDk0xKi1YO3L0MlZ0arOKju3rQ7ubLXmunAnxNeW2v/BR5ky
+g1sKczMx0O9YeQOgtepPom7jGlpn6IfGwKhV3xnU+Va7SZ8b/AIrL/0ExaYCOSGV
+KhjkYRi6DgzvxJ/YZrk3zDb6dvlSX8rV/HU2MGufzyjNxs1duSKWFYZN33HFeqO5
+R+T93c3Z3s4EYc+nwiwKb6V7wTDdqBqaGmVUpeez8NqrydGDAKIvvjKnE8co1Nz4
+XVRzTCm987+wDofyCq3B8xkxGEgTlDHmNJ4LEhERCxLjgxQsdzW5JytOiSLLz/1P
++SCUvTSZ2M5naQaNHuyTS+3t57eFqjRbcrxKKkq+Vq5W/7lnC70I/PSTsdCLwiIN
+nHDfXVMvkaop20BXC+YE9BoNRyMOc3vgjWAO57igGbhBrBNTe8rIrRdSDGvqgpNj
+Hlx7+pH/oXb3UTk4pvZfoJN3l8RXRR4FQnMEPbd2uzTzcElqj2+v40I+rnxabj6p
+Evugml9Gcvjtdb2zP0i2G5qrffx62DV2ocWAgcZqj0E2nr8ak4ZLIjbYTqzB0MMK
+skx5QwD3Z4aIHHMaVHAzEOaouIjw4Gr6Hu4FXvRj9uGbIoEb8iF5h00Oz11XCWEq
+C4Tcqk6M4XKVYpxCXstK
+=VO7Z
 -----END PGP SIGNATURE-----

diff --git a/dev-python/pyside/files/qgtkstyle-1.2.2.patch b/dev-python/pyside/files/qgtkstyle-1.2.2.patch
new file mode 100644 (file)
index 0000000..d782276
--- /dev/null
+++ b/dev-python/pyside/files/qgtkstyle-1.2.2.patch
@@ -0,0 +1,33 @@
+diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
+index 6e14706..bd60775 100644
+--- a/PySide/QtGui/CMakeLists.txt
++++ b/PySide/QtGui/CMakeLists.txt
+@@ -71,7 +71,6 @@ set(QtGui_OPTIONAL_SRC )
+ set(QtGui_DROPPED_ENTRIES )
+ check_qt_class(QtGui QAbstractPageSetupDialog   QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+ check_qt_class(QtGui QAbstractPrintDialog       QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+-check_qt_class(QtGui QGtkStyle                  QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+ check_qt_class(QtGui QPageSetupDialog           QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+ check_qt_class(QtGui QPrintDialog               QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+ check_qt_class(QtGui QPrintEngine               QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
+index 711d7cc..954aa54 100644
+--- a/PySide/QtGui/typesystem_gui_common.xml
++++ b/PySide/QtGui/typesystem_gui_common.xml
+@@ -6996,16 +6996,6 @@
+     <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
+   </object-type>
+ 
+-  <object-type name="QGtkStyle">
+-    <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const">
+-      <modify-argument index="2">
+-        <replace-default-expression with="0"/>
+-      </modify-argument>
+-      <modify-argument index="3">
+-        <replace-default-expression with="0"/>
+-      </modify-argument>
+-    </modify-function>
+-  </object-type>
+ 
+   <object-type name="QPageSetupDialog">
+     <enum-type name="PageSetupDialogOption" flags="PageSetupDialogOptions"/>

diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r1.ebuild
new file mode 100644 (file)
index 0000000..f9d10bb
--- /dev/null
+++ b/dev-python/pyside/pyside-1.2.2-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.2.2-r1.ebuild,v 1.1 2015/03/22 04:22:21 yngwin Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit cmake-utils multilib python-r1 virtualx
+
+MY_P="${PN}-qt4.8+${PV}"
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="http://qt-project.org/wiki/PySide"
+SRC_URI="http://download.qt-project.org/official_releases/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="X declarative designer help multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns"
+REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}
+       declarative? ( X )
+       designer? ( X )
+       help? ( X )
+       multimedia? ( X )
+       opengl? ( X )
+       phonon? ( X )
+       scripttools? ( X script )
+       sql? ( X )
+       svg? ( X )
+       test? ( X )
+       webkit? ( X )
+"
+
+# Minimal supported version of Qt.
+QT_PV="4.8.5:4"
+
+RDEPEND="
+       ${PYTHON_DEPS}
+       >=dev-python/shiboken-${PV}[${PYTHON_USEDEP}]
+       >=dev-qt/qtcore-${QT_PV}
+       X? (
+               >=dev-qt/qtgui-${QT_PV}[accessibility]
+               >=dev-qt/qttest-${QT_PV}
+       )
+       declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+       designer? ( >=dev-qt/designer-${QT_PV} )
+       help? ( >=dev-qt/qthelp-${QT_PV} )
+       multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+       opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+       phonon? ( || (
+               media-libs/phonon[qt4(+)]
+               >=dev-qt/qtphonon-${QT_PV}
+       ) )
+       script? ( >=dev-qt/qtscript-${QT_PV} )
+       sql? ( >=dev-qt/qtsql-${QT_PV} )
+       svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )
+       webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+       xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+       >=dev-qt/qtgui-${QT_PV}
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog )
+
+src_prepare() {
+       # Fix generated pkgconfig file to require the shiboken
+       # library suffixed with the correct python version.
+       sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
+               libpyside/pyside.pc.in || die
+
+       if use prefix; then
+               cp "${FILESDIR}"/rpath.cmake . || die
+               sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
+       fi
+
+       epatch "${FILESDIR}/qgtkstyle-${PV}.patch" # bug 530764
+
+       cmake-utils_src_prepare
+}
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_build test TESTS)
+               $(cmake-utils_use_disable X QtGui)
+               $(cmake-utils_use_disable X QtTest)
+               $(cmake-utils_use_disable declarative QtDeclarative)
+               $(cmake-utils_use_disable designer QtDesigner)
+               $(cmake-utils_use_disable designer QtUiTools)
+               $(cmake-utils_use_disable help QtHelp)
+               $(cmake-utils_use_disable multimedia QtMultimedia)
+               $(cmake-utils_use_disable opengl QtOpenGL)
+               $(cmake-utils_use_disable phonon)
+               $(cmake-utils_use_disable script QtScript)
+               $(cmake-utils_use_disable scripttools QtScriptTools)
+               $(cmake-utils_use_disable sql QtSql)
+               $(cmake-utils_use_disable svg QtSvg)
+               $(cmake-utils_use_disable webkit QtWebKit)
+               $(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
+       )
+
+       if use phonon && has_version "media-libs/phonon[qt4(+)]"; then
+               # bug 475786
+               mycmakeargs+=(
+                       -DQT_PHONON_INCLUDE_DIR="${EPREFIX}/usr/include/phonon"
+                       -DQT_PHONON_LIBRARY_RELEASE="${EPREFIX}/usr/$(get_libdir)/libphonon.so"
+               )
+       fi
+
+       configuration() {
+               local mycmakeargs=(
+                       -DPYTHON_SUFFIX="-${EPYTHON}"
+                       "${mycmakeargs[@]}"
+               )
+               cmake-utils_src_configure
+       }
+       python_foreach_impl configuration
+}
+
+src_compile() {
+       python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+       local PYTHONDONTWRITEBYTECODE
+       export PYTHONDONTWRITEBYTECODE
+
+       VIRTUALX_COMMAND="cmake-utils_src_test" python_foreach_impl virtualmake
+}
+
+src_install() {
+       installation() {
+               cmake-utils_src_install
+               mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+       }
+       python_foreach_impl installation
+}