summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-07-23 15:07:16 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-07-23 15:07:16 +0000
commit93860a5f56fd88ce3228a1fa9641a2b2526f0ff8 (patch)
tree7ccda4362605753a8a84e9ba2435cfe505d42a7e /x11-libs
parentrenamed patch to capture ar & cc, extended the patch to honour tc-getCC, almo... (diff)
downloadhistorical-93860a5f56fd88ce3228a1fa9641a2b2526f0ff8.tar.gz
historical-93860a5f56fd88ce3228a1fa9641a2b2526f0ff8.tar.bz2
historical-93860a5f56fd88ce3228a1fa9641a2b2526f0ff8.zip
Fix Qt dependencies wrt bug #476624.
Package-Manager: portage-2.1.12.13/cvs/Linux x86_64 Manifest-Sign-Key: 0x675D0D2C
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qtscriptgenerator/ChangeLog6
-rw-r--r--x11-libs/qtscriptgenerator/Manifest20
-rw-r--r--x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild4
3 files changed, 17 insertions, 13 deletions
diff --git a/x11-libs/qtscriptgenerator/ChangeLog b/x11-libs/qtscriptgenerator/ChangeLog
index bb05b6340d3b..fdaae63a5426 100644
--- a/x11-libs/qtscriptgenerator/ChangeLog
+++ b/x11-libs/qtscriptgenerator/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qtscriptgenerator
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.29 2013/03/17 09:41:32 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.30 2013/07/23 15:07:01 kensington Exp $
+
+ 23 Jul 2013; Michael Palimaka <kensington@gentoo.org>
+ qtscriptgenerator-0.2.0.ebuild:
+ Fix Qt dependencies wrt bug #476624.
17 Mar 2013; Sergey Popov <pinkbyte@gentoo.org>
qtscriptgenerator-0.2.0.ebuild:
diff --git a/x11-libs/qtscriptgenerator/Manifest b/x11-libs/qtscriptgenerator/Manifest
index 2a151b50aad0..fc5cc5556308 100644
--- a/x11-libs/qtscriptgenerator/Manifest
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
AUX qtscriptgenerator-0.2.0-arm.patch 2601 SHA256 8ca35c7066ef51b9cb3c61bb9da46cb105ba4eec51de635d10e462d193b491f9 SHA512 285ca3c10e452407a40d000f8fd352d38fa7414a5fb9fdefc0af20cc3da541459c33eb1fbd97320846acf1e86163e1e57a1ac4258a326f6fe8ab5f4c29df62b0 WHIRLPOOL 43a8a1648793e5dded0077a14a56beef2110af4fee3744d64e94135b13a5966cb7e126933a76206c992d6e6ec0a7f790bfaeb831e32f54529ce7e2a93244bcbb
DIST qtscriptgenerator-src-0.2.0.tar.gz 379776 SHA256 895feb274470b9272264c7a141e5bd7f90c92e95d37f346f5f95a352541c8e69 SHA512 54b91562d275b634b50ae8f6ae024cf738605efadeb3085527087ebdc8b6b86559088972ab5dafb7ff1ede6d18dc135f935ac1fb307a17ea1975b4f7629cc0fa WHIRLPOOL 7d52a0f88b89f1a374a175b946ef304752c1ced67fa4123f1dd87da35160221c4495834a4012d05a2f8628344b1a58e39ad46e697a16ca358de07406b9db27ec
-EBUILD qtscriptgenerator-0.2.0.ebuild 1600 SHA256 638b62872d22808bb8c9cd00dfabad68f6e768a032fddea2d06030b1c4937e95 SHA512 987d454fcd4d46fa352dc62686d52e2bc36704c55f37d38731b00d283d4e65de96429ed3a0cf59daf51bc1a96b4b677b200f45e4c00e527515eacb0734cd2de4 WHIRLPOOL 816427b2818c75fce2b070def9b211c8916d1f4aa58232bb6ea7b61e111482ba5cbf07c96dbd3a3900f9f0e81f15154c42e3a30f265a7160345911b0d5e9eb35
-MISC ChangeLog 4852 SHA256 59061983dc6c251ccc52213696165944ea0cb2c0a34493e3d77bcb867285f1ed SHA512 7c59e906d25b385d2497a1766feb75c155e94eff5eabea38461bfde96ce602d747a56b5ca72d498cf048bb5ce2538f52441f2ed0e7d247749c7f8eb08fd50f13 WHIRLPOOL f395f55dbdc60dd730a6f67022c888d0deef10663a664c118b2412d26656e5814db569f4f834f8d27c26823e84c4447ac9123dd37786df8ae566735660dc5869
+EBUILD qtscriptgenerator-0.2.0.ebuild 1661 SHA256 1be30282c7c6bb08bc378946392cb7b2bfc2e83fe9db8df5f68a2a5947da8703 SHA512 c4fb66ffe7865b68f2a1ca81bdd4a3aa1fcd9a7fa5147eeb52988aa30e306af3ba2124bdc0587551ffc5a03bf478079198e3095266939b8a6227bf48e27a3fc8 WHIRLPOOL 3df5650d945f0a2bbdbeaac7226f782056c302218618a223a60a14aa23460f95440c4d2d8316a0797d657af26bb9ca9701bd8422e810b4e8a77c0090021e5952
+MISC ChangeLog 4984 SHA256 eee04f2a97056f279833463c868df4d1aaeb11cab61bcab477c9520d60ea0a5d SHA512 eca539d63505dd56375bb40df022733e011790a66cdb0e811d326ecdcffd0a69911ad483d27cf64645d801633bec3bfa334652e58002c46faad389ed58f532fe WHIRLPOOL 01d6e95da3336ca30190c2357992e1dc6c911deb87ac3d55ca732198c0b34f636deb52393be2cd8b42838492fbd226593615c39d50c9d3577332d05d55c02cba
MISC metadata.xml 261 SHA256 6637fda35f6983444e39c10bd3911c9625ba964a168538da06f0b6712d6b841a SHA512 4729002719953f799837680e1efc9fa605eabaed0670a15ae6929ec54cd56b84f924b590545ee4c4ef7e90b7b10a6ab7afc10dc93f5b11551be897c168015229 WHIRLPOOL 8d47af5e371c18dabb837872d849a9992430e57d49b736446bd234883a30efffb4bda133ef0b9a182260364819d02c35ebd0cbb88a8592d77461953c34c99435
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJRRY/RAAoJECo/aRed9267LK4IAKq9AtbP1NDfXPEEx/i9PlgU
-+LEnjI5A2o8UV1r7X7y1KuCobWn8MP+ywtjbq/BBsBjjlpelzZHrSzP66CI0flM5
-UVGChT1ODDzEM88drKG52efkDGpydSAtJyGZ65ow2z0So9gMawbjkcSLXvIbAvo1
-1PDxmc2p4XNAl5ejFMWtTUkppsHo7xKD1Ihycx31Kzh7Ity6aPvpsu0qy+wHKuf/
-OiOWbtK3yT/IzhZpHpqDcXcpPwspvXGyzCUMvT2jVJX0/m8te8wiKPu/hhwFFE7g
-ZNhMUY130UoKbc8SUnEXz7FxObxarwquhhFZuks3hVV1FDRFcKxQDsWdfWJWIzk=
-=xJ+C
+iQEcBAEBCAAGBQJR7pufAAoJEMbwO6tnXQ0swMoH/Roq66IAwZ2SelPqN9yLAhry
+wPlOtFchIcwpt8TV1oEExGKSJyjPttL44Dff42qXpmvXLq/GHAYul0d1KaF/Qt3Z
+KBb/GzkADoxyDi5nN/GuwLMtjmD+HD9aANPslic5t8RXmpua9xw+BgQGVvANlqwp
+PoYHp6gqMCy3keOsMFiop3qNasXJeWeHS6NTcFHEb1DwA9EmoZ/2xJtZgxu02ZZT
+38FUbXjPe/XG3ftG1v1yy2YlOCvQnRjIFvtZkKMvWbiMBSN1Cp61OhLbmNbGd9ft
+K601Kll39/V0wDJ8UX7gNbJe+q4krucy1/VvUWnRPn2dS8Mn4QQXtIpoMmbTB5A=
+=d4/Z
-----END PGP SIGNATURE-----
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
index 01b3939721e5..b581d5961f56 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.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/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild,v 1.7 2013/03/17 09:41:32 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild,v 1.8 2013/07/23 15:07:01 kensington Exp $
EAPI=4
@@ -20,7 +20,7 @@ IUSE="debug kde"
DEPEND="
dev-qt/qtcore:4
- dev-qt/qtgui:4
+ || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
dev-qt/qtopengl:4
!kde? ( || (
dev-qt/qtphonon:4