Bump pyside to latest release. Punt older that i didn't manage to make behave.

(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)

4 files changed, 27 insertions, 96 deletions

diff --git a/dev-python/pyside-tools/ChangeLog b/dev-python/pyside-tools/ChangeLog
index a4a3a3ffdfa7..b2aaa29433cc 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.10 2011/05/27 18:29:12 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/ChangeLog,v 1.11 2011/09/06 12:42:16 scarabeus Exp $
+
+*pyside-tools-0.2.13 (06 Sep 2011)
+
+  06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -pyside-tools-0.2.2-r1.ebuild, -pyside-tools-0.2.7.ebuild,
+  -pyside-tools-0.2.9.ebuild, +pyside-tools-0.2.13.ebuild:
+  Version bump to latest release. Cleanup ebuild. Remove older.
 
 *pyside-tools-0.2.9 (27 May 2011)
 
diff --git a/dev-python/pyside-tools/pyside-tools-0.2.7.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild
index da254ba605ca..6f69556fc278 100644
--- a/dev-python/pyside-tools/pyside-tools-0.2.7.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 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.7.ebuild,v 1.1 2011/03/20 20:09:52 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild,v 1.1 2011/09/06 12:42:16 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 PYTHON_DEPEND="2:2.5"
 
-inherit cmake-utils python
+inherit python cmake-utils virtualx
 
 DESCRIPTION="PySide development tools"
 HOMEPAGE="http://www.pyside.org/"
@@ -17,12 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug test"
 
-DEPEND=">=dev-python/pyside-0.4.0
-	>=x11-libs/qt-core-4.6.0
-	>=x11-libs/qt-gui-4.6.0"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-python/pyside-1.0.6
+	>=x11-libs/qt-core-4.7.0
+	>=x11-libs/qt-gui-4.7.0"
+DEPEND="${DEPEND}
+	test? ( >=x11-libs/qt-test-4.7.0 )"
 
-TEST_VERBOSE=1
+DOCS=( AUTHORS ChangeLog )
 
 pkg_setup() {
 	python_set_active_version 2
@@ -36,7 +37,14 @@ src_prepare() {
 	python_convert_shebangs -r 2 pyside-uic
 }
 
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog || die "dodoc failed"
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build test TESTS)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake-utils_src_test"
+	virtualmake
 }
diff --git a/dev-python/pyside-tools/pyside-tools-0.2.2-r1.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.2-r1.ebuild
deleted file mode 100644
index 0e197117f962..000000000000
--- a/dev-python/pyside-tools/pyside-tools-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 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.2-r1.ebuild,v 1.1 2010/12/29 10:43:54 ayoy Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit 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="debug test"
-
-DEPEND=">=dev-python/pyside-0.4.0
-	>=x11-libs/qt-core-4.6.0
-	>=x11-libs/qt-gui-4.6.0"
-RDEPEND="${DEPEND}"
-
-TEST_VERBOSE=1
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -e 's#pyside-rcc4#PATH=$PATH:${WORKDIR}/${P}_build/pyrcc pyside-rcc#' \
-		-i tests/rcc/run_test.sh \
-		|| die "sed failed"
-
-	python_convert_shebangs -r 2 pyside-uic.in
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/pyside-tools/pyside-tools-0.2.9.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.9.ebuild
deleted file mode 100644
index 51870a76b9a2..000000000000
--- a/dev-python/pyside-tools/pyside-tools-0.2.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 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.9.ebuild,v 1.1 2011/05/27 18:29:12 chiiph Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit 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="debug test"
-
-DEPEND=">=dev-python/pyside-0.4.0
-	>=x11-libs/qt-core-4.6.0
-	>=x11-libs/qt-gui-4.6.0"
-RDEPEND="${DEPEND}"
-
-TEST_VERBOSE=1
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -e 's#pyside-rcc4#PATH=$PATH:${WORKDIR}/${P}_build/pyrcc pyside-rcc#' \
-		-i tests/rcc/run_test.sh \
-		|| die "sed failed"
-
-	python_convert_shebangs -r 2 pyside-uic
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog || die "dodoc failed"
-}