aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-05-31 02:20:27 -0700
committerGregory M. Tuner <gmt@be-evil.net>2014-05-31 02:20:27 -0700
commitba6a3e8b54ab8f427395a3343779fabd42b25c8a (patch)
treeabe9278c00c635fbaeafdc3384092c70831db4f3 /dev-qt/qtxmlpatterns
parentapp-emulation/emul-linux-x86-qtlibs: update to depend on new qtgui rev (diff)
downloadgmt-ba6a3e8b54ab8f427395a3343779fabd42b25c8a.tar.gz
gmt-ba6a3e8b54ab8f427395a3343779fabd42b25c8a.tar.bz2
gmt-ba6a3e8b54ab8f427395a3343779fabd42b25c8a.zip
dev-qt/*: fix a crapload of broken emul-linux-x86 blockers
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-qt/qtxmlpatterns')
-rw-r--r--dev-qt/qtxmlpatterns/Manifest2
-rw-r--r--dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5-r1.ebuild5
2 files changed, 4 insertions, 3 deletions
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 4535331..2eebf0c 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,4 +1,4 @@
DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
-EBUILD qtxmlpatterns-4.8.5-r1.ebuild 1057 SHA256 c8d6d88881b5e4ce751e79452a9b5301073c748487b5227a4dd77b58025a4a54 SHA512 075fae682f8abf656ce0b9c819fa39f3da07d8388e36085725461d3437f0e4f17e4e85accaae9df194ddf687bcb7de8f7e2458780974a818632eab47e55a6013 WHIRLPOOL 320316167027998b26bf9aba1c7fa0e0e0171034e78ac8462838fadce9285eb00058828199f4f5516a1a658e531caf0ca865d671224765bd83a13c1614f57307
+EBUILD qtxmlpatterns-4.8.5-r1.ebuild 1060 SHA256 558b35dcb1f2a99397e12caa2870f5db4bf385d697942245d90def644af9ed16 SHA512 6b83969e6d3f7ad760c2c7b7c7d468c6328562ecfd3b3afedc0535dbbd6b6b5ae769e4adebe0aacb2645fe583ad5529c81f6319b8930d6e4612d31b8c97f41ae WHIRLPOOL 3074adb80a5a92b2acd72dff62db35d4717f5e88e766e67fadf27097d559c1c98e240aeceed8455bf2a30f3ab3755b42e2513841d8749af61c019c8165759c27
MISC ChangeLog 18544 SHA256 bc9103ea098b08514a7c9cfa1399667194acb9f099a307fde47c04a8f0590154 SHA512 a96019b8ef0774ebf49822c88023ea82892178d4727229b0009bf48428d78cf2e174b47840e7326e18e786b5fcf2afafa76fb6fa5e50f639f692918a7acb0673 WHIRLPOOL 6b25278e23922684ed6d130c35621865270b2777b16a84253414c107bc43fe43dec0b1bb77ea7785bb966fd77d35d82fbd7f9faf35cb90d446a1d17fe2fadde0
MISC metadata.xml 355 SHA256 606f8fd49a8b418a4de318e62c5d44040136a2c0a4ebbb1eafa8395795d49255 SHA512 95241a16bde7d1487f04aba1043a79983deedc6aa9dcde317be2752f17fd9ec130a30caf32d9dd53f8b5ede7cc992af793fee90786ce7de9233d40e0d93741d1 WHIRLPOOL cbec0d7c8d7a68a3cf9c4020e601ceff9d5fed7211274269af68d0ecc6c3a7f286a192f31b00fd2a36dd4eeef38732a673c66f6bdb6fa4f8fd55e08c0f55a89f
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5-r1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5-r1.ebuild
index ee3ce49..5093d34 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5-r1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5-r1.ebuild
@@ -17,12 +17,13 @@ IUSE=""
DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}
abi_x86_32? (
- !<=app-emulation/emul-linux-x86-qtlibs-201310081
+ !<=app-emulation/emul-linux-x86-qtlibs-20140508-r1
!app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)]
)
"
-RDEPEND="${DEPEND}"
ehook qt4-build-multilib-global-pre_pkg_setup my_pre_pkg_setup
my_pre_pkg_setup() {