* [gentoo-commits] proj/qt:master commit in: dev-python/pyside/, dev-python/shiboken/
@ 2015-03-30 19:47 Davide Pesavento
0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2015-03-30 19:47 UTC (permalink / raw
To: gentoo-commits
commit: eb947b77a1572fcc3ab0d1313de2c4a455b794f7
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 19:45:44 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 19:45:44 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=eb947b77
[dev-python/{shiboken,pyside}] Switch EGIT_REPO_URI to code.qt.io
dev-python/pyside/pyside-9999.ebuild | 4 ++--
dev-python/shiboken/shiboken-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild
index 938bdc6..33689f7 100644
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@@ -13,8 +13,8 @@ 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/pyside/${PN}.git"
- "https://git.gitorious.org/pyside/${PN}.git"
+ "git://code.qt.io/pyside/${PN}.git"
+ "https://code.qt.io/git/pyside/${PN}.git"
)
LICENSE="LGPL-2.1"
diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
index 00b4fdf..c2b6f63 100644
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ b/dev-python/shiboken/shiboken-9999.ebuild
@@ -11,8 +11,8 @@ inherit cmake-utils multilib 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}.git"
- "https://git.gitorious.org/pyside/${PN}.git"
+ "git://code.qt.io/pyside/${PN}.git"
+ "https://code.qt.io/git/pyside/${PN}.git"
)
LICENSE="LGPL-2.1"
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-python/pyside/, dev-python/shiboken/
@ 2017-10-22 4:34 Davide Pesavento
0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2017-10-22 4:34 UTC (permalink / raw
To: gentoo-commits
commit: 3b7625b555453eedf265df72f6652b9a5a00f9b9
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 04:33:02 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 04:33:12 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3b7625b5
dev-python/{pyside,shiboken}: disable all git submodules
We don't need them. Save bandwidth and disk space.
Package-Manager: Portage-2.3.12, Repoman-2.3.3
dev-python/pyside/pyside-9999.ebuild | 1 +
dev-python/shiboken/shiboken-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild
index 0d90c94b..a910c558 100644
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@@ -11,6 +11,7 @@ DESCRIPTION="Python bindings for the Qt framework"
HOMEPAGE="https://wiki.qt.io/PySide2"
EGIT_REPO_URI="https://code.qt.io/pyside/pyside-setup.git"
EGIT_BRANCH="5.9"
+EGIT_SUBMODULES=()
# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
index 4a4a2249..1f5a91b9 100644
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ b/dev-python/shiboken/shiboken-9999.ebuild
@@ -11,6 +11,7 @@ DESCRIPTION="Tool for creating Python bindings for C++ libraries"
HOMEPAGE="https://wiki.qt.io/PySide2"
EGIT_REPO_URI="https://code.qt.io/pyside/pyside-setup.git"
EGIT_BRANCH="5.9"
+EGIT_SUBMODULES=()
# The "sources/shiboken2/libshiboken" directory is triple-licensed under the GPL
# v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 with
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-python/pyside/, dev-python/shiboken/
@ 2017-04-30 19:17 Davide Pesavento
0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2017-04-30 19:17 UTC (permalink / raw
To: gentoo-commits
commit: a03f2e5c1d461e828e3b36b0f94a036695d04374
Author: leycec <leycec <AT> gmail <DOT> com>
AuthorDate: Mon Mar 13 06:22:46 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 19:10:24 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a03f2e5c
dev-python/pyside: Build PySide2 and shiboken2, 5.6 branch.
The live pyside and shiboken ebuilds now build PySide2 and shiboken2
respectively. For disambiguity, both are now slotted into slot 2. All
pyside USE flags are now handled as expected and support all available
optional dependencies. For upstream reasons, Qt =5.6* is required for now.
Python 3.6 is additionally supported.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-python/pyside/metadata.xml | 16 +++-
dev-python/pyside/pyside-9999.ebuild | 158 +++++++++++++++++++------------
dev-python/shiboken/shiboken-9999.ebuild | 39 +++++---
3 files changed, 136 insertions(+), 77 deletions(-)
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
index dcfc63e1..6dff63cb 100644
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -6,18 +6,26 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
- <flag name="X">Build QtGui and QtTest modules</flag>
- <flag name="declarative">Build QtDeclarative module</flag>
+ <flag name="concurrent">Build QtConcurrent module</flag>
+ <flag name="declarative">Build QtQml, QtQuick, and QtQuickWidgets modules</flag>
<flag name="designer">Build QtDesigner and QtUiTools modules</flag>
+ <flag name="gui">Build QtGui module</flag>
<flag name="help">Build QtHelp module</flag>
<flag name="multimedia">Build QtMultimedia module</flag>
+ <flag name="network">Build QtNetwork module</flag>
<flag name="opengl">Build QtOpenGL module</flag>
+ <flag name="printsupport">Build QtPrintSupport module</flag>
<flag name="script">Build QtScript module</flag>
<flag name="scripttools">Build QtScriptTools module</flag>
<flag name="sql">Build QtSql module</flag>
<flag name="svg">Build QtSvg module</flag>
- <flag name="webkit">Build QtWebKit module</flag>
+ <flag name="testlib">Build QtTest module</flag>
+ <flag name="webchannel">Build QtWebChannel module</flag>
+ <flag name="webengine">Build QtWebEngine and QtWebEngineWidgets modules</flag>
+ <flag name="webkit">Build QtWebKit and QtWebKitWidgets modules</flag>
+ <flag name="websockets">Build QtWebSockets module</flag>
+ <flag name="widgets">Build QtWidgets module</flag>
+ <flag name="x11extras">Build QtX11Extras module</flag>
<flag name="xmlpatterns">Build QtXmlPatterns module</flag>
</use>
</pkgmetadata>
-
diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild
index b3beda50..108dbb67 100644
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@@ -1,71 +1,94 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit cmake-utils flag-o-matic python-r1 virtualx git-r3
+inherit cmake-utils python-r1 virtualx git-r3
DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/Pyside"
+HOMEPAGE="https://wiki.qt.io/PySide2"
EGIT_REPO_URI=(
"git://code.qt.io/pyside/${PN}.git"
"https://code.qt.io/git/pyside/${PN}.git"
)
+#FIXME: Switch to the clang-enabled "dev" branch once stable.
+EGIT_BRANCH="5.6"
LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="2"
KEYWORDS=""
-IUSE="X declarative designer help multimedia opengl script scripttools sql svg test webkit xmlpatterns"
+IUSE="concurrent declarative designer gui help multimedia network opengl
+ printsupport script scripttools sql svg test testlib webchannel
+ webengine webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were strongly inspired by their PyQt5 equivalents.
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
- declarative? ( X )
- designer? ( X )
- help? ( X )
- multimedia? ( X )
- opengl? ( X )
- scripttools? ( X script )
- sql? ( X )
- svg? ( X )
- test? ( X )
- webkit? ( X )
+ declarative? ( gui network )
+ designer? ( widgets )
+ help? ( widgets )
+ multimedia? ( gui network )
+ opengl? ( widgets )
+ printsupport? ( widgets )
+ scripttools? ( gui script )
+ sql? ( widgets )
+ svg? ( widgets )
+ test? ( widgets )
+ testlib? ( widgets )
+ webchannel? ( network )
+ webengine? ( network webchannel widgets )
+ webkit? ( gui network printsupport widgets )
+ websockets? ( network )
+ widgets? ( gui )
+ xmlpatterns? ( network )
"
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
+# Minimum version of Qt required, derived from the CMakeLists.txt line:
+# find_package(Qt5 ${QT_PV} REQUIRED COMPONENTS Core)
+QT_PV="5.6*:5"
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} )
- 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}
+ >=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
+ =dev-qt/qtcore-${QT_PV}
+ =dev-qt/qtxml-${QT_PV}
+ declarative? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+ designer? ( =dev-qt/designer-${QT_PV} )
+ help? ( =dev-qt/qthelp-${QT_PV} )
+ multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+ opengl? ( =dev-qt/qtopengl-${QT_PV} )
+ printsupport? ( =dev-qt/qtprintsupport-${QT_PV} )
+ script? ( =dev-qt/qtscript-${QT_PV} )
+ sql? ( =dev-qt/qtsql-${QT_PV} )
+ svg? ( =dev-qt/qtsvg-${QT_PV} )
+ testlib? ( =dev-qt/qttest-${QT_PV} )
+ webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
+ webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )
+ webkit? ( =dev-qt/qtwebkit-${QT_PV}[printsupport] )
+ websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
+ x11extras? ( =dev-qt/qtx11extras-${QT_PV} )
+ xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV} )
+ concurrent? ( =dev-qt/qtconcurrent-${QT_PV} )
+ gui? ( =dev-qt/qtgui-${QT_PV} )
+ network? ( =dev-qt/qtnetwork-${QT_PV} )
+ printsupport? ( =dev-qt/qtprintsupport-${QT_PV} )
+ sql? ( =dev-qt/qtsql-${QT_PV} )
+ testlib? ( =dev-qt/qttest-${QT_PV} )
+ widgets? ( =dev-qt/qtwidgets-${QT_PV} )
"
-
-DOCS=( ChangeLog )
+DEPEND="${RDEPEND}"
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/pyside2.pc.in || die
+ #FIXME: Remove the following "sed" patch after this upstream issue is closed:
+ # https://bugreports.qt.io/browse/PYSIDE-502
+ # Force the optional "Qt5Concurrent", "Qt5Gui", "Qt5Network",
+ # "Qt5PrintSupport", "Qt5Sql", "Qt5Test", and "Qt5Widgets" packages
+ # erroneously marked as mandatory to be optional.
+ sed -i -e 's/^\(CHECK_PACKAGE_FOUND(Qt5\(Concurrent\|Gui\|Network\|PrintSupport\|Sql\|Test\|Widgets\)\))$/\1 opt)/' \
+ PySide2/CMakeLists.txt || die
if use prefix; then
cp "${FILESDIR}"/rpath.cmake . || die
@@ -76,25 +99,38 @@ src_prepare() {
}
src_configure() {
- append-cxxflags -std=c++11
-
+ # For each line of the form "CHECK_PACKAGE_FOUND(${PACKAGE_NAME} opt)" in
+ # PySide2/CMakeLists.txt defining an optional dependency, an option of the
+ # form "-DCMAKE_DISABLE_FIND_PACKAGE_${PACKAGE_NAME}=$(usex !${USE_FLAG})"
+ # is passed to "cmake" here conditionally disabling this dependency.
local mycmakeargs=(
-DBUILD_TESTS=$(usex test)
- -DDISABLE_QtGui=$(usex !X)
- -DDISABLE_QtTest=$(usex !X)
- -DDISABLE_QtQml=$(usex !declarative)
- -DDISABLE_QtQuick=$(usex !declarative)
- -DDISABLE_QtQuickWidgets=$(usex !declarative)
- -DDISABLE_QtUiTools=$(usex !designer)
- -DDISABLE_QtHelp=$(usex !help)
- -DDISABLE_QtMultimedia=$(usex !multimedia)
- -DDISABLE_QtOpenGL=$(usex !opengl)
- -DDISABLE_QtScript=$(usex !script)
- -DDISABLE_QtScriptTools=$(usex !scripttools)
- -DDISABLE_QtSql=$(usex !sql)
- -DDISABLE_QtSvg=$(usex !svg)
- -DDISABLE_QtWebKit=$(usex !webkit)
- -DDISABLE_QtXmlPatterns=$(usex !xmlpatterns)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5OpenGL=$(usex !opengl)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !declarative)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !declarative)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !declarative)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKit=$(usex !webkit)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=$(usex !webkit)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns)
)
configuration() {
@@ -120,7 +156,7 @@ src_test() {
src_install() {
installation() {
cmake-utils_src_install
- mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+ mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}2{,-${EPYTHON}}.pc || die
}
python_foreach_impl installation
}
diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
index 0c7e78ff..721c08d3 100644
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ b/dev-python/shiboken/shiboken-9999.ebuild
@@ -1,44 +1,52 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit cmake-utils python-r1 git-r3
+inherit cmake-utils llvm python-r1 git-r3
-DESCRIPTION="A tool for creating Python bindings for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/Pyside"
+DESCRIPTION="Tool for creating Python bindings for C++ libraries"
+HOMEPAGE="https://wiki.qt.io/PySide2"
EGIT_REPO_URI=(
"git://code.qt.io/pyside/${PN}.git"
"https://code.qt.io/git/pyside/${PN}.git"
)
+#FIXME: Switch to the clang-enabled "dev" branch once stable.
+EGIT_BRANCH="5.6"
LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="2"
KEYWORDS=""
IUSE="test"
-
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Minimum version of Qt required.
+QT_PV="5.6*:5"
+
+#FIXME: Add "sys-devel/clang:*" after switching to the "dev" branch.
RDEPEND="
${PYTHON_DEPS}
dev-libs/libxml2
dev-libs/libxslt
- dev-qt/qtcore:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
+ =dev-qt/qtcore-${QT_PV}
+ =dev-qt/qtxml-${QT_PV}
+ =dev-qt/qtxmlpatterns-${QT_PV}
"
DEPEND="${RDEPEND}
test? (
- dev-qt/qtgui:5
- dev-qt/qttest:5
+ =dev-qt/qtgui-${QT_PV}
+ =dev-qt/qttest-${QT_PV}
)
"
DOCS=( AUTHORS )
src_prepare() {
+ #FIXME: Uncomment after switching to the "dev" branch.
+ # sed -i -e "/^find_library(CLANG_LIBRARY/ s~/lib)$~/$(get_libdir))~" CMakeLists.txt || die
+
if use prefix; then
cp "${FILESDIR}"/rpath.cmake . || die
sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
@@ -61,6 +69,13 @@ src_configure() {
)
fi
+ #FIXME: Uncomment after switching to the "dev" branch.
+ #FIXME: "CMakeLists.txt" currently requires that callers manually set
+ #this environment variable to the absolute path of the directory
+ #containing clang libraries rather than magically finding this path
+ #(e.g., via "find_package(CLang)"). If this changes, remove this option.
+ # CLANG_INSTALL_DIR="$(get_llvm_prefix)" cmake-utils_src_configure
+
cmake-utils_src_configure
}
python_foreach_impl configuration
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-python/pyside/, dev-python/shiboken/
@ 2013-12-25 20:27 Davide Pesavento
0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2013-12-25 20:27 UTC (permalink / raw
To: gentoo-commits
commit: 67a85be6499da7e44882df9bbe237ec8f91570a0
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Dec 25 20:26:35 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> 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 @@
<flag name="declarative">Build QtDeclarative module</flag>
<flag name="designer">Build QtDesigner and QtUiTools modules</flag>
<flag name="help">Build QtHelp module</flag>
- <flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
<flag name="multimedia">Build QtMultimedia module</flag>
<flag name="opengl">Build QtOpenGL module</flag>
<flag name="phonon">Build phonon module</flag>
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)"
)
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-python/pyside/, dev-python/shiboken/
@ 2013-08-18 8:04 Davide Pesavento
0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2013-08-18 8:04 UTC (permalink / raw
To: gentoo-commits
commit: b38d7f05a63e347a9a33b453eb5a4dfb321a25b6
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Aug 18 08:04:14 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 08:04:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b38d7f05
[dev-python/{shiboken,pyside}] Sync with portage.
---
dev-python/pyside/metadata.xml | 7 ++-----
dev-python/pyside/pyside-9999.ebuild | 12 +++++++-----
dev-python/shiboken/shiboken-9999.ebuild | 10 +++++-----
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
index 6c85172..41f4775 100644
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -2,13 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>qt</herd>
- <maintainer>
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
<use>
- <flag name="X">Build QtGui, QtDesigner, QtTest and QtUiTools modules</flag>
+ <flag name="X">Build QtGui and QtTest modules</flag>
<flag name="declarative">Build QtDeclarative module</flag>
+ <flag name="designer">Build QtDesigner and QtUiTools modules</flag>
<flag name="help">Build QtHelp module</flag>
<flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
<flag name="multimedia">Build QtMultimedia module</flag>
diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild
index 6edaef4..1e7bd1c 100644
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.2.0.ebuild,v 1.1 2013/08/15 10:19:36 pesa Exp $
EAPI=5
@@ -11,16 +11,17 @@ inherit multilib cmake-utils python-r1 virtualx git-2
MY_P="${PN}-qt4.8+${PV}"
DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://www.pyside.org/"
+HOMEPAGE="http://qt-project.org/wiki/PySide"
EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="X declarative help kde multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns"
+IUSE="X declarative designer help kde multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns"
REQUIRED_USE="
declarative? ( X )
+ designer? ( X )
help? ( X )
multimedia? ( X )
opengl? ( X )
@@ -43,6 +44,7 @@ RDEPEND="
>=dev-qt/qttest-${QT_PV}
)
declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+ designer? ( || ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 ) )
help? ( >=dev-qt/qthelp-${QT_PV} )
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
opengl? ( >=dev-qt/qtopengl-${QT_PV} )
@@ -82,10 +84,10 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_build test TESTS)
$(cmake-utils_use_disable X QtGui)
- $(cmake-utils_use_disable X QtDesigner)
$(cmake-utils_use_disable X QtTest)
- $(cmake-utils_use_disable X QtUiTools)
$(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)
diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
index 56da355..0a69637 100644
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ b/dev-python/shiboken/shiboken-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.2.0.ebuild,v 1.1 2013/08/15 09:45:01 pesa Exp $
EAPI=5
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2} )
inherit multilib cmake-utils python-r1 git-2
DESCRIPTION="A tool for creating Python bindings for C++ libraries"
-HOMEPAGE="http://www.pyside.org/"
+HOMEPAGE="http://qt-project.org/wiki/PySide"
EGIT_REPO_URI="git://gitorious.org/pyside/${PN}"
LICENSE="LGPL-2.1"
@@ -52,7 +52,7 @@ src_configure() {
configuration() {
local mycmakeargs=(
-DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)"
+ -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-DPYTHON_SUFFIX="-${EPYTHON}"
$(cmake-utils_use_build test TESTS)
)
@@ -60,8 +60,8 @@ src_configure() {
if [[ ${EPYTHON} == python3* ]]; then
mycmakeargs+=(
-DUSE_PYTHON3=ON
- -DPYTHON3_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
- -DPYTHON3_LIBRARY="${EPREFIX}$(python_get_library_path)"
+ -DPYTHON3_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON3_LIBRARY="$(python_get_library_path)"
)
fi
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-python/pyside/, dev-python/shiboken/
@ 2012-03-14 14:28 Davide Pesavento
0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2012-03-14 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 4f71d5cf0a1bc19d5effa7a17051ba0a72705cda
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Mar 14 14:26:20 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 14:26:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4f71d5cf
shiboken,pyside: sync with portage.
(Portage version: 2.2.0_alpha90/git/Linux x86_64, unsigned Manifest commit)
---
dev-python/pyside/metadata.xml | 19 +++++
dev-python/pyside/pyside-9999.ebuild | 128 +++++++++++++++++++++++++----
dev-python/shiboken/metadata.xml | 9 +--
dev-python/shiboken/shiboken-9999.ebuild | 75 ++++++++++++++++--
4 files changed, 198 insertions(+), 33 deletions(-)
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
index ab02f99..d51b21a 100644
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -2,4 +2,23 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>qt</herd>
+ <maintainer>
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+ <use>
+ <flag name="X">Build QtGui, QtDesigner, QtTest and QtUiTools modules</flag>
+ <flag name="declarative">Build QtDeclarative module</flag>
+ <flag name="help">Build QtHelp module</flag>
+ <flag name="kde">Select <pkg>media-sound/phonon</pkg> as phonon variant, needed for KDE4</flag>
+ <flag name="multimedia">Build QtMultimedia module</flag>
+ <flag name="opengl">Build QtOpenGL module</flag>
+ <flag name="phonon">Build phonon module</flag>
+ <flag name="script">Build QtScript module</flag>
+ <flag name="scripttools">Build QtScriptTools module</flag>
+ <flag name="sql">Build QtSql module</flag>
+ <flag name="svg">Build QtSvg module</flag>
+ <flag name="webkit">Build QtWebKit module</flag>
+ <flag name="xmlpatterns">Build QtXmlPatterns module</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild
index 6fd9259..d375237 100644
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@@ -4,7 +4,15 @@
EAPI=4
-inherit cmake-utils git-2
+CMAKE_IN_SOURCE_BUILD="1"
+
+PYTHON_DEPEND="2:2.6 3:3.2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.1 *-jython 2.7-pypy-*"
+
+VIRTUALX_COMMAND="cmake-utils_src_test"
+
+inherit multilib cmake-utils python virtualx git-2
DESCRIPTION="Python bindings for the Qt framework"
HOMEPAGE="http://www.pyside.org/"
@@ -13,24 +21,108 @@ EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="debug kde"
+IUSE="X declarative help multimedia kde opengl phonon script scripttools sql svg test webkit xmlpatterns"
-QT_PV="4.6.0"
+REQUIRED_USE="
+ declarative? ( X )
+ help? ( X )
+ multimedia? ( X )
+ opengl? ( X )
+ phonon? ( X )
+ scripttools? ( X script )
+ sql? ( X )
+ svg? ( X )
+ test? ( X )
+ webkit? ( X )
+"
-DEPEND=">=dev-libs/boost-1.41.0[python]
+QT_PV="4.7.0:4"
+
+RDEPEND="
~dev-python/shiboken-${PV}
>=x11-libs/qt-core-${QT_PV}
- >=x11-libs/qt-assistant-${QT_PV}
- >=x11-libs/qt-gui-${QT_PV}
- >=x11-libs/qt-opengl-${QT_PV}
- kde? ( media-libs/phonon )
- !kde? ( || ( >=x11-libs/qt-phonon-${QT_PV}
- media-libs/phonon ) )
- >=x11-libs/qt-script-${QT_PV}
- >=x11-libs/qt-sql-${QT_PV}
- >=x11-libs/qt-svg-${QT_PV}
- >=x11-libs/qt-webkit-${QT_PV}
- >=x11-libs/qt-xmlpatterns-${QT_PV}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
+ X? (
+ >=x11-libs/qt-gui-${QT_PV}[accessibility]
+ >=x11-libs/qt-test-${QT_PV}
+ )
+ declarative? ( >=x11-libs/qt-declarative-${QT_PV} )
+ help? ( >=x11-libs/qt-assistant-${QT_PV} )
+ multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
+ opengl? ( >=x11-libs/qt-opengl-${QT_PV} )
+ phonon? (
+ kde? ( media-libs/phonon )
+ !kde? ( || (
+ >=x11-libs/qt-phonon-${QT_PV}
+ media-libs/phonon
+ ) )
+ )
+ script? ( >=x11-libs/qt-script-${QT_PV} )
+ sql? ( >=x11-libs/qt-sql-${QT_PV} )
+ svg? ( >=x11-libs/qt-svg-${QT_PV}[accessibility] )
+ webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
+ xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+ ~dev-python/generatorrunner-${PV}
+"
+
+S=${WORKDIR}/${PN}
+
+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
+
+ python_src_prepare
+}
+
+src_configure() {
+ configuration() {
+ local mycmakeargs=(
+ -DPYTHON_SUFFIX="-python${PYTHON_ABI}"
+ $(cmake-utils_use_build test TESTS)
+ $(cmake-utils_use_disable X QtGui)
+ $(cmake-utils_use_disable X QtDesigner)
+ $(cmake-utils_use_disable X QtTest)
+ $(cmake-utils_use_disable X QtUiTools)
+ $(cmake-utils_use_disable declarative QtDeclarative)
+ $(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)
+ )
+ CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_configure
+ }
+ python_execute_function -s configuration
+}
+
+src_compile() {
+ compilation() {
+ CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_make
+ }
+ python_execute_function -s compilation
+}
+
+src_test() {
+ testing() {
+ CMAKE_USE_DIR="${BUILDDIR}" virtualmake
+ }
+ python_enable_pyc
+ python_execute_function -s testing
+ python_disable_pyc
+}
+
+src_install() {
+ installation() {
+ CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install
+ mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc || die
+ }
+ python_execute_function -s installation
+}
diff --git a/dev-python/shiboken/metadata.xml b/dev-python/shiboken/metadata.xml
index b20aa40..dc439f7 100644
--- a/dev-python/shiboken/metadata.xml
+++ b/dev-python/shiboken/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <maintainer>
- <email>ayoy@gentoo.org</email>
- <name>Dominik Kapusta</name>
- </maintainer>
- <longdescription lang="en">
- </longdescription>
+<herd>qt</herd>
</pkgmetadata>
-
diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
index 052c099..a97f8ae 100644
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ b/dev-python/shiboken/shiboken-9999.ebuild
@@ -4,7 +4,13 @@
EAPI=4
-inherit cmake-utils git-2
+CMAKE_IN_SOURCE_BUILD="1"
+
+PYTHON_DEPEND="2:2.6 3:3.2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.1 *-jython 2.7-pypy-*"
+
+inherit multilib cmake-utils python git-2
DESCRIPTION="A tool for creating Python bindings for C++ libraries"
HOMEPAGE="http://www.pyside.org/"
@@ -13,10 +19,65 @@ EGIT_REPO_URI="git://gitorious.org/pyside/${PN}"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="debug"
+IUSE="test"
+
+RDEPEND="
+ ~dev-python/apiextractor-${PV}
+ ~dev-python/generatorrunner-${PV}
+ >=x11-libs/qt-core-4.7.0:4
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ # Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake,
+ # caused by the usage of a different version suffix with python >= 3.2
+ sed -i -e "/get_config_var('SOABI')/d" \
+ cmake/Modules/FindPython3InterpWithDebug.cmake || die
+
+ python_src_prepare
+}
+
+src_configure() {
+ configuration() {
+ local mycmakeargs=(
+ -DPYTHON_EXECUTABLE="$(PYTHON -a)"
+ -DPYTHON_SUFFIX="-python${PYTHON_ABI}"
+ $(cmake-utils_use_build test TESTS)
+ )
+
+ if [[ $(python_get_version -l --major) == 3 ]]; then
+ mycmakeargs+=(
+ -DUSE_PYTHON3=ON
+ -DPYTHON3_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON3_LIBRARY="$(python_get_library)"
+ )
+ fi
+
+ CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_configure
+ }
+ python_execute_function -s configuration
+}
+
+src_compile() {
+ compilation() {
+ CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_make
+ }
+ python_execute_function -s compilation
+}
+
+src_test() {
+ testing() {
+ CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_test
+ }
+ python_execute_function -s testing
+}
-DEPEND=">=dev-python/apiextractor-0.6.0
- >=dev-python/generatorrunner-0.5.0
- >=x11-libs/qt-core-4.5.0"
-RDEPEND="${DEPEND}
- !dev-python/boostpythongenerator"
+src_install() {
+ installation() {
+ CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install
+ mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc || die
+ }
+ python_execute_function -s installation
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-22 4:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-30 19:47 [gentoo-commits] proj/qt:master commit in: dev-python/pyside/, dev-python/shiboken/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2017-10-22 4:34 Davide Pesavento
2017-04-30 19:17 Davide Pesavento
2013-12-25 20:27 Davide Pesavento
2013-08-18 8:04 Davide Pesavento
2012-03-14 14:28 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox