yngwin 15/03/22 04:22:21 Modified: ChangeLog Added: pyside-1.2.2-r1.ebuild Log: 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. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)
Revision Changes Path 1.68 dev-python/pyside/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/ChangeLog?rev=1.68&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/ChangeLog?rev=1.68&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/ChangeLog?r1=1.67&r2=1.68 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- ChangeLog 16 Feb 2015 15:05:29 -0000 1.67 +++ ChangeLog 22 Mar 2015 04:22:21 -0000 1.68 @@ -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 <[email protected]> +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 <[email protected]> -pyside-1.1.2-r1.ebuild, -pyside-1.2.1-r1.ebuild, metadata.xml: 1.1 dev-python/pyside/pyside-1.2.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/pyside-1.2.2-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyside/pyside-1.2.2-r1.ebuild?rev=1.1&content-type=text/plain Index: pyside-1.2.2-r1.ebuild =================================================================== # 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 }
