diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-05-31 02:20:27 -0700 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-05-31 02:20:27 -0700 |
| commit | ba6a3e8b54ab8f427395a3343779fabd42b25c8a (patch) | |
| tree | abe9278c00c635fbaeafdc3384092c70831db4f3 /dev-qt/qtsql | |
| parent | app-emulation/emul-linux-x86-qtlibs: update to depend on new qtgui rev (diff) | |
| download | gmt-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/qtsql')
| -rw-r--r-- | dev-qt/qtsql/Manifest | 2 | ||||
| -rw-r--r-- | dev-qt/qtsql/qtsql-4.8.5-r1.ebuild | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index f78de4a..2ea50d9 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,4 +1,4 @@ DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtsql-4.8.5-r1.ebuild 2534 SHA256 f745eb24b1b0abe1a35be888de76455b928bad8bfaf9f546d808afe7053bf384 SHA512 6663e648122235d90c79a2b92a151caa7eb402de4b75cb392041ae65610e18a40143f226c2ef5e70dc9ae7806db3bf3a419a752ad7a01162d54350544fe42650 WHIRLPOOL 21ae43de69ae92ed4d564b51291849f1e8bfd4026067880b637be790baeefe4b794753ce4a413ed2569733581037a75b9b73e9e5582a8fc45d69155a1cd18b45 +EBUILD qtsql-4.8.5-r1.ebuild 2537 SHA256 e27af43e7335233e084255a2a1be96c7141bf5965728c952d415dbcdf8e047c6 SHA512 32b0d1f7e0c31ab5e9d9cbe2316831b0ee86f829fb13943fd419ee40f6dfa467f1ad12b8da2fb3d538c61f3f8bc3d841643ff40bd2bd7bf4a40958419ba0716d WHIRLPOOL 53d33bb788b462e0bd9e4de594aa49cc67d5000fce7271129b44b78d9211da97dc278f305932e8b5b46e9333bc78be15d2fbc1a0dc36e3952b30d32cf76a6343 MISC ChangeLog 19868 SHA256 89c3176792dfaaa368d8b89ce939c28a69d16a63327c0bfda6fe821aade4ff9a SHA512 9b7bea39e32788bcae8dd7289d14975251349bd57644989060e5d6b50711ae55073fa83ff358136fc4b70a4b56007dfb43649e40bc06699c35b25c8039137862 WHIRLPOOL 1e272e2cd0f90f52b368ceabca9d7c0ffdfbf466eb565c21e32be5f48161ab3be9bcd3d0a3c1f951d91c1cc78ed636e6a9918547fb032efe19752d45c406f6f3 MISC metadata.xml 557 SHA256 c5a26c7fba2094066fe31576bf73427ff216fd6b7f85421101e5466424dfff4a SHA512 8b78c0325ccf4439d87f9de6e6bb032e20caef10d5cd126d266c928f0deeac2fb9fc77fcce7c763fb3133a8cce907fe8f9462fab74fe8509a85f4edf49769960 WHIRLPOOL 9b15e75ae1e15f7a140e49c85efea8ebbda065cffd09588f391fa2e4d801ca36e965e9fd04f5e91d53f9a88bab5e1cc0153a0319c6fb5cf0483fcd671296b79e diff --git a/dev-qt/qtsql/qtsql-4.8.5-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.5-r1.ebuild index 976f954..2d55c0c 100644 --- a/dev-qt/qtsql/qtsql-4.8.5-r1.ebuild +++ b/dev-qt/qtsql/qtsql-4.8.5-r1.ebuild @@ -28,12 +28,13 @@ DEPEND=" odbc? ( || ( dev-db/unixODBC dev-db/libiodbc[${MULTILIB_USEDEP}] ) ) postgres? ( dev-db/postgresql-base[${MULTILIB_USEDEP}] ) sqlite? ( dev-db/sqlite:3[${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}" pkg_setup() { QT4_TARGET_DIRECTORIES=" |