Version bump, remove old and restrict tests wrt bug 338485

(Portage version: 2.2_rc90/cvs/Linux i686)

3 files changed, 11 insertions, 48 deletions

diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog
index cb9a12b20e95..9c4846d42092 100644
--- a/dev-python/pyside/ChangeLog
+++ b/dev-python/pyside/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyside
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.11 2010/08/25 17:19:42 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.12 2010/11/25 01:20:31 chiiph Exp $
+
+*pyside-0.4.2 (25 Nov 2010)
+
+  25 Nov 2010; Tomas Touceda <chiiph@gentoo.org> -pyside-0.3.2.ebuild,
+  -pyside-0.4.0-r1.ebuild, +pyside-0.4.2.ebuild:
+  Version bump, remove old and restrict tests wrt bug 338485
 
 *pyside-0.4.0-r1 (25 Aug 2010)
 
diff --git a/dev-python/pyside/pyside-0.3.2.ebuild b/dev-python/pyside/pyside-0.3.2.ebuild
deleted file mode 100644
index 0981edd203ba..000000000000
--- a/dev-python/pyside/pyside-0.3.2.ebuild
+++ /dev/null
@@ -1,44 +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/pyside-0.3.2.ebuild,v 1.2 2010/06/23 11:49:54 hwoarang Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-MY_P="${PN}-qt4.6+${PV}"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kde"
-
-QT_PV="4.6.0"
-
-DEPEND=">=dev-libs/boost-1.41.0[python]
-	~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-sound/phonon )
-	!kde? (	|| ( >=x11-libs/qt-phonon-${QT_PV}
-		media-sound/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}"
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/pyside/pyside-0.4.0-r1.ebuild b/dev-python/pyside/pyside-0.4.2.ebuild
index e21ad40f620a..ee62564eda7e 100644
--- a/dev-python/pyside/pyside-0.4.0-r1.ebuild
+++ b/dev-python/pyside/pyside-0.4.2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.4.0-r1.ebuild,v 1.1 2010/08/25 17:19:42 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.4.2.ebuild,v 1.1 2010/11/25 01:20:31 chiiph Exp $
 
 EAPI="2"
 
 inherit cmake-utils
 
-MY_P="${PN}-qt4.6+${PV}"
+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"
@@ -20,7 +21,7 @@ IUSE="debug kde"
 QT_PV="4.6.0"
 
 DEPEND=">=dev-libs/boost-1.41.0[python]
-	~dev-python/shiboken-${PV}
+	>=dev-python/shiboken-${PV}
 	>=x11-libs/qt-core-${QT_PV}
 	>=x11-libs/qt-assistant-${QT_PV}
 	>=x11-libs/qt-gui-${QT_PV}