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)

5 files changed, 38 insertions, 139 deletions

diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog
index 767253be8997..459979eb812e 100644
--- a/dev-python/pyside/ChangeLog
+++ b/dev-python/pyside/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyside
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.19 2011/05/27 18:25:22 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.20 2011/09/06 12:42:17 scarabeus Exp $
+
+*pyside-1.0.6 (06 Sep 2011)
+
+  06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -pyside-0.4.2.ebuild,
+  -pyside-1.0.0.ebuild, -pyside-1.0.3.ebuild, +pyside-1.0.6.ebuild,
+  -files/pyside-cmake-namespace.patch:
+  Version bump to latest release. Cleanup ebuild. Remove older.
 
 *pyside-1.0.3 (27 May 2011)
 
diff --git a/dev-python/pyside/files/pyside-cmake-namespace.patch b/dev-python/pyside/files/pyside-cmake-namespace.patch
deleted file mode 100644
index 92f6de0a43a8..000000000000
--- a/dev-python/pyside/files/pyside-cmake-namespace.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake
-index 639a0ab..1686df8 100644
---- a/cmake/Macros/PySideModules.cmake
-+++ b/cmake/Macros/PySideModules.cmake
-@@ -58,7 +58,7 @@ macro(check_qt_class module class global_sources)
-     endif ()
-     string(TOLOWER ${class} _class)
-     string(TOUPPER ${module} _module)
--    if (${namespace})
-+    if (_namespace)
-         set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_namespace}_${_class}_wrapper.cpp)
-     else ()
-         set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_class}_wrapper.cpp)
diff --git a/dev-python/pyside/pyside-0.4.2.ebuild b/dev-python/pyside/pyside-0.4.2.ebuild
deleted file mode 100644
index b33702893948..000000000000
--- a/dev-python/pyside/pyside-0.4.2.ebuild
+++ /dev/null
@@ -1,55 +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/pyside-0.4.2.ebuild,v 1.6 2011/04/07 18:15:51 ayoy Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit cmake-utils python
-
-MY_P="${PN}-qt4.7+${PV}"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
-RESTRICT="test"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kde"
-
-QT_PV="4.6.0"
-
-DEPEND=">=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-multimedia-${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}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-find-kde-phonon.patch"
-	epatch "${FILESDIR}/${PN}-cmake-namespace.patch"
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/pyside/pyside-1.0.3.ebuild b/dev-python/pyside/pyside-1.0.3.ebuild
deleted file mode 100644
index da361d4b9e17..000000000000
--- a/dev-python/pyside/pyside-1.0.3.ebuild
+++ /dev/null
@@ -1,54 +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/pyside-1.0.3.ebuild,v 1.1 2011/05/27 18:25:22 chiiph Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit cmake-utils python
-
-MY_P="${PN}-qt4.7+${PV}"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
-RESTRICT="test"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kde"
-
-QT_PV="4.6.0"
-
-DEPEND=">=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-multimedia-${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}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-find-kde-phonon.patch"
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/pyside/pyside-1.0.0.ebuild b/dev-python/pyside/pyside-1.0.6.ebuild
index ea3972df353c..0b297f7b4ae2 100644
--- a/dev-python/pyside/pyside-1.0.0.ebuild
+++ b/dev-python/pyside/pyside-1.0.6.ebuild
@@ -1,54 +1,68 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.0.0.ebuild,v 1.3 2011/04/07 18:15:51 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.0.6.ebuild,v 1.1 2011/09/06 12:42:17 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 PYTHON_DEPEND="2:2.5"
 
-inherit cmake-utils python
+inherit base python cmake-utils virtualx
 
 MY_P="${PN}-qt4.7+${PV}"
 
 DESCRIPTION="Python bindings for the Qt framework"
 HOMEPAGE="http://www.pyside.org/"
 SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
-RESTRICT="test"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug kde"
+IUSE="debug kde test"
 
-QT_PV="4.6.0"
+QT_PV="4.7.0"
 
-DEPEND=">=dev-python/shiboken-${PV}
+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-multimedia-${QT_PV}
 	>=x11-libs/qt-opengl-${QT_PV}
 	kde? ( media-libs/phonon )
-	!kde? (	|| ( >=x11-libs/qt-phonon-${QT_PV}
-		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-test-${QT_PV}
 	>=x11-libs/qt-webkit-${QT_PV}
 	>=x11-libs/qt-xmlpatterns-${QT_PV}"
-RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? ( >=x11-libs/qt-test-${QT_PV} )"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_P}.1"
+
+DOCS=( "ChangeLog" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-find-kde-phonon.patch"
+)
 
 pkg_setup() {
 	python_set_active_version 2
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-find-kde-phonon.patch"
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build test TESTS)
+	)
+	cmake-utils_src_configure
 }
 
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog || die "dodoc failed"
+src_test() {
+	VIRTUALX_COMMAND="cmake-utils_src_test"
+	virtualmake
 }