[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside-tools/files/, profiles/, dev-python/pyside-tools/

2018-06-08 Thread Andreas Sturmlechner
commit: 87d93170e0443735f39e964a3ce8748fbb3c9603
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun  2 11:43:30 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jun  8 20:55:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d93170

dev-python/pyside-tools: Remove last-rited package

 dev-python/pyside-tools/Manifest   |  1 -
 .../0.2.13-fix-pysideuic-test-and-install.patch| 27 --
 dev-python/pyside-tools/metadata.xml   | 11 ---
 .../pyside-tools/pyside-tools-0.2.15-r1.ebuild | 96 --
 profiles/package.mask  |  4 -
 5 files changed, 139 deletions(-)

diff --git a/dev-python/pyside-tools/Manifest b/dev-python/pyside-tools/Manifest
deleted file mode 100644
index 27c1145c165..000
--- a/dev-python/pyside-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyside-tools-0.2.15.tar.gz 78989 BLAKE2B 
4cb4e47b5b274d1d2b812ca6f5404a61682776f1f45930063e8c66113e30d1333b8e165918b1573011335852ea484a171d6a087d1e1a31dff1a0a0db05cfaaf9
 SHA512 
7cee288b733e5f83a01683d7fc8f1017c044e46dbb02489c5e763e37db4e24f319ffd593e001ee6ca5a21a34cf1a6009ab1d4c9e4102c60693992b6f2f7c8991

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
deleted file mode 100644
index 768ae22a8bc..000
--- a/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur pyside-tools-0.2.13.orig/CMakeLists.txt 
pyside-tools-0.2.13/CMakeLists.txt
 pyside-tools-0.2.13.orig/CMakeLists.txt2012-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
deleted file mode 100644
index 521a755bf02..000
--- a/dev-python/pyside-tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-  
-q...@gentoo.org
-Gentoo Qt Project
-  
-  
-PySide/Tools
-  
-

diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild 
b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
deleted file mode 100644
index a69420d6ebf..000
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD="1"
-CMAKE_MAKEFILE_GENERATOR="emake" # bug 558248
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit cmake-utils python-r1 vcs-snapshot virtualx
-
-DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
-HOMEPAGE="http://wiki.qt.io/PySide;
-SRC_URI="https://github.com/PySide/Tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-python/pyside-1.2.0:${SLOT}[X,${PYTHON_USEDEP}]
-   >=dev-python/shiboken-1.2.0:${SLOT}[${PYTHON_USEDEP}]
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}
-   test? ( virtual/pkgconfig )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-   "${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   python_copy_sources
-
-   preparation() {
-   pushd "${BUILD_DIR}" >/dev/null || die
-
-   if python_is_python3; then
-   rm -fr pysideuic/port_v2 || die
-
-   # need to run with -py3 to generate proper python 3 
interfaces
-   sed -i -e 
's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \
-   tests/rcc/CMakeLists.txt || die
-   else
-   rm -fr pysideuic/port_v3 || die
-   fi
-
-   sed -i -e "/pkg-config/ s:shiboken:&-${EPYTHON}:" \
-   tests/rcc/run_test.sh 

[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside-tools/

2017-08-17 Thread Michael Palimaka
commit: 62f11cc728b10b1b3f3e5872eedbc1527068e4ba
Author: Francesco Riosa  gmail  com>
AuthorDate: Wed Aug 16 21:26:09 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug 17 11:50:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f11cc7

dev-python/pyside-tools: enable python-3.6

 dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild 
b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
index 3cfe6a5212e..a69420d6ebf 100644
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 CMAKE_IN_SOURCE_BUILD="1"
 CMAKE_MAKEFILE_GENERATOR="emake" # bug 558248
 
-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 vcs-snapshot virtualx
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside-tools/

2017-04-30 Thread Davide Pesavento
commit: 6ef356868735403eac615511fe4d435178717587
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Apr 30 19:38:26 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Apr 30 19:46:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef35686

dev-python/pyside-tools: restrict shiboken and pyside deps to same SLOT

For future compatibility with shiboken:2 and pyside:2

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild 
b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
index f36869230a9..3cfe6a5212e 100644
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit cmake-utils python-r1 vcs-snapshot virtualx
 
 DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
-HOMEPAGE="https://wiki.qt.io/Pyside;
+HOMEPAGE="http://wiki.qt.io/PySide;
 SRC_URI="https://github.com/PySide/Tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
@@ -21,8 +21,8 @@ IUSE="test"
 
 RDEPEND="
${PYTHON_DEPS}
-   >=dev-python/pyside-1.2.0[X,${PYTHON_USEDEP}]
-   >=dev-python/shiboken-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/pyside-1.2.0:${SLOT}[X,${PYTHON_USEDEP}]
+   >=dev-python/shiboken-1.2.0:${SLOT}[${PYTHON_USEDEP}]
dev-qt/qtcore:4
dev-qt/qtgui:4
 "
@@ -43,11 +43,11 @@ src_prepare() {
 
preparation() {
pushd "${BUILD_DIR}" >/dev/null || die
+
if python_is_python3; then
rm -fr pysideuic/port_v2 || die
 
-   # need to run with -py3 to generate
-   # proper python 3 interfaces
+   # need to run with -py3 to generate proper python 3 
interfaces
sed -i -e 
's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \
tests/rcc/CMakeLists.txt || die
else
@@ -56,6 +56,7 @@ src_prepare() {
 
sed -i -e "/pkg-config/ s:shiboken:&-${EPYTHON}:" \
tests/rcc/run_test.sh || die
+
popd >/dev/null || die
}
python_foreach_impl preparation



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside-tools/

2017-01-08 Thread David Seifert
commit: f025490595a82c4e7bc929b73b7bb0ca2fbb5d50
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan  8 20:49:14 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan  8 20:49:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0254905

dev-python/pyside-tools: Add py3.5 support

* EAPI=6
* Add missing ${PYTHON_REQUIRED_USE}
* Fix src_test when run with py3 impls

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../pyside-tools/pyside-tools-0.2.15-r1.ebuild | 34 ++
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild 
b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
index 6de7621..00d3c62 100644
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
+
 CMAKE_IN_SOURCE_BUILD="1"
 CMAKE_MAKEFILE_GENERATOR="emake" # bug 558248
-PYTHON_COMPAT=( python{2_7,3_4} )
-VIRTUALX_COMMAND="cmake-utils_src_test"
 
-inherit eutils cmake-utils python-r1 vcs-snapshot virtualx
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit cmake-utils python-r1 vcs-snapshot virtualx
 
 DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
 HOMEPAGE="https://wiki.qt.io/Pyside;
@@ -30,17 +31,28 @@ DEPEND="${RDEPEND}
test? ( virtual/pkgconfig )
 "
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+   "${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch
+   cmake-utils_src_prepare
 
python_copy_sources
 
preparation() {
pushd "${BUILD_DIR}" >/dev/null || die
if python_is_python3; then
-   rm -fr pysideuic/port_v2
+   rm -fr pysideuic/port_v2 || die
+
+   # need to run with -py3 to generate
+   # proper python 3 interfaces
+   sed -i -e 
's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \
+   tests/rcc/CMakeLists.txt || die
else
-   rm -fr pysideuic/port_v3
+   rm -fr pysideuic/port_v3 || die
fi
 
sed -i -e "/pkg-config/ s:shiboken:&-${EPYTHON}:" \
@@ -55,7 +67,7 @@ src_configure() {
local mycmakeargs=(
-DPYTHON_BASENAME="-${EPYTHON}"
-DPYTHON_SUFFIX="-${EPYTHON}"
-   $(cmake-utils_use_build test TESTS)
+   -DBUILD_TESTS=$(usex test)
)
CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_configure
}
@@ -71,7 +83,7 @@ src_compile() {
 
 src_test() {
testing() {
-   CMAKE_USE_DIR="${BUILD_DIR}" virtualmake
+   CMAKE_USE_DIR="${BUILD_DIR}" virtx cmake-utils_src_test
}
python_foreach_impl testing
 }
@@ -81,6 +93,4 @@ src_install() {
CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_install 
DESTDIR="${D}"
}
python_foreach_impl installation
-
-   dodoc AUTHORS
 }



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside-tools/

2015-12-19 Thread Davide Pesavento
commit: b2b87d777048f495c5e72fec1f22b1389d6b2d82
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Dec 20 01:15:43 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Dec 20 01:15:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b87d77

dev-python/pyside-tools: update HOMEPAGE, simplify deps

Package-Manager: portage-2.2.26

 dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild 
b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
index 6345508..5fbfe4b 100644
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_COMMAND="cmake-utils_src_test"
 inherit eutils cmake-utils python-r1 vcs-snapshot virtualx
 
 DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
-HOMEPAGE="http://qt-project.org/wiki/PySide;
+HOMEPAGE="https://wiki.qt.io/Pyside;
 SRC_URI="https://github.com/PySide/Tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
@@ -20,13 +20,15 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
+   ${PYTHON_DEPS}
>=dev-python/pyside-1.2.0[X,${PYTHON_USEDEP}]
>=dev-python/shiboken-1.2.0[${PYTHON_USEDEP}]
-   >=dev-qt/qtcore-4.7.0:4
-   >=dev-qt/qtgui-4.7.0:4
-   ${PYTHON_DEPS}"
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+"
 DEPEND="${RDEPEND}
-   test? ( virtual/pkgconfig )"
+   test? ( virtual/pkgconfig )
+"
 
 src_prepare() {
epatch "${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside-tools/

2015-08-20 Thread Davide Pesavento
commit: 4fdee71743e153e269c72f76564899129e00388c
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Fri Aug 21 03:08:52 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Fri Aug 21 03:08:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdee717

dev-python/pyside-tools: force CMAKE_MAKEFILE_GENERATOR=emake

Gentoo-Bug: 558248

Package-Manager: portage-2.2.20.1

 dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild 
b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
index 64c5ceb..6345508 100644
--- a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 CMAKE_IN_SOURCE_BUILD=1
+CMAKE_MAKEFILE_GENERATOR=emake # bug 558248
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 VIRTUALX_COMMAND=cmake-utils_src_test