summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2009-06-23 10:07:16 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2009-06-23 10:07:16 +0000
commit2fdb1dc4ff4adf46aa834ccb66f26d1793ab2f74 (patch)
treebe896e55eacf04fb7ad0535b340824262f1ac627 /dev-util/qt-creator
parentadd latest media-libs/tiff revbump to p.mask (diff)
downloadhistorical-2fdb1dc4ff4adf46aa834ccb66f26d1793ab2f74.tar.gz
historical-2fdb1dc4ff4adf46aa834ccb66f26d1793ab2f74.tar.bz2
historical-2fdb1dc4ff4adf46aa834ccb66f26d1793ab2f74.zip
Fix phonon dependencies. Bug 270188
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-util/qt-creator')
-rw-r--r--dev-util/qt-creator/ChangeLog6
-rw-r--r--dev-util/qt-creator/Manifest4
-rw-r--r--dev-util/qt-creator/qt-creator-1.1.0.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index ef61966d14bf..7eeb2696752d 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/qt-creator
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.15 2009/06/07 17:53:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.16 2009/06/23 10:07:16 hwoarang Exp $
+
+ 23 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
+ qt-creator-1.1.0.ebuild:
+ Fix phonon dependencies. Bug 270188
07 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
-qt-creator-1.0.0.ebuild, -qt-creator-1.0.0-r1.ebuild:
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index d74a40973834..10113531cd50 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -1,6 +1,6 @@
AUX add_missing_plugins.patch 920 RMD160 9d29a8ca800131d0904d2bd9eeb0ebc0ed5c3c97 SHA1 399af9bf05587a367f264199c3a32338125008b1 SHA256 6ca898640206cfb8f29297db561c3f0b794fe1335dde2bddfa39cfbe43f66803
AUX docs_gen.patch 603 RMD160 9711ddb1c59e8ddd1ad17ba34f89c8e4c89b4504 SHA1 83cd745baabd1545a1079c59edef6279b254074a SHA256 7428155e6f09201d60f308c3934153aa5fa5b25296a96d86dad80354dc8e3b93
DIST qt-creator-1.1.0-src.zip 8168311 RMD160 2f4668f4d40b92e77c85d1d3948be5582567008a SHA1 e8c3b77575abbbbab3f9e7cef1d464ceddb62f5b SHA256 a2dce62d8a9b039b1bf63319381b3b2eaa86d9642e1097202a8e0cb551769a27
-EBUILD qt-creator-1.1.0.ebuild 2559 RMD160 2be60178624e33892a28494ed4e1680fb2ea42d3 SHA1 a71231bf9b307ebedfee496c2808d440f305f3d8 SHA256 c7a2504e809468e36030c050ce62d96426a87aa80e53b2b2bd633a48d99dc376
-MISC ChangeLog 2416 RMD160 0a458792bd0786878d4210c3805e474148166c0a SHA1 760266bcd234a88a3f74f3ae3cd08f8037b216a0 SHA256 d4fba1f2985be4e95b38f5df5549b9ac1e5960adb7c682da446f4f049839e1bb
+EBUILD qt-creator-1.1.0.ebuild 2571 RMD160 328127c5824d964ef45bda6ab4c8f353ccbafd59 SHA1 4d83aa3197d8fd82c53c28b02155e76dc2bca082 SHA256 4d3f0608fa2712703dac077ab8ad47b373ebe101734b0cddadbae86931a4ed47
+MISC ChangeLog 2535 RMD160 5eb28b0a74a1a59e167dd2b6df7bf2d77d081e64 SHA1 03c378a78745b8a16fc7f0ec8834201a603e0b09 SHA256 cfe98e269e542daf5a10a5f691906352260b754b1d28e43e2cdd6d4332007ba5
MISC metadata.xml 889 RMD160 875b058882c7e9e0ab56a1cb98ea96352be3b24b SHA1 e6b31b2ec30fa39ae05fd8b208e045951e7993ba SHA256 a07e607cb86520ff1458de9a2730b4713c3f1ae55f8f72411aa131677781a614
diff --git a/dev-util/qt-creator/qt-creator-1.1.0.ebuild b/dev-util/qt-creator/qt-creator-1.1.0.ebuild
index 62510198662b..419a5aec799c 100644
--- a/dev-util/qt-creator/qt-creator-1.1.0.ebuild
+++ b/dev-util/qt-creator/qt-creator-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.1.0.ebuild,v 1.4 2009/06/03 22:46:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.1.0.ebuild,v 1.5 2009/06/23 10:07:16 hwoarang Exp $
EAPI="2"
@@ -34,7 +34,7 @@ DEPEND=">=x11-libs/qt-assistant-4.5.0_rc1
subversion? ( dev-util/subversion )"
RDEPEND="${DEPEND}
- || ( >=x11-libs/qt-phonon-4.5.0_rc1 media-sound/phonon )
+ !kde? ( || ( >=x11-libs/qt-phonon-4.5.0_rc1 media-sound/phonon ) )
kde? ( media-sound/phonon )"
PLUGINS="cmake debugger designer fakevim git perforce subversion"