summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2013-07-18 02:09:20 +0000
committerPatrick Lauer <patrick@gentoo.org>2013-07-18 02:09:20 +0000
commit33d37fb2bf0ed2949be792cc65d808c762a63892 (patch)
tree0e55ffb0b8deabd531dd06d8568fd432861a42fa /app-office/texstudio
parentVersion bump (diff)
downloadgentoo-2-33d37fb2bf0ed2949be792cc65d808c762a63892.tar.gz
gentoo-2-33d37fb2bf0ed2949be792cc65d808c762a63892.tar.bz2
gentoo-2-33d37fb2bf0ed2949be792cc65d808c762a63892.zip
Fixing qtgui deps for qt-4.8.5
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-office/texstudio')
-rw-r--r--app-office/texstudio/ChangeLog5
-rw-r--r--app-office/texstudio/texstudio-2.6.0.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/app-office/texstudio/ChangeLog b/app-office/texstudio/ChangeLog
index 8b8932b62bdf..bfda716ba939 100644
--- a/app-office/texstudio/ChangeLog
+++ b/app-office/texstudio/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/texstudio
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.15 2013/07/14 08:28:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.16 2013/07/18 02:09:20 patrick Exp $
+
+ 18 Jul 2013; Patrick Lauer <patrick@gentoo.org> texstudio-2.6.0.ebuild:
+ Fixing qtgui deps for qt-4.8.5
14 Jul 2013; Justin Lecher <jlec@gentoo.org> -texstudio-2.5.2.ebuild,
-texstudio-2.5.2-r1.ebuild, texstudio-2.6.0.ebuild:
diff --git a/app-office/texstudio/texstudio-2.6.0.ebuild b/app-office/texstudio/texstudio-2.6.0.ebuild
index fe7ec4546423..140a138f2b77 100644
--- a/app-office/texstudio/texstudio-2.6.0.ebuild
+++ b/app-office/texstudio/texstudio-2.6.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/app-office/texstudio/texstudio-2.6.0.ebuild,v 1.3 2013/07/14 08:28:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.6.0.ebuild,v 1.4 2013/07/18 02:09:20 patrick Exp $
EAPI=5
@@ -21,7 +21,7 @@ COMMON_DEPEND="
dev-libs/quazip
x11-libs/libX11
x11-libs/libXext
- >=dev-qt/qtgui-4.6.1:4
+ || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
>=dev-qt/qtcore-4.6.1:4
>=dev-qt/qtscript-4.6.1:4
>=dev-qt/qtsvg-4.6.1:4