summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-07-23 14:24:00 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-07-23 14:24:00 +0000
commita1a17a11276621e06fd53b081092d4388de723ec (patch)
tree45f182bfcc1b0eedc5fcfa45d49d7d6df1782cbb /x11-libs
parentFix Qt dependencies. (diff)
downloadhistorical-a1a17a11276621e06fd53b081092d4388de723ec.tar.gz
historical-a1a17a11276621e06fd53b081092d4388de723ec.tar.bz2
historical-a1a17a11276621e06fd53b081092d4388de723ec.zip
Fix Qt dependencies.
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/libqxt/ChangeLog5
-rw-r--r--x11-libs/libqxt/Manifest18
-rw-r--r--x11-libs/libqxt/libqxt-0.6.2.ebuild4
-rw-r--r--x11-libs/qscintilla/ChangeLog6
-rw-r--r--x11-libs/qscintilla/Manifest22
-rw-r--r--x11-libs/qscintilla/qscintilla-2.6.2.ebuild4
-rw-r--r--x11-libs/qscintilla/qscintilla-2.7.1.ebuild4
-rw-r--r--x11-libs/qscintilla/qscintilla-2.7.2.ebuild4
-rw-r--r--x11-libs/qtermwidget/ChangeLog6
-rw-r--r--x11-libs/qtermwidget/Manifest18
-rw-r--r--x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild4
11 files changed, 74 insertions, 21 deletions
diff --git a/x11-libs/libqxt/ChangeLog b/x11-libs/libqxt/ChangeLog
index b08ebd639a06..97a847daf1d1 100644
--- a/x11-libs/libqxt/ChangeLog
+++ b/x11-libs/libqxt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/libqxt
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/ChangeLog,v 1.24 2013/07/12 09:19:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/ChangeLog,v 1.25 2013/07/23 14:21:02 kensington Exp $
+
+ 23 Jul 2013; Michael Palimaka <kensington@gentoo.org> libqxt-0.6.2.ebuild:
+ Fix Qt dependencies.
12 Jul 2013; Patrick Lauer <patrick@gentoo.org> libqxt-0.6.2.ebuild:
Adapting deps for upcoming qt-4.8.5
diff --git a/x11-libs/libqxt/Manifest b/x11-libs/libqxt/Manifest
index 233b33188663..bf724eaadf26 100644
--- a/x11-libs/libqxt/Manifest
+++ b/x11-libs/libqxt/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX libqxt-use-system-qdoc3.patch 944 SHA256 cbd383b3dc9c749eb51c8947c0ce58336a7fbc5183385d9e59412aa4238aa065 SHA512 7c768228ddec02d1d49dc80e729f2f041fadd3baed27263efa5ea8a351298cb023933c4b347685044fab36936cd797b5df72d83760a5a252bd2b2bd4f70c21a1 WHIRLPOOL 81027d4944109d17cedfe7cd0fe08fc0a2694210a2b855fe4c976b21839e7a3271a18b86219175a239911b78b78f69ac43f1c90a35271aaca999282479f21108
DIST libqxt-0.6.2.tar.bz2 2197939 SHA256 c59d01373e6bf1bf7072d5e80b95fb803a884ecd19997d3a25903f3fb7f0658a SHA512 45be88acaf7e77b8db2c60130fd6a7209a1d06140bf8aeb2cfa288652b36ecda0fb6917ad8060b03e7e8a0f6c4ca34f0c97bc2d73d9ec0d100beaa1a46df51ae WHIRLPOOL 6457b374dc8d85a4260296b3cdb3f3d12b59fa19475d17c020818fbb99a2380a9cd54eac71a7de58af0ec07d02b40fe224a2394a2e2c1d098ffdfd61d29223c4
-EBUILD libqxt-0.6.2.ebuild 2204 SHA256 236a4232b4b67af949909fff1eea7fc9e280036f7c898a311e53fc6cb41d5cff SHA512 58d8d87370c7daa32e833b45ee222eb5cd39498838adef9d33648fd20ddfe9a38284927141e116068dd8b69d0640ae0c2290ec1a69961483747de81f9d77f426 WHIRLPOOL 88ff95ada46daad29b188118a1f8561948bd5f8d77e9c5eca5aef6158f85067d860e9f334e3e2fe4f140d16bf03a91f8f16c877439283dccc93c68325fba9296
-MISC ChangeLog 4490 SHA256 a9b1dd6b1aff7ba50e10b249c0b43c626edf445d182b2372d8ee007812df6e9a SHA512 fa2c734ddb69a7a9462bee6bed48171883ee0a93b565978e66ea7d14a65aed35e40074fc5115bf327e365999a4356a34fa1d4921a5afe6c9c10b9417993a590c WHIRLPOOL 1543130c895d9527dde79ba214ff474db1b5c79b2cb7e9071e4b640fe6367dee79dd28a72fec3a439c7b34acc95acc0d7508b6a030b197b7719b3363c45c5312
+EBUILD libqxt-0.6.2.ebuild 2209 SHA256 38cab9eccea67c349f31ebadf8c7b46b355a0db428efb05d62699a869afa344d SHA512 147c57686e94430a715475bfdabf95e27cc109505a742ab22cce004c2ad9136013336610714a656eb6acc1f0a1cadcc88eda4652e8c2d93deae3a3fc6ff7dc84 WHIRLPOOL 13c8fc3026c7b0807cacbd49b916a3a9d67c85c7735d797968d91c13ca35c86cc76a28712568c0a09fac1a4c367ce453617bb774cfcef7a46dcaf569547748f1
+MISC ChangeLog 4594 SHA256 c0f490a5fd8e2a6a908611f6edbc17bac08401d19d71d90da57533f73be154aa SHA512 f834ab6aabaf34df2478556897ee34137d11dca2fac651c8e74584b8796504fcbba70baa6c635e9393a5bde85ba297ed0ad9b0d940ab9048f2b7a98ffd42cac6 WHIRLPOOL 40a55ed18e2e1f26e1dfdab6077fc024fbf9ef460612627e81a784cc638aa155bbacd14d5cc016fc9b644bdfe88c12e5fb5b34d4405a89c803c26a49a3b41f2a
MISC metadata.xml 382 SHA256 32558621e45f23abea47a3279437b39e8383f2544bbdb7a2baa021ace33a6bac SHA512 98f84fbecc65794ee88b37786cf13d8c1d59877caaa0d666c603b82aef5fc653c44ae0535141003b9806fe68e2da1491c5d39762afcdd96c187084a7bcc65be9 WHIRLPOOL cd28f9cfb5349a33741697f3aa1dfe21ff7a3c7eabec6a3687fd02a1d5da6015ec92a404ead4574bcb06eb83ad63b7b96156ef389b0bb09fafb33ccc345eaa98
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR7pDXAAoJEMbwO6tnXQ0scVkIANdt+Iu/Y/raRPHD7isk1Laq
+GRb6AqbmQf8J7iY9V8vWQPCQNS+wjPpBhARQvH77RSlLJJWpCfiWgVP6XAZDu2/7
+zs1B0qZdpe/2FTg8q3JsAcHi8G37jqaCjkgIy9ID5xsopP1kerFVr9cu89rbX4v2
+ezHlvpKpNPBzG9SL8F/feU37BaWs1FtIQaE3iPsK+CnfX/h9pUJ1I81Uw2rcDUwo
+GP50iJizxSlFhQo4GAgwyeSlWV+B+ZlKo5UVV4lGsmYs2avO58o/Nf4f4x8/aNjh
+ozXLOH8uV/nJFknh1a5PfUGizfn8tWH9C10QC+aeDUrawgQPwLmOVKB2M1xWYZc=
+=wb7M
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/libqxt/libqxt-0.6.2.ebuild b/x11-libs/libqxt/libqxt-0.6.2.ebuild
index 3d1293b9a4e7..cc09ae48f087 100644
--- a/x11-libs/libqxt/libqxt-0.6.2.ebuild
+++ b/x11-libs/libqxt/libqxt-0.6.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/x11-libs/libqxt/libqxt-0.6.2.ebuild,v 1.6 2013/07/12 09:19:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libqxt/libqxt-0.6.2.ebuild,v 1.7 2013/07/23 14:21:02 kensington Exp $
EAPI=4
@@ -18,7 +18,7 @@ IUSE="berkdb debug doc sql web xscreensaver zeroconf"
COMMON_DEPEND="
x11-libs/libXrandr
dev-qt/qtcore:4[ssl]
- || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
+ || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
berkdb? ( >=sys-libs/db-4.6 )
sql? ( dev-qt/qtsql:4 )
zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 793978fac74a..02760fec2100 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qscintilla
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.87 2013/07/12 09:16:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.88 2013/07/23 14:22:33 kensington Exp $
+
+ 23 Jul 2013; Michael Palimaka <kensington@gentoo.org> qscintilla-2.6.2.ebuild,
+ qscintilla-2.7.1.ebuild, qscintilla-2.7.2.ebuild:
+ Fix Qt dependencies.
12 Jul 2013; Patrick Lauer <patrick@gentoo.org> qscintilla-2.6.2.ebuild,
qscintilla-2.7.1.ebuild, qscintilla-2.7.2.ebuild:
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 9cb5c9a8c9d9..56b3d6d78313 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX qscintilla-2.6.2-designer.patch 458 SHA256 bb73f63a41c86691058f10deb8d6429ed344c29613a2bb6b49e61ed6cc1c9b95 SHA512 abc27b859d0025f34e29bd159e438316347d64498939dff7789250909d5a85ac4498448c28a5949f7bcfede8ec046e371a52b33f6cb96fe5938b8e59974db4d5 WHIRLPOOL 644802baf2a7ff0392189fa4b08ce22b28a8254542098818f11e019a63e7817c357f07f37d367e4c6ca069cce897ca0bde320c028f2bfda5e10b2f20d44b3daa
AUX qscintilla-2.7.1-designer.patch 434 SHA256 fa643d33e12ce21d041230285ab71f989f84963c422899a74508f74a8299154f SHA512 bf257cbaf0e30f41ba674778cc8c37d6b958eb25cc89046b5b88c4e6582ddfe8eb4f4daea07a6d7cb23808bdf8ce26954c2470f499e1cdd957046347897fcb23 WHIRLPOOL 2f731cea40791890d2962a88b65f46f750f7b558f45c41692a04363e66f210b4eb56d087a7259c762094b1700cd8b63249b39b4e83bdc4078126447cdff644eb
DIST QScintilla-gpl-2.6.2.tar.gz 2662469 SHA256 fac245ecfa11676b0003ef605489f87332c2efe039a4111821aec61bb936c264 SHA512 5d92c70182817f34141c4166a41807a3ef506c38cc2cd3c83d140eeca329e4aa6f1fa379bb9422da95d65a3385eefc27b0948b342af89c93eeca49f233a63a81 WHIRLPOOL 9c2676e61c2706cc0d57fe7ba0fc00cd45f5a12646c8ffe9fbcd197b204cbbadbdc42a93781d07dbd7b198bbbb45584d74b6752173d150096ce900ef0de222cd
DIST QScintilla-gpl-2.7.1.tar.gz 2841363 SHA256 490e9679868704e02840f21c4892b3b939088060c17782d938895513988bfb92 SHA512 7e1c003ac210f27e60666385fa4b0b42b20371b48ac4a05b0a5740c963beaa5403df42e2d516bbe6e9eb3d2ad1e5acb5825fcb3d0b4aabfbe971ecae3c86296b WHIRLPOOL e1be53bf00122dffcba5704fb66f105f420386a7357088d8d92c01297769a24dffd0d5ffdb38a2949b0300427c72e6713094940abe2c5b95314801bb0d7cf235
DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
-EBUILD qscintilla-2.6.2.ebuild 1690 SHA256 847cc012b933d97843234e85a5672a07f7e850e582a3358be26547972f9382f0 SHA512 f81f520ec9584ec5458d422295269c7460071b986ed9d0a6cc7b8233076fbf5b4c734cc3cc7ce41be8f58e05789ab59a10ed692bd28ae91eca04db3c44f7ee16 WHIRLPOOL 60bfc7bc11b8763d804226d4f03795da279a95a7b7d47f7439553a1eb090b5400e4b72a1e7ed7b474e75b5e165d088e7ea010630ee983753bc329c2485a5f0bf
-EBUILD qscintilla-2.7.1.ebuild 2163 SHA256 a2afa0cc496e39287af0d759266f4a87f62a18914eb1d7086f8af8dcd22b0882 SHA512 29a964245ca5eae5f29e101983f64bd9b94030df1cbccda8ebd84962001dc1ffbc3495be88eac354100baf3731c938a01b26abf4fc126e085b88953b5c362d66 WHIRLPOOL fd1bc67d9850d31c0298ed80a133c6548a7fb1807ed9212cea4cd30391fd8b9c72ab519aa4631da04ba0957c0f2276594fabc05c1d3f51c2023e9cf62ed92d35
-EBUILD qscintilla-2.7.2.ebuild 2163 SHA256 faa6452303ebbd2f2597a27b95892de2838c54827bd5dab4585c19987d5aafa8 SHA512 93ddc7856e5a68a67943e229283b7d2372c4b787b0ffbe89560252ab076c5ad4bad96375426d5845409a0aad2e7676f5b00acd91a2094d5e99820db71d2acd9c WHIRLPOOL c14c8336a79321e47240a4b18cc21e71332918e8668ba92d5feb8d679cb69afb84b88d299f2d06ceb966902510eff38bd970b096d75cdc7d6d7478bcd0f4d3ec
-MISC ChangeLog 22260 SHA256 4f6bfc074666365b82226e40db0f1476afd135fa37fde5c88a02801209146ca3 SHA512 f8c4aa25b07623bf7197a5f53e2c5343b95d03260b6f1b364e06dc88e1419715c3cc6aea58c1298ba853a5371fc156d2f36e77693b395c18583309940944b213 WHIRLPOOL b9cddaa9ef0bd8be9a862a95d9a25f757dfb1ade431800c8ea63c9e0aeeb847d855d101a48ba24bba5d683e2ddfdd2cf27c8031a25104b86a4b2a6f495ff5550
+EBUILD qscintilla-2.6.2.ebuild 1695 SHA256 b70d93e927c6b78838a3e9342d4a596efcefbd7f457c877f968bcac8e1dc573a SHA512 75eb6f1103e3c98d8f861a9a207b3577a9c7e02b927fb6306d6f1d8bfbb2f17c7370c06e4bc4174b84cef8d59bd990e759b7820942a89a3e1e7c6071e89fec00 WHIRLPOOL 669cc8a196cfcce12978e2922b3a152bc90151f4c56593e62573fae39398a80537f30ae16638018d59d18c71262e86b6b9df7927da417cdc342ed72df006110d
+EBUILD qscintilla-2.7.1.ebuild 2168 SHA256 a2bdc0783df7c8d5a98d86904818e64cd9dce5ff03065d8214006fc055979995 SHA512 68d37462743ad0b5a4df24ba556b3b5fa5b8fd2a3b63e4654cc8fb81e65df08f4934399a83a5480cf815c960c981ab2f611b6e635034d0c039d1c7161466085a WHIRLPOOL 660231f8ead4691f34c15b936d87a81bb232a51dfb18196b35a2cecf7b6f771ac1505adc4ab4bd839a6994a152ecb56e49571f16b8475a7abf25a567607302dd
+EBUILD qscintilla-2.7.2.ebuild 2168 SHA256 078b7f26028b15b012ea337a3bb553cb301c91dbbea46a2e1f6371792379d7c3 SHA512 a7d26139759327c96362fbb9e8462b891b5aabf92939e9f22ab7ea1d8fa132c94e25e7b4db74e1ad79027a011c03f943e71b1df5cc2ee0cb1e4c0b31ef15ad9b WHIRLPOOL 700bd1dc0bc62046a85e0dcf642dfecf6e8e2901eee732f5013a5ca8c4aa19e15b544aa7d3ac993d4d9ced7f59edb17cb15b7f5badfaa7533f1a87872e343d8d
+MISC ChangeLog 22420 SHA256 9c52c8d1e86f5ecaf301a0055a78d7ffa84c0be1d83987eadaad05077e240cee SHA512 54560a60b75e52f0377c0ddd656e3e916d78772bfba89759df975bd2499470a7ae8464723549d2f0c2f06fe659483061647d80f67578c801dd439255645c6f3e WHIRLPOOL 9de31c4ec219790e7609ae4af226c06716fd322b60cbbaff85a3dc5359d3fd3073b87af1d30b3717d025245b88bb13f3c881daecbe5d0ce9be867515a831c449
MISC metadata.xml 175 SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d SHA512 bea471fa9163260e9198463bcd8e6f2a88f9fb25dea55be266216d5f99abf1492d069f8dbdc111e4a26d87928f44a19db96562886edfc0233d5a9c5c947fdc7c WHIRLPOOL 4266a6076b386b6bd3e374650ddfa7879920261bef209534de056c935279dba6da27db83162e5b73ed05d3a82e47f5b839274f8137d525ff4c68073f5efdfe6c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR7pEzAAoJEMbwO6tnXQ0sG+4IALX56Fl4RO5tqLwwoLE4RjOK
+ZlHTN8FKJDiqrlr4DOoonG6xLLNSXldYR9WDBo4kY3GZwXyiaTh4uRquBubOmDB6
+F8j1ietNF79Hzo+B0o0xf09qxRmA4cg0Y2QnFr5PJwIx7ZdMGueVCcjiRJHSVAuA
+JJgJ27dT07cWdtPgflVkrudutISCW3n4YiCOmF3WngumKuZ0B5EQE9Xpk0mUb7Ff
+BkkstH3sQjGyJWa/DiIPXFxFP6aYLhtvVElO4XenbA0G64iNsklGV/YUI1hPRhxK
+g903W1Y/pDafURgnRfsGw8hYCvI4LubSAshUSKxRfYUuW7op9cs2WQSCyNomMyg=
+=NNPq
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qscintilla/qscintilla-2.6.2.ebuild b/x11-libs/qscintilla/qscintilla-2.6.2.ebuild
index 917713b3de95..b2caec866301 100644
--- a/x11-libs/qscintilla/qscintilla-2.6.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.6.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/x11-libs/qscintilla/qscintilla-2.6.2.ebuild,v 1.8 2013/07/12 09:16:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.6.2.ebuild,v 1.9 2013/07/23 14:22:33 kensington Exp $
EAPI=4
@@ -19,7 +19,7 @@ IUSE="doc python"
DEPEND="
dev-qt/qtcore:4
- || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
+ || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
"
RDEPEND="${DEPEND}"
PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
diff --git a/x11-libs/qscintilla/qscintilla-2.7.1.ebuild b/x11-libs/qscintilla/qscintilla-2.7.1.ebuild
index cf25bf5065ec..fafbc525b89a 100644
--- a/x11-libs/qscintilla/qscintilla-2.7.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.7.1.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/qscintilla/qscintilla-2.7.1.ebuild,v 1.3 2013/07/12 09:16:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.1.ebuild,v 1.4 2013/07/23 14:22:32 kensington Exp $
EAPI=5
@@ -19,7 +19,7 @@ IUSE="doc python"
DEPEND="
dev-qt/qtcore:4
- || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
+ || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
"
RDEPEND="${DEPEND}"
PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
diff --git a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild b/x11-libs/qscintilla/qscintilla-2.7.2.ebuild
index 355d2f8244f8..ecdf95a81598 100644
--- a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-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/x11-libs/qscintilla/qscintilla-2.7.2.ebuild,v 1.2 2013/07/12 09:16:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.2.ebuild,v 1.3 2013/07/23 14:22:32 kensington Exp $
EAPI=5
@@ -19,7 +19,7 @@ IUSE="doc python"
DEPEND="
dev-qt/qtcore:4
- || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
+ || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
"
RDEPEND="${DEPEND}"
PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
diff --git a/x11-libs/qtermwidget/ChangeLog b/x11-libs/qtermwidget/ChangeLog
index 39e2b08aee95..af0f95cff710 100644
--- a/x11-libs/qtermwidget/ChangeLog
+++ b/x11-libs/qtermwidget/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qtermwidget
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtermwidget/ChangeLog,v 1.4 2013/07/12 07:56:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtermwidget/ChangeLog,v 1.5 2013/07/23 14:23:45 kensington Exp $
+
+ 23 Jul 2013; Michael Palimaka <kensington@gentoo.org>
+ qtermwidget-0.4.0.ebuild:
+ Fix Qt dependencies.
12 Jul 2013; Patrick Lauer <patrick@gentoo.org> qtermwidget-0.4.0.ebuild:
Adjusting qtgui/designer deps for qt-4.8.5
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 048c4a830f50..b2b937c787c6 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST qtermwidget-0.4.0.tar.xz 152952 SHA256 c3e25499109db93cc169f8c7fdc8bd6c98e7712acc21a73e5d88148540582508 SHA512 2f2fe47531a0a0103956174ce69bbb954f0a1b4aedc0a6413825d2a4dc7ff000792a06d37bf0fc9f3f6caec963c831661eb79497217003c3c53b935fa702336c WHIRLPOOL 0fa3efa00cc4d98b154c6f4ae56ab60d2318c637ee544e32b39e2397cbd898ee0aa48762a7aeafe8de47e33b7b49b094421a765a4c1931c4ae7d33e3f9460620
-EBUILD qtermwidget-0.4.0.ebuild 561 SHA256 a299d9c186302b850368f25013828bb794ac9e724a7d09f71ba1fcb8a93d3c1f SHA512 82f61bbf777c3feb74199f6336f1ad72295355e153c27f278599ab6d6ec0a738f7a074b459ff3ed9901ca60a79477e8a650a1cc9c189b3f33465bcf491eb7022 WHIRLPOOL 3c4fef1141d78bad115deedf0c48d0490df2671300ff193d9e61c6ee0a3285f2f2bd67416e5c55dc2c598683169f5e44476213a56dad7cff484546830ef2b393
-MISC ChangeLog 776 SHA256 42062046bcabbd4f878f56e72acefb2a9ae1e1b514fbaea62ffa8c606af4ef85 SHA512 b2f196b9c372cecb7e4fe747da926557386b130bb561c0116befaa3f9d91affb57aab66029586ab049b94d66f83d2208060c82310b956a914fe5334436f26741 WHIRLPOOL 60a846f2de30e1dfad7bc8583e1925f0d03094d013d5488786d991628f3d117d293b47e2d1d016a1a1beeeb53996db5255852785340e42b84293304d27a6ab2b
+EBUILD qtermwidget-0.4.0.ebuild 566 SHA256 f34aada923b57859cbdb1aec080d4f777c7bd78d5905f4980343a78381eca97e SHA512 44e6009378c9e03f81e2d775702e392c45d116247cd3f759de8c729dc04f6f32b8fd994db4dd28ce1f4546e64fafeed112d6ffe2554dff3069ab645d04dc92c6 WHIRLPOOL d0527c6e033cf1e938890560542a26ae79a5bf3b3d2e1665866a565061a78aaa66d09bddc23534dd4b1bb1055f21dc19723bcfc5ab3d8aa55af816d7d8e2e931
+MISC ChangeLog 887 SHA256 4002c9629ba716ddb771f408068df0176873e688d21ff9a1a61f89842ccafc3b SHA512 d1e113e01337bb71d4f6dd0befc7b726ad6c01972b3c4fed4635c12ecd71e8908780e757b414a23008f8bf2850ab9a1bfe3531a3a818162604e85bc3f6953a31 WHIRLPOOL 26ca573c5ae1cc76dfb25314394f882faa4cb04ee9b899ac8393c88185f11e09aad029093bc53335223701f83f101c63fabb44a6abfedd88fe4c36217a5717fa
MISC metadata.xml 425 SHA256 7e723e57d3591b94de717ce3ae15d75be8a85f2c1a9086f9899ada6dc7183c53 SHA512 5ab49b9502a89bc4bd0b5341e7eff148dbe9d0c258a2f6da89b2c9ed22ae1c0b85f549a3d28ff7fee687a1ccccc419dc9ecb5bec3c979dc7e0f8dac1c7ef2473 WHIRLPOOL 1522e4b95809054c7aba7da6cecdbef2cbd8320a3239172f6c921d48632180d18eb0eb337b7f20e30072219402edf3c2436f86290aaf8eb80595508ec17c26a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR7pF7AAoJEMbwO6tnXQ0swFcIAKEE8C5+RrbYKiEdTLQLpyse
+kjXJGx+UnCV/iR7UI3SgE6Z87UB5nbFf/UyT2XJrBFv9h9F8EwBO6GHaFd85Hkw6
+ZT9wGSvj6aKBa8/sfaePzjLeeQ2uhtd47Uetm5w/Hju+6V8g2qEWxOyTAR0JuOV8
+Q9hQAyEw8mv6yIu2hSPc1S4AIfAmMszAQet1osIm1FXPnKMQ9u8bJeP8vJQihQEc
+/qAfF0Yg31FnNd2rUDqHR8wsu3e03SHoUtVpN1MJhh02NbCMHTBSCvqPIwJBg2EW
+nW8e2E3uy0ZEtcDhyZgjTyNXpSsj2JJPHkzS3T7vnqQEx8VnxJsd0rXhvXnZjlI=
+=c1Wy
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild
index 03cdf955f626..a6bfaaa117b8 100644
--- a/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-0.4.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/qtermwidget/qtermwidget-0.4.0.ebuild,v 1.4 2013/07/12 07:56:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild,v 1.5 2013/07/23 14:23:45 kensington Exp $
EAPI="4"
@@ -15,5 +15,5 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug" # todo: python
-DEPEND="|| ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )"
+DEPEND="|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )"
RDEPEND="${DEPEND}"