qt: revert classes and applications back to explicit DEPENDS to prevent circular...

diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass
index 1023a1f..09b9cba 100644 (file)
--- a/classes/qt3x11.bbclass
+++ b/classes/qt3x11.bbclass
@@ -1,4 +1,3 @@
-DEPENDS += "qt3-x11"
 #
 # override variables set by qmake-base to compile Qt/X11 apps
 #

diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 92885aa..d4ca007 100644 (file)
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,4 +1,3 @@
-DEPENDS += "qt4-x11"
 #
 # override variables set by qmake-base to compile Qt/X11 apps
 #

diff --git a/packages/libqanava/libqanava_0.0.3.bb b/packages/libqanava/libqanava_0.0.3.bb
index 968c887..85be955 100644 (file)
--- a/packages/libqanava/libqanava_0.0.3.bb
+++ b/packages/libqanava/libqanava_0.0.3.bb
@@ -3,6 +3,7 @@ to enable graphical display of graphs and other relational structures."
 SECTION = "x11/libs"
 HOMEPAGE = "http://www.libqanava.org/"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "qt3x11"
 LICENSE = "GPL"
 PR = "r1"
 

diff --git a/packages/lyx/lyx_1.3.6.bb b/packages/lyx/lyx_1.3.6.bb
index 4c9576f..de58313 100644 (file)
--- a/packages/lyx/lyx_1.3.6.bb
+++ b/packages/lyx/lyx_1.3.6.bb
@@ -3,7 +3,7 @@ SECTION = "x11/office"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.lyx.org"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "boost"
+DEPENDS = "boost qt3x11"
 RRECOMMENDS = "tetex"
 PR = "r1"
 

diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.5.bb
index 1ce8234..2bb9453 100644 (file)
--- a/packages/qt/qt-x11-free_3.3.5.bb
+++ b/packages/qt/qt-x11-free_3.3.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL QPL"
 HOMEPAGE = "http://www.trolltech.com"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql"
-PROVIDES = "qt3-x11"
+PROVIDES = "qt3x11"
 PR = "r10"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \

diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb
index 49c7506..f3b4dd3 100644 (file)
--- a/packages/qt/qt-x11-free_4.0.1.bb
+++ b/packages/qt/qt-x11-free_4.0.1.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "uicmoc4-native freetype jpeg x11 xft xext libxrender libxrandr libxcursor mysql"
-PROVIDES = "qt4-x11"
+PROVIDES = "qt4x11"
 # FIXME: Make it use 'our' qmake
 # DEPENDS += "qmake-native-2.00a"
 PR = "r1"