Removed alternative dependency on Qt metapackage, moved to EAPI=2, removed QT4_BUILD_WITH_USE_CHECK and dependency upon cmake (pulled in automatically by cmake-utils eclass)

(Portage version: 2.2_rc44/cvs/Linux x86_64)

4 files changed, 20 insertions, 23 deletions

diff --git a/net-misc/vidalia/ChangeLog b/net-misc/vidalia/ChangeLog
index 35ae2d3a6f33..a7d0634fa224 100644
--- a/net-misc/vidalia/ChangeLog
+++ b/net-misc/vidalia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vidalia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/ChangeLog,v 1.11 2009/10/06 10:21:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/ChangeLog,v 1.12 2009/10/06 19:06:15 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> vidalia-0.1.7.ebuild,
+  vidalia-0.1.12.ebuild, vidalia-0.1.15.ebuild:
+  Removed alternative dependency on Qt metapackage, moved to EAPI=2, removed
+  QT4_BUILD_WITH_USE_CHECK and dependency upon cmake (pulled in
+  automatically by cmake-utils eclass)
 
 *vidalia-0.1.15 (06 Oct 2009)
 
diff --git a/net-misc/vidalia/vidalia-0.1.12.ebuild b/net-misc/vidalia/vidalia-0.1.12.ebuild
index 45444c644242..be3d793ea58d 100644
--- a/net-misc/vidalia/vidalia-0.1.12.ebuild
+++ b/net-misc/vidalia/vidalia-0.1.12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.1.12.ebuild,v 1.1 2009/04/25 23:51:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.1.12.ebuild,v 1.2 2009/10/06 19:06:15 ayoy Exp $
 
-EAPI="1"
+EAPI="2"
 inherit eutils qt4 cmake-utils
 # cmake-utils needs to be last, so we get its src_compile()
 
@@ -15,13 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="debug"
 
-DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
-	dev-util/cmake"
-RDEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
+DEPEND="x11-libs/qt-gui:4[debug?]"
+RDEPEND="${DEPEND}
 	net-misc/tor"
 
-use debug && QT4_BUILT_WITH_USE_CHECK="debug"
-
 DOCS="CHANGELOG CREDITS README"
 
 pkg_postinst() {
diff --git a/net-misc/vidalia/vidalia-0.1.15.ebuild b/net-misc/vidalia/vidalia-0.1.15.ebuild
index c7d9104ef2ff..209b5ad8d9e5 100644
--- a/net-misc/vidalia/vidalia-0.1.15.ebuild
+++ b/net-misc/vidalia/vidalia-0.1.15.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.1.15.ebuild,v 1.1 2009/10/06 10:21:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.1.15.ebuild,v 1.2 2009/10/06 19:06:15 ayoy Exp $
 
-EAPI="1"
+EAPI="2"
 inherit eutils qt4 cmake-utils
 # cmake-utils needs to be last, so we get its src_compile()
 
@@ -15,13 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="debug"
 
-DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
-	dev-util/cmake"
-RDEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
+DEPEND="x11-libs/qt-gui:4[debug?]"
+RDEPEND="${DEPEND}
 	net-misc/tor"
 
-use debug && QT4_BUILT_WITH_USE_CHECK="debug"
-
 DOCS="CHANGELOG CREDITS README"
 
 pkg_postinst() {
diff --git a/net-misc/vidalia/vidalia-0.1.7.ebuild b/net-misc/vidalia/vidalia-0.1.7.ebuild
index 6936d78c69a5..f66d7840612d 100644
--- a/net-misc/vidalia/vidalia-0.1.7.ebuild
+++ b/net-misc/vidalia/vidalia-0.1.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.1.7.ebuild,v 1.1 2008/08/11 23:11:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.1.7.ebuild,v 1.2 2009/10/06 19:06:15 ayoy Exp $
 
-EAPI="1"
+EAPI="2"
 inherit eutils qt4 cmake-utils
 # cmake-utils needs to be last, so we get its src_compile()
 
@@ -15,13 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="debug"
 
-DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
-	dev-util/cmake"
-RDEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
+DEPEND="x11-libs/qt-gui:4[debug?]"
+RDEPEND="${DEPEND}
 	net-misc/tor"
 
-use debug && QT4_BUILT_WITH_USE_CHECK="debug"
-
 DOCS="CHANGELOG CREDITS README"
 
 pkg_postinst() {