Version bump for both 2.7 and 2.8 series.

Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

5 files changed, 37 insertions, 155 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index c01c6dc15dce..54886b0afad9 100644
--- a/dev-qt/qt-creator/ChangeLog
+++ b/dev-qt/qt-creator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-qt/qt-creator
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.15 2013/07/27 07:31:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.16 2013/07/27 07:49:01 pesa Exp $
+
+*qt-creator-2.7.2 (27 Jul 2013)
+*qt-creator-2.8.0 (27 Jul 2013)
+
+  27 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qt-creator-2.7.2.ebuild,
+  +qt-creator-2.8.0.ebuild, -qt-creator-2.6.2.ebuild, -qt-creator-2.7.1.ebuild,
+  -qt-creator-2.8.0_rc.ebuild:
+  Version bump for both 2.7 and 2.8 series.
 
   27 Jul 2013; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Put myself as primary maintainer.
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 84c550533c98..1e58e4d0c2cc 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -2,31 +2,29 @@
 Hash: SHA256
 
 DIST qt-creator-2.5.2-src.tar.gz 22523588 SHA256 04521c642953fcb7a2d4011a60fdf29dca4ac1fffa8c834a21589fa390db2d4a SHA512 db9cf844c78304e6dcd1eb05df109430281eb35294c7993088d1ebab8efe56e3e9ef5d630d520822a54a35e3e1b9bfcf5fd505cac1e23020e185b8d8b85ddaf6 WHIRLPOOL b8338d8bc3c0efa951b2d06921bfd8b4a6e840ee69e404684dc9c0061b6d451b9a228905021b6aa69459a101970e1839cbd094ebc892a0cd9ad02f33729eef00
-DIST qt-creator-2.6.2-src.tar.gz 21396937 SHA256 86165159841f2a3c41e6b80af3ed6fb6655a5194de7fe51cbf08b1539a352524 SHA512 62a8def36bd6c10c0fd44977428b518b7111229d1ca847e263d61a39bd6b51eb40c0699dbccdc96a8b8980c453d0cf9c57cd8c59054df0f24c5b5af62ea7091d WHIRLPOOL 81ba71194ca2ec13235a91214d3e22fa1440cfa5d9f9296106351f5bcbe704c324623fac0774826d0ca046299790bb9a74135baf5dc62ef55fb402b571ccb267
 DIST qt-creator-2.7.0-src.tar.gz 22503776 SHA256 c8d05b65661639809df7815837e8c7d42980028dff1e21dc518049d837b3d6fa SHA512 bb4b941c8acb3572450c3eb8a70807480cbe1f23b1eb7150fcbac5b766c5a109567822a3f2644164f894f736a2d8fcc972d013a9f475ae72f97609afc98b89fc WHIRLPOOL ff660ac5283ae788843e0b812e68ca950b62bfd1507c1952d9bee0a3397ef300625dc3bf4207a773d81c1e2483533213365d2d0715b0a31f20ec3ca11fb56285
-DIST qt-creator-2.7.1-src.tar.gz 22572001 SHA256 5b428b49579ab62ab0575010848b4d50b05d4ff1abebaa73883bcdd9863f7613 SHA512 d76fe27e8d03bebe9aa732114b93fbd78b1561c6465e86160725b3a4cb45aabd91f2d5aa91f4d0cb24fa6e5583927cd68ccd70ffe1f672a489c41d6657ea629d WHIRLPOOL fd3cb6324a6d933b791beffaae9a226fb6356a3282ccd1ec6188ac4743e9f7c6c90d46dc5ab33a9cce4f89f83f8654ad8cbd6608e3e69e60e1a766cf534efb3c
-DIST qt-creator-2.8.0-rc-src.tar.gz 24187937 SHA256 99995e3a4e154c6c8fc89d9c5e95b5fd214c9242c61c1920c819b0f1878f1647 SHA512 2a976ebe2d78886d64435ab2ccb03c32949dffefe2de370b533e47024edb5536f23cb31e1a5365c86939d918050bde0173c1ca1ae73e68762d02f013d2598ad9 WHIRLPOOL 55f3f2602da39ed85eba6268b13372041fccf3d351c2b6fba3c0488f4ebf7e677e2f01449033ee6b24d616019e2768f7bb677374cc9fae4dc3ab1e1b9b06075b
+DIST qt-creator-2.7.2-src.tar.gz 22551635 SHA256 5df913faa43a5fbf44fb1f25faaf6d258134b8f9e6b8ef8a21277136dec9e189 SHA512 d11f80df40a9560b507cffc6bd5ebe8cd416815fefcdc777c7abea4a20957e7fdcce44fcefe69f62768adb694e1d8dc56fb50b6fdceb6725af1d1086d1dd5474 WHIRLPOOL 3b7a060b4d15a146154dd7873636fd66fbdcb77b3450160eef9e3db5fd2a429a0e3555274a6b9019dbc75e91ca81c88ea81500b5bb12be4a0d1310c97d43d870
+DIST qt-creator-2.8.0-src.tar.gz 24210148 SHA256 7ac5d9a36c2f561f74d77378d4eae95a78c7752b323e1df924d6e895e99f45d2 SHA512 bc5ee815e445a3da3f0777ed75c259915220964ce9a0bf3f94ea80795dbb812384c587f31e1c554726d491f9a74c0ac719a497291afb2808a1f45852ef1b6ea0 WHIRLPOOL b3fce37f96eb8a107470f00ea9c12308b799432ec6402a2ae129b93cfbf70474acb666a74bee9491d0f3cac10d6725c5a0b4307df3ec724da3aa0d11488fe5f0
 EBUILD qt-creator-2.5.2.ebuild 4345 SHA256 3255eedfa9f293b5bc5ce205f75c527f8751a1750ec33e033fe7c7e29779ad9e SHA512 c3ad18cb06214dde938745f86ed6a4bb4d0ee0909746fb183bd46ffffd171cfb428d9985f78385a405dbd68caf0ff57f95c9a972228420554b2c6e5d40627983 WHIRLPOOL 1fe443ea4c2b7e37cb4b4a4ffab2144d99947ea489f5e28b9d99d7c5ee64b33512fdd1c0eb503b4b4c956110f7615a98c1b2c4a8ced0d1b79ee57be9a2a70d7e
-EBUILD qt-creator-2.6.2.ebuild 3870 SHA256 1517f56546ef15c6a4d070a9792686cdd22a1e4f859a4bf898a636c03d79efd2 SHA512 7ca454170f71e33fb25534bb5a10fecc0b0b91bc64e0fdb38e1f5b9f45fb42663f86cfd672d846b6e23bc7d3dcc8c5a19f38eeb87c42b707d983d03bde6070e3 WHIRLPOOL e4a67c839631fa143da9a4818eaa0d529d628674c87b8ca27e6819bc6430fecb69f0fd3ac64551fe18632d2d3cdb4bb3136b6363fa92bd48bc7922a5701cb340
 EBUILD qt-creator-2.7.0.ebuild 3007 SHA256 9632f780022a4a56ad8f9f29255186ed70cf814ae3dd20c5a4d8c3f3b554be28 SHA512 717d4ee7080370e8372254cb0d4f1a9d1da0458a42c141c389f3d9424ffce720bbaa7a7795a01424e5e39d27f15f311bf5c5d13259c7de088a41fc930f56ace7 WHIRLPOOL e993d44c4a0633b66758d3f352087db02bfbe143900fa16fe59a931ba6a0cf0a488a59db1abeeff62b4ed82c3024a7430536eac8c590a0337e6853311ebed91b
-EBUILD qt-creator-2.7.1.ebuild 3058 SHA256 a4697596adffa0bdc4b2f73846513bfb4e7dc1fcbacbc15de52c6f66c34a910c SHA512 2af47d411ea84196a74c3d7f9fae1c3100d8ed274e7a9006e4383f5bc155384f5084e2181547f4a4298408f9a5cc7426e5b9dfa9bb1e612d9dd0db9e8eff810a WHIRLPOOL ded01d4d4589326f1e7881dc5bb7e26b33544ee844e293681851ab07fd56a248b114f1437af984857ad404057939121cfe871730c9b591fa07232b213163ab98
-EBUILD qt-creator-2.8.0_rc.ebuild 3167 SHA256 0db56b6f806207d8c4bf9560705f9b301aabab09eeb3ea2627ff71ac78aac6a1 SHA512 6fb6b59e0973597aa63ae8268d79f774234a6afdb9ac0307ca568c82cc74784331b74cc29c7c17f2fadfa2530b5ac35a968cde01563c44bef06e729314b23c0f WHIRLPOOL 06dc1e8e596f1291de6ad7bd88a567640d466a11cf0c6d5df7be636779b8e53a35e6d201d7e9912c1ef308ad3670f297bcb17aec410ee183d9d41bd68fd1806d
-MISC ChangeLog 23583 SHA256 ded70d7fb014dee42229adfb25ef0030b02fa553a2b056cfb90ed62384166abe SHA512 c9ec6c56ab562e728acccbcb8dcb201fe621e2f18460caf28fce85c5eca3da9f59e33210f74cbf4709bff2f1090245d5442eb44443d39fdf45fe2331534a23a0 WHIRLPOOL 012139a91de554918c3b8fe361a944ee6591f150869ed17e796f9025710c52c536195c83e49c1ebce360321468546cdeb2100f4df126cb3998f0a5d000c082d1
+EBUILD qt-creator-2.7.2.ebuild 3141 SHA256 52faabea152fed9742b84f0ffe73d2b2801b69dd63d1ce2301cb0ef95f7efad9 SHA512 ebd0f651270530163ec856672a6e6a4b65feba30cb0b272e21695326684b4b0d207973c1c5c6d97e9260fc6b9d40319d209f28d590b55a07aa1ab8f6355cba04 WHIRLPOOL 3e9be2cdfa4cc8bdcd9aef17afbf6ef0569e3d733a89bc85682a9e278627e9bb5c8dffa9453cf036e7e360b22c6a78250989e0bd0bdb495271a423148d3f1e0a
+EBUILD qt-creator-2.8.0.ebuild 3247 SHA256 16be6168ae772432ba5613f6027dbfd23c24e7029dd603b2f8ba32f532903dd9 SHA512 286dfabc53a8c6aefbb87ee7f00076745b13364b7d9da2a370a714222ce09bd62ec9d01af532b8db46f17be3980ace68c3827ff7f9d5fde2722fd88c9b37a012 WHIRLPOOL 35919b9a5a64dff86611678ea61f970ecb7497e4f47ee3445d9790ba206cd627d6e282fa763bda0b4f1cb6e4626b3a627fe806668fde0a1971cb962cd5511d9f
+MISC ChangeLog 23880 SHA256 872a6c53bc60a0884e1f8cd3c7bf4e3e0527e34bfbd76b23eadffb0d3a70c075 SHA512 3cad6b6fc6e68635b01fd022628c1a5818603ae6532c59e2d7174de9c6809f0661af9e569afc852d509ccf6b765a0660c51ba3b4ece3fcf353a1d91a767ac977 WHIRLPOOL 1e17e8f4fbc8ff60f227105d591dc19419b3a8e0f0d6db15e14f52f24ab14970addf071a68cefe8c7e10a59e4e047d36b14bae13f3ffc69f6eaefcd77eb47e8b
 MISC metadata.xml 1495 SHA256 dccf35224275abc2a5855df0ff30e854549dedf8d5e451ba1b7e81bc0b0c334b SHA512 434076f0af1c5692221bb88aa68838299a5032f245c3704010dffd7d94b8cfef706d5c8a2940317f18f3dfb4e2eaaad8cd3fadc0496c9e3b52e6867dca0ec5df WHIRLPOOL 3a961d2e897ef128c4574ea016ec7d56d517b59990cc6906d2145045b43a87616689e691bc384e3dc884375c949b738984f89f8b0e3ce3fce76f5c5ffc82c49e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR83d7AAoJENXLsxwXqFxyLxUP/3H42eTNeBElCg/4vjK4yBlM
-xvMPD+TA9Bb66XXbp3dGpwdWOu6D316VTyqlgXGjqUOqWF2HgzVY3mrCc0AcgKTV
-krtHIw2RHINFk62YR2Btuk9+9f9uGH+w7g+kCwrvDi/XDoboHehKewrVFGDmnzgj
-M8UY6IC0kLAXiOmO/egXmu+NNUAb5qNS4BaAbuFEgs29WXvtyxOLsitT1zBLuM/8
-VtulCnW9c1dvXIRl04et5vHc3Q+WC30RXNF8OphT8jMciUVoY0Lx6/3MGF/2otfN
-8Wp+xHcyMVfRes4GmvPvUJv3itcHjBfmvj1FhOq9ByDuRaU69+/bW6NNaTGbFCsh
-Gr0QvKmB1/erogkDROm6VlOrH6Xya7S2aY3hscjppJ3mGsQYseqtHOU5aX545NO2
-iW5r+RtsV9rirbZYvF/XT5kGtooVuRlfbkCI4uM7G/j9GBBryHNbHuLuP3JssNj4
-6IuUir2iFSYGu5vmdu6m29CZpjfVnXTtj6qIIvu/09Qdi8281TmTCcV0N8wpqJQ7
-LJxhb/G3Fitp3LAyaIIs3JR1ClHpxmAXn/23SkrCnrW/7iwod70ZKvl9C4MrasSE
-wF3VKjgQTVYQpEjGubZQi1DbWLtFAHr0e95JKIN6ZkxZ0TfyLFZ6/sL888MNYx0U
-am5MsydRKPNsE1RnHFfR
-=+lKo
+iQIcBAEBCAAGBQJR83uRAAoJENXLsxwXqFxynYYQAJ7Br0mfHYfENpClkbkPtvpY
+ypakAjJb3MAHscjHhB7NOqtTiDGz2Salz03bziaekJobPuIwx1PaPCcO0uA1WyFH
+znrp5RsdpYFEFVUrFUZ/5x9JnbGY4CDwrmFNgDwbHgS1hHvJXiJ25Zd9xXk555FL
+9y3kAG4guto/EQq4wcx/DzNW+JD8TpxtnBHcWjFFuwY5VtyJYe8N44+wALrNihwi
+09l0KjH+BeFIgE+DWXWAJVUFyMto5SctDXObpUtM4g5Xst851HiB0PW6jPMiEQ2s
+TOLMCPM3A87ZYfpf0RGOTmD38GdF1jWTkXtw7aKKhT/I1ljNPQMDwZ48chVp87fY
+HukiKGTenN0ksBp+gVnia+CcRD+dp6wB0YPwxYrqlmnWSFlUTm8gwbufML9bBSmN
+7dmh/P+4k/PwNpTwNIqdw+wOPhZa6Frs0Odz7liVtdXHNkkAAI0/VhZPCP212tDd
+rXJjmEDZ8Dapt2+Gu1kxnp/uiY6mMavd8/SElcZ84JTUsP5Y93vUyTb476MGvVnU
+JwrelFa71u6T3GK7cA/4gC4JZvpoE/HDzbS2jqlSPeuOMN0/gVvSDNaT98mvt8na
+OtM9LBwhr9EcVmjVHhD1iBazphvk47RTIMmcwNm19LWKC8lkTmUFtELO+WN5G8bs
+4N2utX9+k7mZtC2ogYtQ
+=ypvv
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-creator/qt-creator-2.6.2.ebuild b/dev-qt/qt-creator/qt-creator-2.6.2.ebuild
deleted file mode 100644
index 8bb5159e37d5..000000000000
--- a/dev-qt/qt-creator/qt-creator-2.6.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.6.2.ebuild,v 1.3 2013/03/09 17:37:10 ago Exp $
-
-EAPI=4
-
-PLOCALES="cs de fr hu ja pl ru sl zh_CN"
-
-inherit eutils flag-o-matic l10n multilib qt4-r2
-
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
-HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
-LICENSE="LGPL-2.1"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
-		https://git.gitorious.org/${PN}/${PN}.git"
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}-src
-	SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
-	clearcase cmake:cmakeprojectmanager cvs fakevim git
-	madde mercurial perforce qnx subversion valgrind)
-IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="4.8.0:4"
-
-CDEPEND="
-	>=dev-qt/qthelp-${QT_PV}[doc?]
-	>=dev-qt/qtcore-${QT_PV}[ssl]
-	>=dev-qt/qtdeclarative-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}
-	>=dev-qt/qtsvg-${QT_PV}
-	debug? ( >=dev-qt/qttest-${QT_PV} )
-	!botan-bundled? ( >=dev-libs/botan-1.10.2 )
-"
-DEPEND="${CDEPEND}
-	!botan-bundled? ( virtual/pkgconfig )
-"
-RDEPEND="${CDEPEND}
-	>=sys-devel/gdb-7.2[python]
-	examples? ( >=dev-qt/qtdemo-${QT_PV} )
-"
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^|SUBDIRS\s+\+=)\s+plugin_${plugin#*:}\>/d" src/plugins/plugins.pro \
-				|| die "failed to disable ${plugin} plugin"
-		fi
-	done
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		share/qtcreator/translations/translations.pro || die
-
-	if ! use botan-bundled; then
-		# identify system botan and pkg-config file
-		local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | cut -d '.' -f1,2)
-		local lib_botan=$(pkg-config --libs botan-${botan_version})
-		einfo "Major version of system's botan library to be used: ${botan_version}"
-
-		# drop bundled libBotan. Bug #383033
-		rm -rf "${S}"/src/libs/3rdparty/botan || die
-		# remove references to bundled botan
-		sed -i -e "s:botan::" "${S}"/src/libs/3rdparty/3rdparty.pro || die
-		for x in testrunner parsertests modeldemo; do
-			sed -i -e "/botan.pri/d" "${S}"/tests/valgrind/memcheck/${x}.pro || die
-		done
-		sed -i -e "/botan.pri/d" "${S}"/src/libs/utils/utils_dependencies.pri || die
-		sed -i -e "/botan.pri/d" "${S}"/tests/manual/preprocessor/preprocessor.pro || die
-		# link to system botan
-		sed -i -e "/LIBS/s:$: ${lib_botan}:" "${S}"/qtcreator.pri || die
-		sed -i -e "s:-lBotan:${lib_botan}:" "${S}"/tests/manual/appwizards/appwizards.pro || die
-		# append botan refs to compiler flags
-		append-flags $(pkg-config --cflags --libs botan-${botan_version})
-	fi
-}
-
-src_configure() {
-	eqmake4 qtcreator.pro \
-		IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=yes
-}
-
-src_compile() {
-	emake
-	use doc && emake docs
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}usr" install
-
-	dodoc dist/{changes-2.*,known-issues}
-
-	# Install documentation
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	# Install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}
diff --git a/dev-qt/qt-creator/qt-creator-2.7.1.ebuild b/dev-qt/qt-creator/qt-creator-2.7.2.ebuild
index 10774068bb46..69897a52f424 100644
--- a/dev-qt/qt-creator/qt-creator-2.7.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-2.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.1.ebuild,v 1.1 2013/06/03 08:01:44 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.2.ebuild,v 1.1 2013/07/27 07:49:01 pesa Exp $
 
 EAPI=5
 
@@ -39,7 +39,10 @@ CDEPEND="
 	=dev-libs/botan-1.10*
 	>=dev-qt/qtcore-${QT_PV}[ssl]
 	>=dev-qt/qtdeclarative-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
+	|| (
+		( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )
+		( >=dev-qt/qtgui-${QT_PV} <dev-qt/qtgui-4.8.5:4 )
+	)
 	>=dev-qt/qthelp-${QT_PV}[doc?]
 	>=dev-qt/qtscript-${QT_PV}
 	>=dev-qt/qtsql-${QT_PV}
diff --git a/dev-qt/qt-creator/qt-creator-2.8.0_rc.ebuild b/dev-qt/qt-creator/qt-creator-2.8.0.ebuild
index ceebaf56ff04..419816e9a3e8 100644
--- a/dev-qt/qt-creator/qt-creator-2.8.0_rc.ebuild
+++ b/dev-qt/qt-creator/qt-creator-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.0_rc.ebuild,v 1.2 2013/07/10 09:33:23 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.0.ebuild,v 1.1 2013/07/27 07:49:01 pesa Exp $
 
 EAPI=5
 
@@ -39,7 +39,10 @@ CDEPEND="
 	=dev-libs/botan-1.10*
 	>=dev-qt/qtcore-${QT_PV}[ssl]
 	>=dev-qt/qtdeclarative-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
+	|| (
+		( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )
+		( >=dev-qt/qtgui-${QT_PV} <dev-qt/qtgui-4.8.5:4 )
+	)
 	>=dev-qt/qthelp-${QT_PV}[doc?]
 	>=dev-qt/qtscript-${QT_PV}
 	>=dev-qt/qtsql-${QT_PV}