diff options
author | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-06-13 23:26:43 +0000 |
---|---|---|
committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-06-13 23:26:43 +0000 |
commit | 4c1c229d12d8021478286af5e521733d30ef67a7 (patch) | |
tree | dbef78b64b24fda3f6ae5c9e8eea8109ceb74118 /x11-libs | |
parent | Patch not used, remove. (diff) | |
download | historical-4c1c229d12d8021478286af5e521733d30ef67a7.tar.gz historical-4c1c229d12d8021478286af5e521733d30ef67a7.tar.bz2 historical-4c1c229d12d8021478286af5e521733d30ef67a7.zip |
Make all split Qt4 ebuilds block the old monolithic ebuild.
Package-Manager: portage-2.1.5.4
Diffstat (limited to 'x11-libs')
26 files changed, 97 insertions, 34 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 0f7b73480d75..60dc9116153f 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-assistant # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.11 2008/06/13 23:00:03 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.12 2008/06/13 23:20:12 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> + qt-assistant-4.4.0-r1.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> -qt-assistant-4.4.0.ebuild: diff --git a/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild index 7fc77a1d43a7..6e4f110a59ae 100644 --- a/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild +++ b/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild,v 1.3 2008/05/30 04:30:57 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.0-r1.ebuild,v 1.4 2008/06/13 23:20:12 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The assistant help module for the Qt toolkit." @@ -13,7 +14,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" DEPEND="~x11-libs/qt-gui-${PV} - ~x11-libs/qt-sql-${PV}" + ~x11-libs/qt-sql-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" # Pixeltool isn't really assistant related, but it relies on diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog index 61974fc2b981..c8d3ec6d1d80 100644 --- a/x11-libs/qt-dbus/ChangeLog +++ b/x11-libs/qt-dbus/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-dbus # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.9 2008/05/27 13:09:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.10 2008/06/13 23:20:45 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-dbus-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 27 May 2008; Raúl Porcel <armin76@gentoo.org> qt-dbus-4.4.0.ebuild: Add ~alpha/~ia64/~sparc wrt #223557 diff --git a/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild b/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild index d6b3a5837c61..309657370c2c 100644 --- a/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild +++ b/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild,v 1.4 2008/05/27 13:09:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0.ebuild,v 1.5 2008/06/13 23:20:45 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The DBus module for the Qt toolkit." @@ -16,7 +17,8 @@ IUSE="" # protocol I don't know if there's value trying to derive it out into a core build # The library itself, however, only depends on core and xml DEPEND="~x11-libs/qt-core-${PV} - >=sys-apps/dbus-1.0.2" + >=sys-apps/dbus-1.0.2 + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES=" diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index 43bcf097be87..7b5ec4e63363 100644 --- a/x11-libs/qt-demo/ChangeLog +++ b/x11-libs/qt-demo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-demo # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.2 2008/05/25 14:56:10 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.3 2008/06/13 23:21:15 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-demo-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 25 May 2008; Markus Rothe <corsair@gentoo.org> qt-demo-4.4.0.ebuild: Added ~ppc/~ppc64 diff --git a/x11-libs/qt-demo/qt-demo-4.4.0.ebuild b/x11-libs/qt-demo/qt-demo-4.4.0.ebuild index 45bcc8100f30..71111599e55d 100644 --- a/x11-libs/qt-demo/qt-demo-4.4.0.ebuild +++ b/x11-libs/qt-demo/qt-demo-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.4.0.ebuild,v 1.2 2008/05/25 14:56:10 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.4.0.ebuild,v 1.3 2008/06/13 23:21:15 ingmar Exp $ EAPI="1" inherit qt4-build @@ -27,6 +27,7 @@ DEPEND=" ~x11-libs/qt-test-${PV}:${SLOT} ~x11-libs/qt-webkit-${PV}:${SLOT} ~x11-libs/qt-xmlpatterns-${PV}:${SLOT} + !<=x11-libs/qt-4.4.0_alpha:${SLOT} " RDEPEND="${DEPEND}" diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index ac760ef23d6d..af703dad65d9 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.9 2008/05/30 03:51:43 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.10 2008/06/13 23:21:49 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-gui-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-gui-4.4.0.ebuild: Marked ~hppa (bug #223557). diff --git a/x11-libs/qt-gui/qt-gui-4.4.0.ebuild b/x11-libs/qt-gui/qt-gui-4.4.0.ebuild index ff3056b455b6..5286ddb75c03 100644 --- a/x11-libs/qt-gui/qt-gui-4.4.0.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0.ebuild,v 1.4 2008/05/30 03:51:43 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0.ebuild,v 1.5 2008/06/13 23:21:49 ingmar Exp $ EAPI="1" inherit eutils qt4-build @@ -16,6 +16,7 @@ IUSE_INPUT_DEVICES="input_devices_wacom" IUSE="+accessibility cups dbus debug glib mng nas nis tiff +qt3support xinerama ${IUSE_INPUT_DEVICES}" RDEPEND=" + !<=x11-libs/qt-4.4.0_alpha:${SLOT} media-libs/fontconfig >=media-libs/freetype-2 media-libs/jpeg diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog index afb7d594af75..adfae99c1380 100644 --- a/x11-libs/qt-opengl/ChangeLog +++ b/x11-libs/qt-opengl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-opengl # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.9 2008/05/30 04:11:29 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.10 2008/06/13 23:22:22 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-opengl-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-opengl-4.4.0.ebuild: Marked ~hppa (bug #223557). diff --git a/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild b/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild index 03811c7c654a..224e759986bb 100644 --- a/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild +++ b/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild,v 1.4 2008/05/30 04:11:29 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0.ebuild,v 1.5 2008/06/13 23:22:22 ingmar Exp $ EAPI="1" inherit qt4-build @@ -14,6 +14,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="+qt3support" DEPEND="~x11-libs/qt-gui-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT} virtual/opengl virtual/glu" RDEPEND="${DEPEND}" diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog index 150024972592..c4c60216a1d1 100644 --- a/x11-libs/qt-phonon/ChangeLog +++ b/x11-libs/qt-phonon/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-phonon # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.8 2008/05/30 04:18:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.9 2008/06/13 23:22:53 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-phonon-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-phonon-4.4.0.ebuild: Marked ~hppa (bug #223557). diff --git a/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild b/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild index 6849a9df092f..a7f80437a182 100644 --- a/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild +++ b/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild,v 1.3 2008/05/30 04:18:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.0.ebuild,v 1.4 2008/06/13 23:22:53 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The Phonon module for the Qt toolkit." @@ -13,6 +14,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="dbus" DEPEND="~x11-libs/qt-gui-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT} media-libs/gstreamer media-libs/gst-plugins-base dbus? ( =x11-libs/qt-dbus-${PV} )" diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog index c9791a520622..b5d34f2fe433 100644 --- a/x11-libs/qt-qt3support/ChangeLog +++ b/x11-libs/qt-qt3support/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-qt3support # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.9 2008/05/30 03:41:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.10 2008/06/13 23:23:25 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> + qt-qt3support-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-qt3support-4.4.0.ebuild: Marked ~hppa (bug #223557). diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.4.0.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.4.0.ebuild index cbe130cb39fe..2be8e4b79cf3 100644 --- a/x11-libs/qt-qt3support/qt-qt3support-4.4.0.ebuild +++ b/x11-libs/qt-qt3support/qt-qt3support-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0.ebuild,v 1.4 2008/05/30 03:41:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0.ebuild,v 1.5 2008/06/13 23:23:25 ingmar Exp $ EAPI="1" inherit qt4-build @@ -14,7 +14,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="+accessibility" DEPEND="~x11-libs/qt-gui-${PV} - ~x11-libs/qt-sql-${PV}" + ~x11-libs/qt-sql-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES=" diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog index 2a503564015c..04c43e8d873c 100644 --- a/x11-libs/qt-script/ChangeLog +++ b/x11-libs/qt-script/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-script # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.9 2008/05/27 13:10:29 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.10 2008/06/13 23:23:58 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-script-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 27 May 2008; Raúl Porcel <armin76@gentoo.org> qt-script-4.4.0.ebuild: Add ~alpha/~ia64/~sparc wrt #223557 diff --git a/x11-libs/qt-script/qt-script-4.4.0.ebuild b/x11-libs/qt-script/qt-script-4.4.0.ebuild index a237070eea90..2e08be137212 100644 --- a/x11-libs/qt-script/qt-script-4.4.0.ebuild +++ b/x11-libs/qt-script/qt-script-4.4.0.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.4.0.ebuild,v 1.4 2008/05/27 13:10:29 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.4.0.ebuild,v 1.5 2008/06/13 23:23:58 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The ECMAScript module for the Qt toolkit" @@ -12,7 +13,8 @@ SLOT="4" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -DEPEND="~x11-libs/qt-core-${PV}" +DEPEND="~x11-libs/qt-core-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES="src/script/" diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog index dbe3fd49d7f4..f73bb6e457a6 100644 --- a/x11-libs/qt-sql/ChangeLog +++ b/x11-libs/qt-sql/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-sql # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.12 2008/05/27 13:08:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.13 2008/06/13 23:24:34 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-sql-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 27 May 2008; Raúl Porcel <armin76@gentoo.org> qt-sql-4.4.0.ebuild: Add ~alpha/~ia64/~sparc wrt #223557 diff --git a/x11-libs/qt-sql/qt-sql-4.4.0.ebuild b/x11-libs/qt-sql/qt-sql-4.4.0.ebuild index c93a08e202ad..181626162620 100644 --- a/x11-libs/qt-sql/qt-sql-4.4.0.ebuild +++ b/x11-libs/qt-sql/qt-sql-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.4.0.ebuild,v 1.6 2008/05/27 13:08:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.4.0.ebuild,v 1.7 2008/06/13 23:24:34 ingmar Exp $ EAPI="1" inherit qt4-build @@ -16,6 +16,7 @@ IUSE="firebird mysql odbc postgres +qt3support +sqlite" DEPEND=" ~x11-libs/qt-core-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT} firebird? ( dev-db/firebird ) sqlite? ( dev-db/sqlite:3 ) mysql? ( virtual/mysql ) diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog index 6e7e01d96750..7214691d8c87 100644 --- a/x11-libs/qt-svg/ChangeLog +++ b/x11-libs/qt-svg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-svg # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.9 2008/05/30 04:07:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.10 2008/06/13 23:25:06 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-svg-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-svg-4.4.0.ebuild: Marked ~hppa (bug #223557). diff --git a/x11-libs/qt-svg/qt-svg-4.4.0.ebuild b/x11-libs/qt-svg/qt-svg-4.4.0.ebuild index d3e1458213a8..0e83ef7af9c7 100644 --- a/x11-libs/qt-svg/qt-svg-4.4.0.ebuild +++ b/x11-libs/qt-svg/qt-svg-4.4.0.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.4.0.ebuild,v 1.4 2008/05/30 04:07:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.4.0.ebuild,v 1.5 2008/06/13 23:25:06 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The SVG module for the Qt toolkit." @@ -12,7 +13,8 @@ SLOT="4" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -DEPEND="~x11-libs/qt-gui-${PV}" +DEPEND="~x11-libs/qt-gui-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" QCONFIG_ADD="svg" diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog index 50353bbb342f..56000323b861 100644 --- a/x11-libs/qt-test/ChangeLog +++ b/x11-libs/qt-test/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-test # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.9 2008/05/27 13:11:47 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.10 2008/06/13 23:25:39 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-test-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 27 May 2008; Raúl Porcel <armin76@gentoo.org> qt-test-4.4.0.ebuild: Add ~alpha/~ia64/~sparc wrt #223557 diff --git a/x11-libs/qt-test/qt-test-4.4.0.ebuild b/x11-libs/qt-test/qt-test-4.4.0.ebuild index 393e51946601..cf9db1d40f88 100644 --- a/x11-libs/qt-test/qt-test-4.4.0.ebuild +++ b/x11-libs/qt-test/qt-test-4.4.0.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.4.0.ebuild,v 1.4 2008/05/27 13:11:47 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.4.0.ebuild,v 1.5 2008/06/13 23:25:39 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The testing framework module for the Qt toolkit." @@ -12,7 +13,8 @@ SLOT="4" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -DEPEND="~x11-libs/qt-core-${PV}" +DEPEND="~x11-libs/qt-core-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES="src/testlib" diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index c221a2c49ecb..cd48b756a51a 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.8 2008/05/30 05:37:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.9 2008/06/13 23:26:11 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-webkit-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-webkit-4.4.0.ebuild: Marked ~hppa (bug #223557). diff --git a/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild b/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild index 2f4e1e4da839..e20e90becaad 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild,v 1.3 2008/05/30 05:37:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0.ebuild,v 1.4 2008/06/13 23:26:10 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The Webkit module for the Qt toolkit." @@ -12,7 +13,8 @@ SLOT="4" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="" -DEPEND="~x11-libs/qt-gui-${PV}" +DEPEND="~x11-libs/qt-gui-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog index 4f1744d0e005..a99c34e1b8b4 100644 --- a/x11-libs/qt-xmlpatterns/ChangeLog +++ b/x11-libs/qt-xmlpatterns/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-xmlpatterns # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.9 2008/05/27 13:12:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.10 2008/06/13 23:26:43 ingmar Exp $ + + 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> + qt-xmlpatterns-4.4.0.ebuild: + Make all split Qt4 ebuilds block the old monolithic ebuild. 27 May 2008; Raúl Porcel <armin76@gentoo.org> qt-xmlpatterns-4.4.0.ebuild: diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0.ebuild index 48f18b99af7d..318fef23e024 100644 --- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0.ebuild +++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0.ebuild,v 1.4 2008/05/27 13:12:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0.ebuild,v 1.5 2008/06/13 23:26:43 ingmar Exp $ +EAPI="1" inherit qt4-build DESCRIPTION="The patternist module for the Qt toolkit." @@ -12,7 +13,8 @@ SLOT="4" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -DEPEND="~x11-libs/qt-core-${PV}" +DEPEND="~x11-libs/qt-core-${PV} + !<=x11-libs/qt-4.4.0_alpha:${SLOT}" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns" |