Bump to beta2. Remove beta1. Apply stricter dependencies to 2.* ebuilds

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 31 insertions, 24 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 58feadbd5769..149a288392a6 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.60 2010/11/08 12:16:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.61 2010/11/10 15:28:58 hwoarang Exp $
+
+*qt-creator-2.1.0_beta2 (10 Nov 2010)
+
+  10 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
+  qt-creator-2.0.1.ebuild, -qt-creator-2.1.0_beta1.ebuild,
+  +qt-creator-2.1.0_beta2.ebuild:
+  Bump to beta2. Remove beta1. Apply stricter dependencies to 2.* ebuilds
 
 *qt-creator-2.1.0_beta1 (08 Nov 2010)
 
diff --git a/dev-util/qt-creator/qt-creator-2.0.1.ebuild b/dev-util/qt-creator/qt-creator-2.0.1.ebuild
index 32c267b482bc..6592c9cde1f5 100644
--- a/dev-util/qt-creator/qt-creator-2.0.1.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.0.1.ebuild,v 1.3 2010/11/01 14:01:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.0.1.ebuild,v 1.4 2010/11/10 15:28:58 hwoarang Exp $
 
 EAPI="2"
 LANGS="de es fr it ja pl ru sl"
@@ -20,27 +20,27 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
 	kde mercurial perforce +qml qtscript rss subversion"
 
-QTVER="4.7.0_beta1:4"
-DEPEND=">x11-libs/qt-assistant-${QTVER}[doc?]"
+QTVER="4.7.0:4"
+DEPEND="~x11-libs/qt-assistant-${QTVER}[doc?]"
 RDEPEND="${DEPEND}
-	>x11-libs/qt-sql-${QTVER}
-	>x11-libs/qt-svg-${QTVER}
-	>x11-libs/qt-test-${QTVER}
-	>x11-libs/qt-webkit-${QTVER}
-	!kde? ( || ( >x11-libs/qt-phonon-${QTVER} media-sound/phonon ) )
+	~x11-libs/qt-sql-${QTVER}
+	~x11-libs/qt-svg-${QTVER}
+	~x11-libs/qt-test-${QTVER}
+	~x11-libs/qt-webkit-${QTVER}
+	!kde? ( || ( ~x11-libs/qt-phonon-${QTVER} media-sound/phonon ) )
 	kde? ( media-sound/phonon )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	sys-devel/gdb
-	examples? ( >=x11-libs/qt-demo-${QTVER} )
+	examples? ( ~x11-libs/qt-demo-${QTVER} )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
-	!qml? ( >=x11-libs/qt-gui-${QTVER}[qt3support] )
+	!qml? ( ~x11-libs/qt-gui-${QTVER}[qt3support] )
 	qml? (
-		>=x11-libs/qt-declarative-${QTVER}[private-headers]
-		>=x11-libs/qt-core-${QTVER}[private-headers]
-		>=x11-libs/qt-gui-${QTVER}[qt3support,private-headers]
-		>=x11-libs/qt-script-${QTVER}[private-headers]
+		~x11-libs/qt-declarative-${QTVER}[private-headers]
+		~x11-libs/qt-core-${QTVER}[private-headers]
+		~x11-libs/qt-gui-${QTVER}[qt3support,private-headers]
+		~x11-libs/qt-script-${QTVER}[private-headers]
 	)
 	qtscript? ( >x11-libs/qt-script-${QTVER} )
 	subversion? ( dev-vcs/subversion )"
diff --git a/dev-util/qt-creator/qt-creator-2.1.0_beta1.ebuild b/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild
index efe61a54ef48..fe2e3266aa04 100644
--- a/dev-util/qt-creator/qt-creator-2.1.0_beta1.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta1.ebuild,v 1.1 2010/11/08 12:16:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild,v 1.1 2010/11/10 15:28:58 hwoarang Exp $
 
 EAPI="2"
 LANGS="de es fr it ja pl ru sl"
@@ -20,14 +20,14 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
 	kde mercurial perforce +qml qtscript rss subversion"
 
-QTVER="4.7.0_beta1:4"
-DEPEND=">x11-libs/qt-assistant-${QTVER}[doc?]"
+QTVER="4.7.1:4"
+DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]"
 RDEPEND="${DEPEND}
-	>x11-libs/qt-sql-${QTVER}
-	>x11-libs/qt-svg-${QTVER}
-	>x11-libs/qt-test-${QTVER}
-	>x11-libs/qt-webkit-${QTVER}
-	!kde? ( || ( >x11-libs/qt-phonon-${QTVER} media-sound/phonon ) )
+	>=x11-libs/qt-sql-${QTVER}
+	>=x11-libs/qt-svg-${QTVER}
+	>=x11-libs/qt-test-${QTVER}
+	>=x11-libs/qt-webkit-${QTVER}
+	!kde? ( || ( >=x11-libs/qt-phonon-${QTVER} media-sound/phonon ) )
 	kde? ( media-sound/phonon )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 		>=x11-libs/qt-gui-${QTVER}[qt3support,private-headers]
 		>=x11-libs/qt-script-${QTVER}[private-headers]
 	)
-	qtscript? ( >x11-libs/qt-script-${QTVER} )
+	qtscript? ( >=x11-libs/qt-script-${QTVER} )
 	subversion? ( dev-vcs/subversion )"
 
 PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce