diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2014-11-26 18:27:02 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2014-11-26 18:27:02 +0000 |
| commit | 572cdcc4a33f428da906199a27fe23f1efb57016 (patch) | |
| tree | d4128af249b7435cbae6811615c0ca1eab190ade /dev-qt | |
| parent | Android SELinux policy has hard dependency on java and xserver types (diff) | |
| download | historical-572cdcc4a33f428da906199a27fe23f1efb57016.tar.gz historical-572cdcc4a33f428da906199a27fe23f1efb57016.tar.bz2 historical-572cdcc4a33f428da906199a27fe23f1efb57016.zip | |
Restore mv of compat headers in src_unpack, accidentally deleted in the previous commit (bug 529398 comment #6).
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qthelp/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-qt/qthelp/Manifest | 32 | ||||
| -rw-r--r-- | dev-qt/qthelp/qthelp-4.8.6-r1.ebuild | 8 |
3 files changed, 25 insertions, 21 deletions
diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog index 338fd7fc9e5c..1b185ef1eccb 100644 --- a/dev-qt/qthelp/ChangeLog +++ b/dev-qt/qthelp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qthelp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.24 2014/11/16 04:06:13 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.25 2014/11/26 18:26:53 pesa Exp $ + + 26 Nov 2014; Davide Pesavento <pesa@gentoo.org> qthelp-4.8.6-r1.ebuild: + Restore mv of compat headers in src_unpack, accidentally deleted in the + previous commit (bug 529398 comment #6). 16 Nov 2014; Davide Pesavento <pesa@gentoo.org> qthelp-4.8.6-r1.ebuild: Fix build of QtAssistantClient compat library (bug 529398). Fix assistant.prf diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest index 676d18b2ba5b..ab902bb7b682 100644 --- a/dev-qt/qthelp/Manifest +++ b/dev-qt/qthelp/Manifest @@ -8,26 +8,26 @@ DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 DIST qttools-opensource-src-5.3.2.tar.xz 8993140 SHA256 5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e SHA512 f250e8c309e47cd5196ccc89fb5a0d384b40bbefb243f2ad9dafc6b9096bd5fa540cd471322e3601afd0b88906eebcdf03097df079c80f3816d99d5a46b473cc WHIRLPOOL da5b6ad57dc0ecf6c67d46f91b0fca0df797a92918389b385819677abaa0d8d7866acb0b4ccdcb2a326cbf679f67f0de05fb9de497d5e8c2fa8c4ea83cbf1c68 EBUILD qthelp-4.8.5-r2.ebuild 3221 SHA256 557c2fb440f163e93fe5088223840c76d9b267fb0c1715e0584ed2ee3f668043 SHA512 84b2f11866c095d31c7833653ac7f65da0f8a821a5af213f4759df6d34baf749fce440004b22eabea79863b6bf204b8e0dc454be0365fdced036c8e6c5a49d21 WHIRLPOOL 2954c1bd8dc09abd85a56402854ff99477b2b434e74a70ffaa8c47c0e4ebdd5e007cc98f15c2ef69c7e1284700dc95d4423a6e785588c1316681bf9314f655ac -EBUILD qthelp-4.8.6-r1.ebuild 3262 SHA256 458de42ca430a80b9ee827f017f99e20e84e3088a48cefd280aca9300e333424 SHA512 fbc671105c89733873ea83ae6bcffccc8873cc470dd1611bc88370c525a1b662df5f0341198c26250a9a2d19db31f3d2d0fa48909af2f60428b96b4b8a8b363b WHIRLPOOL c615aef48b9df0d49aef6d440678a245f34418de767030dbbe22829a1638ef6a87e3e66eaae2b47c642cb39e42854f1af85e361395512778442b3fd638e2244e +EBUILD qthelp-4.8.6-r1.ebuild 3311 SHA256 28e88bb84c36d37df1c7dd13c345bf8f85b2bdfd354a1ae794f5d1a9bcf9a320 SHA512 03ebf2c8d3cc9a91650b8ee4b0852d8b085097643786fa5d5c8f7f29eb9a0c9a49ad82aa1ddef12180d301edb8d89b4ac4dd7fa33815ac3dd0616f8f3f1dc645 WHIRLPOOL 7776e0f0efdd499bdf5d9d7bc50ae0eb60653d2ae1ef6f5e18d7e6aed4f9cc7ad1dc92ea9cdcd4ee1b51a23f7869e0a57940e88313383a7ef9d532093b74f5ca EBUILD qthelp-5.3.2.ebuild 782 SHA256 f3a982327fa2ecac9e19117f7502756b368c96471de822222993e0fb1168745b SHA512 47ed43eb0da26a223508f4c1104a2a394aa581e0056a8d6ff3ead08396892345a9220a632e6ff4aeaaafdba79ddf559ef3e848b602cf9138c6767532e0918f2b WHIRLPOOL c29c99e1941ed6bea908a3ab532411d4809b1aa3913ef2331581f626c9bf659ac952fc1cb6dbe1d16e90544e1b382e818d4bc798c6caeb50b6817ad2faf65e0a -MISC ChangeLog 25268 SHA256 0c24549b77b7c63b1468dc89cbe5358d3e9b425a9022054552345914c9d14c9c SHA512 dcfaddfcbaca3415e352a3db43ff474bd28f08a95a6342bd97d52da86484a7e68be2e9b30307900478130b886a88cf3e26606507bcdcf0311ac1e16043c8d2fa WHIRLPOOL 7213a1695c6a5ce1f3a63740ca7083a8b4f552ec057c343096b09842032fa587dd9eb7d82ca459bb6c69403bc5ef8668a7209ab406f6e22d8407e56e8bca22b5 +MISC ChangeLog 25460 SHA256 7a5e443a1bc4871118d3cd63f6c0679d8f99ebff44e47466ebcb018c539018c4 SHA512 eddda2e1b42d85c5605978c45eec35d02f3d50326f1f7c71ab58b89b12305b1678663b1dd27549e5af2f7f309e1d47d74c5a7b81b5a099e0191f0ecc23a1f226 WHIRLPOOL 6b22da62997deeb4321990e122eb1a5a03cda1911f9b31b11ddd1b14ca649888e39c4fd4efa8296317c56ad764f24932e21e594d04c0e276554a882b9759fa86 MISC metadata.xml 628 SHA256 cc82998d8784865ec0aa746a59af9d0231e131d0d9137d3677a5b46499c64202 SHA512 48d153886abfc84577c9ccc2a95ff1407d44f91eb9fb5433415406d02b16830189c94883d5eeeef1b2c47690dea0c7366bc0ce5e7bd3275a63fd2fc394b20efb WHIRLPOOL a50fe577e08574e81c09ddc4e68cdba2cbad81069f4e94dd5137395dbbacfefa70c95351ea745d792cceaaca1e051f80d209692ab59e1da22418be3f13ecc838 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUaCK9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUdht1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE -QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9JUIP/1O7qO03W8zeTMiw+73ToxY4 -s8/EiubaBpohKtW11yOQIJisybO1CqcRneQmRCwH6+I8FM9sAEqIDrgZkvTH019u -1JLdlxRdQL2N1X0fQPsxKV2GkpORTT/+Z6bYzcwYZM9M+SL01b6ll8rxxlMMoiUp -ACY1qELL1HgO4wnG/5Vu94KZ7P+ZbztazxYPXuo4RobR8YG5G/vTO3NhaFQdEp92 -gOvIDC48OGxoPJJgMYcc6oYJ52BSIOvSXwwIc068BVe19aWE9cZeM/QI7OFI9dHr -YjsyLiqX5taar6tn13Z3mCuysp4OSenIX3Rv8dm9qMaLCQ5K41H8wp2C8qFu+Zfm -5nr1IxWBH5gfoEMuUWzLUb1LRQHdeiIqSGoRCmuOOJkPvrw+gQR8y7i1KM6ytm6D -XInyZSraTB0B05YoQVyOrly2yhW+PUQGSyNpBXsdT4TBsBa4Bj/ly9eu/1xjM9q6 -nTNYG9rpXOpbqVvS0Eqh1CcErxI/wHnGs9PHKj8y/480l4IS6h2CaSHsrE9cB60l -cHdrhaLmOOdkSAyiCV2Ub35k0/hV1kAl6L+CfE7XdEXk53iB08rp9wEaZK5e/0/n -oHGpDeZ+cKNGS90SuHJHxWH4L7nOENNeccxM5oIwSzDrqVUTGpssnZh4pqJ+T0p6 -235iof9qkVWe3O/M5yKy -=iY9E +QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9G0UP/1csOVz8Q5pdq8uDs8I1B1rf +vBdPEG/+O5pna0xXRWiobhR3rZ50X80PGB64y8vNCAIGzOaw8KszcA36y3JMR1ol +jUGXhByiBgyk5eZinsnw/3n/m/ZOy49KPl0kUis0PDuctyYpUa0vRNy719qpKCD4 +I7tCUdqWHEBlAD1ymglD5uU3yM6M49m2MgOLLDN9JbHMZOfAl4eUuUYUTXBRtHGd +M4OAnb176ZnhQ6djTyi+im7ZelmmgSJB6McgsTzvbT/ruRUlh+FAHTu/43oDsYkl +vvL75p/z9xc83IXhsfGp79cmLglA78oCbcLYUKRfC78rnyTRpJPOV1aY4MCtgJ1S +VjmZrhfrhUy4iakWUvg+q8Bnd+cEbVGWfOYCdbtg7pUtqDxD8oOge2UnlyXFmpq5 +i+U76P8AAbMsJ4cYNKri25SOla8Rj6UoMP0tPL/m1/ifLx4ED6D1+XvzVyL1yj/1 +/Nfpy00T5L/KFFZxP8f9CUubSuZtNqhArZCT6niOz4d+NAisPdr0q/xbpTmkdcNb +y20NKll0hjaEqc0JuVDO5u+CePTZQv8QboFjRYXJKVeYA6EkBQguOFl0JhQgM0H0 +m4KGmVopNZvjlliuaXUr2Yjww4HzseYD5u5xam9OoREH+MH/G4XvsBEKHsFCWFd2 +a4xUdI/98HvF2re3d6p0 +=jKbJ -----END PGP SIGNATURE----- diff --git a/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild b/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild index bb045d479af2..1b72a8776d63 100644 --- a/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.2 2014/11/16 04:06:13 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.3 2014/11/26 18:26:53 pesa Exp $ EAPI=5 @@ -52,8 +52,8 @@ src_unpack() { # compat version # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ if use compat; then - mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \ - "${S}"/tools/assistant/compat || die + mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die + mv "${WORKDIR}"/QtAssistant "${S}"/include || die fi } @@ -78,7 +78,7 @@ multilib_src_configure() { if use compat; then # syncqt knows nothing about these headers (bug 529398) - cp -pr "${WORKDIR}"/QtAssistant "${BUILD_DIR}"/include || die + cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die fi } |