From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 33C6E138247 for ; Wed, 25 Dec 2013 20:28:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 001D9E093A; Wed, 25 Dec 2013 20:28:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6CC9CE093A for ; Wed, 25 Dec 2013 20:28:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5062133F68A for ; Wed, 25 Dec 2013 20:27:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C4DBAE54C1 for ; Wed, 25 Dec 2013 20:27:57 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1388003195.67a85be6499da7e44882df9bbe237ec8f91570a0.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-python/pyside/, dev-python/shiboken/ X-VCS-Repository: proj/qt X-VCS-Files: dev-python/pyside/metadata.xml dev-python/pyside/pyside-9999.ebuild dev-python/shiboken/shiboken-9999.ebuild X-VCS-Directories: dev-python/pyside/ dev-python/shiboken/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 67a85be6499da7e44882df9bbe237ec8f91570a0 X-VCS-Branch: master Date: Wed, 25 Dec 2013 20:27:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 95d2d220-3522-4a55-b258-334381f4709e X-Archives-Hash: 5a610f7483f20c7ada15db276ba1f3be commit: 67a85be6499da7e44882df9bbe237ec8f91570a0 Author: Davide Pesavento gmail com> AuthorDate: Wed Dec 25 20:26:35 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Dec 25 20:26:35 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=67a85be6 [dev-python/{shiboken,pyside}] Sync with portage; switch to git-r3. --- dev-python/pyside/metadata.xml | 1 - dev-python/pyside/pyside-9999.ebuild | 35 ++++++++++++++++++++------------ dev-python/shiboken/shiboken-9999.ebuild | 21 ++++++++++--------- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml index 41f4775..186ae3f 100644 --- a/dev-python/pyside/metadata.xml +++ b/dev-python/pyside/metadata.xml @@ -7,7 +7,6 @@ Build QtDeclarative module Build QtDesigner and QtUiTools modules Build QtHelp module - Select media-libs/phonon as Phonon variant (needed for KDE) Build QtMultimedia module Build QtOpenGL module Build phonon module diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild index 1e7bd1c..4eb54ad 100644 --- a/dev-python/pyside/pyside-9999.ebuild +++ b/dev-python/pyside/pyside-9999.ebuild @@ -1,23 +1,26 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.2.0.ebuild,v 1.1 2013/08/15 10:19:36 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.2.1-r1.ebuild,v 1.1 2013/12/25 19:26:11 pesa Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7,3_2} ) +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) -inherit multilib cmake-utils python-r1 virtualx git-2 +inherit multilib cmake-utils python-r1 virtualx git-r3 MY_P="${PN}-qt4.8+${PV}" DESCRIPTION="Python bindings for the Qt framework" HOMEPAGE="http://qt-project.org/wiki/PySide" -EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}" +EGIT_REPO_URI=( + "git://gitorious.org/pyside/${PN}.git" + "https://git.gitorious.org/pyside/${PN}.git" +) LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="X declarative designer help kde multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns" +IUSE="X declarative designer help multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns" REQUIRED_USE=" declarative? ( X ) @@ -48,10 +51,10 @@ RDEPEND=" help? ( >=dev-qt/qthelp-${QT_PV} ) multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) opengl? ( >=dev-qt/qtopengl-${QT_PV} ) - phonon? ( - kde? ( media-libs/phonon ) - !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) ) - ) + 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] ) @@ -73,10 +76,8 @@ src_prepare() { libpyside/pyside.pc.in || die if use prefix; then - cp "${FILESDIR}"/rpath.cmake . - sed \ - -i '1iinclude(rpath.cmake)' \ - CMakeLists.txt || die + cp "${FILESDIR}"/rpath.cmake . || die + sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die fi } @@ -100,6 +101,14 @@ src_configure() { $(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}" diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild index 0a69637..0f067af 100644 --- a/dev-python/shiboken/shiboken-9999.ebuild +++ b/dev-python/shiboken/shiboken-9999.ebuild @@ -1,16 +1,19 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.2.0.ebuild,v 1.1 2013/08/15 09:45:01 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.2.1-r1.ebuild,v 1.2 2013/12/25 17:44:15 pesa Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7,3_2} ) +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) -inherit multilib cmake-utils python-r1 git-2 +inherit multilib cmake-utils python-r1 git-r3 DESCRIPTION="A tool for creating Python bindings for C++ libraries" HOMEPAGE="http://qt-project.org/wiki/PySide" -EGIT_REPO_URI="git://gitorious.org/pyside/${PN}" +EGIT_REPO_URI=( + "git://gitorious.org/pyside/${PN}.git" + "https://git.gitorious.org/pyside/${PN}.git" +) LICENSE="LGPL-2.1" SLOT="0" @@ -27,7 +30,6 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( - dev-python/numpy[${PYTHON_USEDEP}] >=dev-qt/qtgui-4.7.0:4 >=dev-qt/qttest-4.7.0:4 )" @@ -41,25 +43,24 @@ src_prepare() { cmake/Modules/FindPython3InterpWithDebug.cmake || die if use prefix; then - cp "${FILESDIR}"/rpath.cmake . - sed \ - -i '1iinclude(rpath.cmake)' \ - CMakeLists.txt || die + cp "${FILESDIR}"/rpath.cmake . || die + sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die fi } src_configure() { configuration() { local mycmakeargs=( + $(cmake-utils_use_build test TESTS) -DPYTHON_EXECUTABLE="${PYTHON}" -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" -DPYTHON_SUFFIX="-${EPYTHON}" - $(cmake-utils_use_build test TESTS) ) if [[ ${EPYTHON} == python3* ]]; then mycmakeargs+=( -DUSE_PYTHON3=ON + -DPYTHON3_EXECUTABLE="${PYTHON}" -DPYTHON3_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON3_LIBRARY="$(python_get_library_path)" )