From b72b72288be8e7b84003ead9a28d2673aa98ae9d Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Fri, 9 Mar 2012 00:13:24 +0000 Subject: Revbump: ebuild rewritten to support multiple python ABIs (bug #401549). (Portage version: 2.2.0_alpha90/cvs/Linux x86_64) --- dev-python/pyside-tools/ChangeLog | 11 ++- .../0.2.13-fix-pysideuic-test-and-install.patch | 27 +++++++ dev-python/pyside-tools/metadata.xml | 5 +- .../pyside-tools/pyside-tools-0.2.13-r1.ebuild | 90 ++++++++++++++++++++++ dev-python/pyside-tools/pyside-tools-0.2.13.ebuild | 4 +- 5 files changed, 129 insertions(+), 8 deletions(-) create mode 100644 dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch create mode 100644 dev-python/pyside-tools/pyside-tools-0.2.13-r1.ebuild (limited to 'dev-python/pyside-tools') diff --git a/dev-python/pyside-tools/ChangeLog b/dev-python/pyside-tools/ChangeLog index d4335a92a9f8..fa31437098d3 100644 --- a/dev-python/pyside-tools/ChangeLog +++ b/dev-python/pyside-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pyside-tools -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/ChangeLog,v 1.13 2011/12/21 17:59:43 floppym Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/ChangeLog,v 1.14 2012/03/09 00:13:23 pesa Exp $ + +*pyside-tools-0.2.13-r1 (09 Mar 2012) + + 09 Mar 2012; Davide Pesavento + +files/0.2.13-fix-pysideuic-test-and-install.patch, + +pyside-tools-0.2.13-r1.ebuild, metadata.xml, pyside-tools-0.2.13.ebuild: + Revbump: ebuild rewritten to support multiple python ABIs (bug #401549). 21 Dec 2011; Mike Gilbert pyside-tools-0.2.13.ebuild: Call python_mod_optimize to byte-compile python modules. Patch by Chris Mayo diff --git a/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch b/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch new file mode 100644 index 000000000000..768ae22a8bc2 --- /dev/null +++ b/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch @@ -0,0 +1,27 @@ +diff -Naur pyside-tools-0.2.13.orig/CMakeLists.txt pyside-tools-0.2.13/CMakeLists.txt +--- pyside-tools-0.2.13.orig/CMakeLists.txt 2012-03-09 00:46:56.377462594 +0100 ++++ pyside-tools-0.2.13/CMakeLists.txt 2012-03-09 00:48:08.888556082 +0100 +@@ -11,7 +11,7 @@ + set(pyside_tools_MICRO_VERSION "13") + set(pyside_tools_VERSION "${pyside_tools_MAJOR_VERSION}.${pyside_tools_MINOR_VERSION}.${pyside_tools_MICRO_VERSION}") + +-configure_file("pysideuic/__init__.py.in" "__init__.py" @ONLY) ++configure_file("pysideuic/__init__.py.in" "pysideuic/__init__.py" @ONLY) + + option(BUILD_TESTS "Build tests." TRUE) + +@@ -34,13 +34,10 @@ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" +- DESTINATION "${SITE_PACKAGE}/pysideuic") + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pysideuic + DESTINATION ${SITE_PACKAGE} + PATTERN "*.in" EXCLUDE +- PATTERN "*pysideuic/__init__.py" EXCLUDE +- PATTERN "*pysideuic\\__init__.py" EXCLUDE) ++ PATTERN "*/pysideuic/*.1" EXCLUDE) + + # Man pages for pyside-uic + if (NOT win32) diff --git a/dev-python/pyside-tools/metadata.xml b/dev-python/pyside-tools/metadata.xml index 37b9640e6ce9..dc439f7e84f5 100644 --- a/dev-python/pyside-tools/metadata.xml +++ b/dev-python/pyside-tools/metadata.xml @@ -1,8 +1,5 @@ - qt - - +qt - diff --git a/dev-python/pyside-tools/pyside-tools-0.2.13-r1.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.13-r1.ebuild new file mode 100644 index 000000000000..48190736b7e5 --- /dev/null +++ b/dev-python/pyside-tools/pyside-tools-0.2.13-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.2.13-r1.ebuild,v 1.1 2012/03/09 00:13:23 pesa Exp $ + +EAPI=4 + +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-*" +PYTHON_TESTS_RESTRICTED_ABIS="3.*" + +inherit eutils cmake-utils python + +DESCRIPTION="PySide development tools" +HOMEPAGE="http://www.pyside.org/" +SRC_URI="http://www.pyside.org/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + >=dev-python/pyside-1.1.0-r1[X] + >=dev-python/shiboken-1.1.0-r1 + >=x11-libs/qt-core-4.7.0:4 + >=x11-libs/qt-gui-4.7.0:4 +" +DEPEND="${RDEPEND} + test? ( dev-util/pkgconfig ) +" + +DOCS=( AUTHORS ChangeLog ) + +src_prepare() { + epatch "${FILESDIR}"/${PV}-fix-pysideuic-test-and-install.patch + + python_copy_sources + + preparation() { + sed -i -e "/pkg-config/ s:shiboken:&-python${PYTHON_ABI}:" \ + tests/rcc/run_test.sh || die + } + python_execute_function -s preparation +} + +src_configure() { + configuration() { + local mycmakeargs=( + -DPYTHON_BASENAME="-python${PYTHON_ABI}" + -DPYTHON_SUFFIX="-python${PYTHON_ABI}" + -DSITE_PACKAGE="$(python_get_sitedir)" + $(cmake-utils_use_build test TESTS) + ) + 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 +} + +src_install() { + installation() { + CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install DESTDIR="${T}/images/${PYTHON_ABI}" + } + python_execute_function -s installation + python_merge_intermediate_installation_images "${T}/images" +} + +pkg_postinst() { + python_mod_optimize pysideuic +} + +pkg_postrm() { + python_mod_cleanup pysideuic +} diff --git a/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild index 42e0493dfbc0..3c69b34e40fd 100644 --- a/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild +++ b/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild,v 1.2 2011/12/21 17:59:43 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild,v 1.3 2012/03/09 00:13:23 pesa Exp $ EAPI=3 -- cgit v1.2.3-65-gdbad