* [gentoo-commits] proj/qt:master commit in: dev-python/shiboken/files/, dev-python/shiboken/
@ 2012-06-03 16:33 Davide Pesavento
0 siblings, 0 replies; 2+ messages in thread
From: Davide Pesavento @ 2012-06-03 16:33 UTC (permalink / raw
To: gentoo-commits
commit: 9b02dad224fac496af03ccfbc2d001346206a2e8
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 3 16:33:11 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 3 16:33:11 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b02dad2
[dev-python/shiboken] Sync with portage.
(Portage version: 2.2.0_alpha109/git/Linux x86_64, unsigned Manifest commit)
---
dev-python/shiboken/files/rpath.cmake | 10 ++++++++++
dev-python/shiboken/shiboken-9999.ebuild | 9 +++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/dev-python/shiboken/files/rpath.cmake b/dev-python/shiboken/files/rpath.cmake
new file mode 100644
index 0000000..b896c87
--- /dev/null
+++ b/dev-python/shiboken/files/rpath.cmake
@@ -0,0 +1,10 @@
+# use, i.e. don't skip the full RPATH for the build tree
+SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
index f078161..b882d41 100644
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ b/dev-python/shiboken/shiboken-9999.ebuild
@@ -33,13 +33,18 @@ DEPEND="${RDEPEND}
>=x11-libs/qt-test-4.7.0:4
)"
-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
+
+ if use prefix; then
+ cp "${FILESDIR}"/rpath.cmake .
+ sed \
+ -i '1iinclude(rpath.cmake)' \
+ CMakeLists.txt || die
+ fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-python/shiboken/files/, dev-python/shiboken/
@ 2019-07-13 17:18 Davide Pesavento
0 siblings, 0 replies; 2+ messages in thread
From: Davide Pesavento @ 2019-07-13 17:18 UTC (permalink / raw
To: gentoo-commits
commit: 6a795b4d1b8d10228a84f3ffb3a18d259c3660f1
Author: leycec <leycec <AT> gmail <DOT> com>
AuthorDate: Sat Jul 13 17:09:03 2019 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 17:10:06 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a795b4d
dev-python/shiboken: add 5.12.4, EAPI 7
Drop unmaintained live ebuild
Bug: https://bugs.gentoo.org/624682
Package-Manager: Portage-2.3.69, Repoman-2.3.16
dev-python/shiboken/Manifest | 1 +
dev-python/shiboken/files/rpath.cmake | 10 ---
dev-python/shiboken/metadata.xml | 4 ++
dev-python/shiboken/shiboken-5.12.4.ebuild | 101 +++++++++++++++++++++++++++++
dev-python/shiboken/shiboken-9999.ebuild | 95 ---------------------------
5 files changed, 106 insertions(+), 105 deletions(-)
diff --git a/dev-python/shiboken/Manifest b/dev-python/shiboken/Manifest
new file mode 100644
index 00000000..bb7247a6
--- /dev/null
+++ b/dev-python/shiboken/Manifest
@@ -0,0 +1 @@
+DIST pyside-setup-everywhere-src-5.12.4.tar.xz 5481172 BLAKE2B e4572cde99efebde20395c13f49a6ffd0b89a0044822e3cc4034ef0316e9a359749817bcc8f2069b4a401d70c03a0ab60a3907ac1628776203db0e349e053e06 SHA512 cf836a73980dce7e1f66f061351426fbf9ede773ef94608d7ee90b2185554f333550c74c14ac572c7d0465c6aea2f793d9c6f1fe6278a73deb40e1fd6fb88076
diff --git a/dev-python/shiboken/files/rpath.cmake b/dev-python/shiboken/files/rpath.cmake
deleted file mode 100644
index b896c878..00000000
--- a/dev-python/shiboken/files/rpath.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# use, i.e. don't skip the full RPATH for the build tree
-SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/dev-python/shiboken/metadata.xml b/dev-python/shiboken/metadata.xml
index d199c54b..27da5503 100644
--- a/dev-python/shiboken/metadata.xml
+++ b/dev-python/shiboken/metadata.xml
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>leycec@gmail.com</email>
+ </maintainer>
<maintainer type="project">
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
<use>
+ <flag name="docstrings">Expose documentation as Python docstrings (recommended)</flag>
<flag name="numpy">Enable NumPy-based 2D array support</flag>
</use>
</pkgmetadata>
diff --git a/dev-python/shiboken/shiboken-5.12.4.ebuild b/dev-python/shiboken/shiboken-5.12.4.ebuild
new file mode 100644
index 00000000..6df0fb8d
--- /dev/null
+++ b/dev-python/shiboken/shiboken-5.12.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: Split the "/usr/bin/shiboken2" binding generator from the
+# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
+# requires everything (including Clang) at runtime; the latter only requires
+# Qt and Python at runtime. Note that "pip" separates these two as well. See:
+# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
+# Once split, the PySide2 ebuild should be revised to require
+# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils llvm python-r1
+
+MY_P=pyside-setup-everywhere-src-${PV}
+
+DESCRIPTION="Python binding generator for C++ libraries"
+HOMEPAGE="https://wiki.qt.io/PySide2"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
+
+# 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 version 1.0 of a Qt-specific exception enabling shiboken2 output to be
+# arbitrarily relicensed. (TODO)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE="+docstrings numpy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-qt/qtcore-${PV}:5
+ >=sys-devel/clang-6:=
+ docstrings? (
+ >=dev-libs/libxml2-2.6.32
+ >=dev-libs/libxslt-1.1.19
+ >=dev-qt/qtxml-${PV}:5
+ >=dev-qt/qtxmlpatterns-${PV}:5
+ )
+ numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qttest-${PV}:5 )
+"
+
+S=${WORKDIR}/${MY_P}/sources/shiboken2
+DOCS=( AUTHORS )
+
+# Ensure the path returned by get_llvm_prefix() contains clang as well.
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+ #FIXME: File an upstream issue requesting a sane way to disable NumPy support.
+ if ! use numpy; then
+ sed -i -e '/print(os\.path\.realpath(numpy))/d' \
+ libshiboken/CMakeLists.txt || die
+ fi
+
+ # CMakeLists.txt assumes clang builtin includes are installed under
+ # LLVM_INSTALL_DIR. They are not on Gentoo. See bug 624682.
+ sed -i -e "s~clangPathLibDir = findClangLibDir()~clangPathLibDir = QStringLiteral(\"${EPREFIX}/usr/lib\")~" \
+ ApiExtractor/clangparser/compilersupport.cpp || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ shiboken_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTS=$(usex test)
+ -DDISABLE_DOCSTRINGS=$(usex !docstrings)
+ -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DUSE_PYTHON_VERSION="${EPYTHON#python}"
+ )
+ # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
+ LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake-utils_src_configure
+ }
+ python_foreach_impl shiboken_configure
+}
+
+src_compile() {
+ python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+ python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+ shiboken_install() {
+ cmake-utils_src_install
+ cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}2{,-${EPYTHON}}.pc || die
+ }
+ python_foreach_impl shiboken_install
+}
diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
deleted file mode 100644
index 0192869d..00000000
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils llvm python-r1 git-r3
-
-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
-# version 1.0 of a Qt-specific exception enabling shiboken2 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="2"
-KEYWORDS=""
-IUSE="numpy test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Minimum version of Qt required.
-QT_PV="5.9.0:5"
-
-DEPEND="
- ${PYTHON_DEPS}
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-qt/qtcore-${QT_PV}
- >=dev-qt/qtxml-${QT_PV}
- >=dev-qt/qtxmlpatterns-${QT_PV}
- >=sys-devel/clang-3.9.1:=
- numpy? ( dev-python/numpy )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}/sources/shiboken2
-
-DOCS=( AUTHORS )
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
- #FIXME: File an upstream issue requesting a sane way to disable NumPy support.
- if ! use numpy; then
- sed -i -e '/print(os\.path\.realpath(numpy))/d' libshiboken/CMakeLists.txt || die
- fi
-
- if use prefix; then
- cp "${FILESDIR}"/rpath.cmake . || die
- sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
- fi
-
- # CMakeLists.txt assumes clang builtin includes are installed
- # under LLVM_INSTALL_DIR. They are not on Gentoo. See bug 624682.
- sed -i -e "/set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX /s:\${CLANG_DIR}:${EPREFIX}/usr:" CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- configuration() {
- local mycmakeargs=(
- -DBUILD_TESTS=$(usex test)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
- )
- # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
- LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake-utils_src_configure
- }
- python_foreach_impl configuration
-}
-
-src_compile() {
- python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
- python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
- installation() {
- cmake-utils_src_install
- mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}2{,-${EPYTHON}}.pc || die
- }
- python_foreach_impl installation
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-13 17:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-13 17:18 [gentoo-commits] proj/qt:master commit in: dev-python/shiboken/files/, dev-python/shiboken/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2012-06-03 16:33 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox