# ChangeLog for dev-qt/qthelp
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.29 2015/01/08 22:29:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.30 2015/01/25 18:20:27 jlec Exp $
+
+*qthelp-4.8.6-r2 (25 Jan 2015)
+
+ 25 Jan 2015; Justin Lecher <jlec@gentoo.org> +qthelp-4.8.6-r2.ebuild,
+ +files/qthelp-4.8.6-fix-compat.patch, metadata.xml:
+ Install compat headers
08 Jan 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml:
Update upstream bugtracker URL.
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
AUX qthelp-4.8.5-fix-compat.patch 537 SHA256 625a9f9e1a0dd4c9e44ec40c119a88922f387028c988dce5ecca6dca848799ac SHA512 2de58b8830d82ee35d2d74c2809930c0a5e2df8be14eee73464c875100b9106249cbaefc7f4218f46a298908755312d6a1fd58013f089bbf105c931f93728b39 WHIRLPOOL d27b279fcfefcdf75b863f1ecab68d051c626eb2ff0d994545ec596133ffd528fe5aa5e94442f699f5fb1bb438e46d7b1d06daf295a97e475eab12a315421340
+AUX qthelp-4.8.6-fix-compat.patch 1245 SHA256 832c5bf8d6102c68207be641026e31f54ee985969bc4f2c9fb1f9bd9a0487a18 SHA512 28b14bab741fa8d9a594aac745a28307624715f7c42bf1d857406f7b2ee8f50860be1b43e0cd5535c0631f9d546bbec147359d81f00cd0029fa45f5fab122d93 WHIRLPOOL 1f4129c9c5260265b8fd9ac94543d46ef0e16f447d5fb1dfe8632b692c525d6fde3245f05b3f1447d5639287931dc8c686053ad2fed0e2809a4ffcb737152bb7
DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b
DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
DIST qttools-opensource-src-5.4.0.tar.xz 9261924 SHA256 5a85a096ffd30463781dc3871ad9640a510eba0086188c7943d23adc3660741a SHA512 31a830eeab29888f6af946b02586f99dc7e6a312bb1f6c7119fdff02f1b947c8192f54cbd61d46242b11ff5e1ea4ed7d1874d369cc359d2e4281f9b6fd48a943 WHIRLPOOL a0836cb0f4cc0a5b3eccea3230a4e5cf61fc04d874ac0bc7f50c4a17d8aeef5e5cc3e2c139cc671df77be56ba0bbc0f9f506f8e28b8caef2799bd57818a139cc
EBUILD qthelp-4.8.5-r2.ebuild 3221 SHA256 557c2fb440f163e93fe5088223840c76d9b267fb0c1715e0584ed2ee3f668043 SHA512 84b2f11866c095d31c7833653ac7f65da0f8a821a5af213f4759df6d34baf749fce440004b22eabea79863b6bf204b8e0dc454be0365fdced036c8e6c5a49d21 WHIRLPOOL 2954c1bd8dc09abd85a56402854ff99477b2b434e74a70ffaa8c47c0e4ebdd5e007cc98f15c2ef69c7e1284700dc95d4423a6e785588c1316681bf9314f655ac
EBUILD qthelp-4.8.6-r1.ebuild 3311 SHA256 28e88bb84c36d37df1c7dd13c345bf8f85b2bdfd354a1ae794f5d1a9bcf9a320 SHA512 03ebf2c8d3cc9a91650b8ee4b0852d8b085097643786fa5d5c8f7f29eb9a0c9a49ad82aa1ddef12180d301edb8d89b4ac4dd7fa33815ac3dd0616f8f3f1dc645 WHIRLPOOL 7776e0f0efdd499bdf5d9d7bc50ae0eb60653d2ae1ef6f5e18d7e6aed4f9cc7ad1dc92ea9cdcd4ee1b51a23f7869e0a57940e88313383a7ef9d532093b74f5ca
+EBUILD qthelp-4.8.6-r2.ebuild 3304 SHA256 ebfe2eeee6b79e37863afb006050938f3383674a3f53f5f71ba2cfeb4343cdbc SHA512 a475553421e273661645ba34dfcf9b4432ea9fbf191c67ec6be48a20cb2f7c3bbfb36e27c09054ed72acdcaa83d6eca01e2459b87e75e138550d645b4c44f7b0 WHIRLPOOL e979d63f9965f29b385fdfd98d4df45e4067bbaa087433737b18125e27a654aa651f5baff6dfa2feeec21f39b4a36ce0e763da7dff49447dd165406bc6ed225c
EBUILD qthelp-5.3.2.ebuild 782 SHA256 f3a982327fa2ecac9e19117f7502756b368c96471de822222993e0fb1168745b SHA512 47ed43eb0da26a223508f4c1104a2a394aa581e0056a8d6ff3ead08396892345a9220a632e6ff4aeaaafdba79ddf559ef3e848b602cf9138c6767532e0918f2b WHIRLPOOL c29c99e1941ed6bea908a3ab532411d4809b1aa3913ef2331581f626c9bf659ac952fc1cb6dbe1d16e90544e1b382e818d4bc798c6caeb50b6817ad2faf65e0a
EBUILD qthelp-5.4.0.ebuild 788 SHA256 7d5f3b546981e70f3729ec0fd718daa834a0375bd2dcf14e4a7d410b86c446e8 SHA512 89f9b56564c9eff05cdc0019b86d0a3c5385506ee047853992449aa948d1ab73fe8329b94a2a877af78e6a82464d96f5d71996e13d4dc9c42f5bef11de2e059d WHIRLPOOL 69265e92c7cdd2b25f9a4efbc325d6cd11ee9e450fd0f1851b3958979d6f6fefa0c67bd3aca77793aee0cfc42a5555b93276ff4df1c8291a2cd4aa57af02da4d
-MISC ChangeLog 25899 SHA256 d6cc6b81def8a777ee0df34033f475c0166cf38ed1af118bae114d47ce5fff4b SHA512 fd5c4b3641ca2e6130b8e7cf3f71210d0a6a0fa0bdf144849df6c68100cab4d891f5fb96706e33bc97ea3a21680ea29e55991fa226513eaec2f888907fdfe824 WHIRLPOOL f8f6300a76d294a10a2ccbbc112ecc99ad740fffbeb2fb4b8a18024c573eff99962fb6e1a73707fa43f9068862a0f562f059e71871eae7b6d0ceb213969ec05d
-MISC metadata.xml 619 SHA256 a0279b54456f15f87f3ab0eab4f541e2273a76eeb25219e7810cc0a3a379953c SHA512 c5fbfbe51cc9ccc483f3472fa616ba62c50ab83d731e7f91917cef5fc56cd3d6afd13e250e8b4ecc3f2faff68053cbed79290363c5ac16c9a17caba1c98cad30 WHIRLPOOL 5d509445f34c0cef9ecc5ac0dc3b2f1e54c725682ab1bf0d465b988de71c6c52a30b561c0923f2885de375385b9be42e8c4288cdeb5f1bde088851d317768c03
+MISC ChangeLog 26083 SHA256 5c8f8828566e0d7249afa43c4bd48d5fbabe9be714f04f63f785f282c345dccd SHA512 7b7424e4aee81eefd0a0e8bb3286ee15d43b577abaa6dea4b95c2d5e27335d431e23a654fc16fb9d12a19f6c7d7b1fa34fcb4c53f494247f7fde4072c9afbcf4 WHIRLPOOL 85d35f0672c2825eea25d7978c309fbcfa3ce5c1bc4b490daf8d0679e920d82bb78a5dc67c0d60243e32087d04a5712d1781479379c3c04820a781f4df7666cf
+MISC metadata.xml 632 SHA256 65a7ebc233fc168777d6a0d3131ed1b26653cb2a890eb5199d3f6ae62c2b0700 SHA512 dde36316c8124bd9cb916202f5fe2e5be098e355f6c7cfb4fc3db22d65752cd80ba717f4ea1c52455a68935ad83c55cccbcf1b76231d227c7a4d25d2cc39e2c8 WHIRLPOOL b4819907ac7bef3e17d66639b4cd88e0e00963181ea504f870ad3cbc3601fab4c9222b59a13351b8df200bcb79e01f30ed66c57f51478a137e8078a6a4c7e440
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCABmBQJUrwTGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9R18QAKVioDyftd2KFlYtt/QPgNaG
-nLPfkObMwya2mK3GHoB+Ti7/j86XkE5aASNuGDmVIFy91WrJhFbuV7QYWzhYat70
-bvQrkFE04Z09aGurS7c4xtoI6Dz5QpszQ6iRbc16z823PQQgmOoBFxxtMhAwRGj0
-lLRk9Ga9cvtImqkIkr/76YusBhH0ksHE5kG1vMdAcxzGqIZWNdDy2EO6SqyQLq31
-Yc+wm0e6pOibvDx1lgGKYWAF+6B11q6cbI7vqL9B2WHkFp0pioBaYWUJvjgxBPOB
-FvktQU+D2SPXiCEnKs7hUx6n4M1ob1d4R0P9gjvfJUyIHEOWg2GAfXZhJqD94Sh7
-6JEf9XRC+7CWoAZbcTaUhMe89ZKB/jQ6XjPag2PJuznkSN6AkmU6CaPcih7WoLKS
-Abl4RMQnD5WOurkvqWInyOpQqPKkd34XH/5BukaNFjgivpBYUtDpRr9sf4uFOPXp
-b1aOgq9yMkcI73RVm9MQcirnSvPs0TFcRLkGh1Lbvp+95qydsJ+bPeX24U5mE6P4
-3TmPdrytpFddfv01UBmiK/OzZ2Ff6cOojwss2gA3R3oiYCnRgjeeBfA1zqH7yhYQ
-J3SZCC805kyR0p58kA62fDF25SrCd5hyfhnH7h/kdx/1bo98g+IqatZ4wQq2NHbM
-0sFr7i7rhAy8ukI2R2n+
-=zjU2
+iQJ8BAEBCgBmBQJUxTSeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirO5IQAJdtaOjfKl9aW2w0ba6qwoKD
+KuXyF6vCWY3F8nD5mh+krYXcShrr252jeWIN4V32PE74JbVAhrgaq+h6L7X5k0eI
+XskOpTMlb9PtZrp4kfFdkpeyQB1X8C+UwnDqziARUaMgeyW0SZaibChlCJW87DXs
+RwIU/aixkbvO7bsdQAwHr5rLVcV/e/f6B85pnymzBEKAp+ZkkFO9oMlvzgqvPVZU
+nkViXaI4988HNmpRYkS0dUvW+oiiV2TyQdU57QPYF95fa+E0dO8WGmJ8oMZnR21H
+HEeLJ1DHh4WLUsEHLdDIRTpZwDeU5icqIUnmLTqbn7eGqoKR02Fam1sr4WHFrPyj
+q36wD9nS3Q4djgG6xJQ74d3Xb/n01KlkLxs3XeD8WsWtqmDgHxPPb4glUqHMOC1/
+XzgVsOf/fNuQJFkPemvhJBVrnWmou8Wljoiq699PLH8W6rt/Da2NWU9TgA0OAe5o
+TXXmGgMXzDo2kcYRK+LCGwthIz+UlPoUuUJt8Z7T2PfDDce4kLgDmLgBs8SwCCAU
+KomaZQwVXX1R3IQj2W+aj7RqY/SEdkPcYfibdJypo2FgvDnhGkN/mQzSbCdRDwA3
+yKfltGmdNu6Mnkjp6P5KtbdwpJtWpf3B1UppKXf8UrGAX63Ur9vVivWrjCj2oLKc
+WW5HpsC72g97TsJZ93ai
+=TbhH
-----END PGP SIGNATURE-----
--- /dev/null
+ tools/assistant/compat/compat.pro | 5 +++++
+ tools/assistant/compat/lib/lib.pro | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
+index 171106a..51b8d5b 100755
+--- a/tools/assistant/compat/compat.pro
++++ b/tools/assistant/compat/compat.pro
+@@ -14,6 +14,8 @@ QT += xml network
+
+ PROJECTNAME = Assistant
+
++DESTDIR = ../../../bin
++
+ FORMS += helpdialog.ui \
+ mainwindow.ui \
+ tabbedbrowser.ui \
+@@ -59,6 +61,9 @@ mac {
+ TARGET = Assistant_adp
+ }
+
++target.path=$$[QT_INSTALL_BINS]
++INSTALLS += target
++
+ TRANSLATIONS = translations/assistant_adp_de.ts \
+ translations/assistant_adp_ja.ts \
+ translations/assistant_adp_pl.ts \
+diff --git a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro
+index e50d470..8973d43 100755
+--- a/tools/assistant/compat/lib/lib.pro
++++ b/tools/assistant/compat/lib/lib.pro
+@@ -31,7 +31,7 @@ contains(CONFIG, static) {
+
+ #load up the headers info
+ CONFIG += qt_install_headers
+-HEADERS_PRI = $$QT_BUILD_TREE/include/QtAssistant/headers.pri
++HEADERS_PRI = $$QT_SOURCE_TREE/include/QtAssistant/headers.pri
+ include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
+
+ #mac frameworks
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <use>
- <flag name="compat">Build the extra compatibility layer required by a few packages, see
+ <herd>qt</herd>
+ <use>
+ <flag name="compat">Build the extra compatibility layer required by a few packages, see
http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
- <flag name="exceptions">Add support for exceptions - like catching them
+ <flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by upstream)</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>http://qt-project.org/doc/</doc>
- </upstream>
+ </use>
+ <upstream>
+ <bugs-to>https://bugreports.qt.io/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
</pkgmetadata>
--- /dev/null
+# Copyright 1999-2015 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-r2.ebuild,v 1.1 2015/01/25 18:20:27 jlec Exp $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION="The Help module for the Qt toolkit"
+SRC_URI+="
+ compat? (
+ ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
+ http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
+ )"
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+IUSE="compat doc"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
+ compat? (
+ ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ )
+"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+ tools/assistant/lib/fulltextsearch
+ tools/assistant/lib
+ tools/assistant/tools/qhelpgenerator
+ tools/assistant/tools/qcollectiongenerator
+ tools/assistant/tools/qhelpconverter
+ tools/qdoc3"
+
+pkg_setup() {
+ use compat && QT4_TARGET_DIRECTORIES+="
+ tools/assistant/compat
+ tools/assistant/compat/lib"
+}
+
+src_unpack() {
+ qt4-build-multilib_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}"/QtAssistant "${S}"/include || die
+ fi
+}
+
+src_prepare() {
+ use compat && PATCHES+=("${FILESDIR}/${P}-fix-compat.patch")
+
+ qt4-build-multilib_src_prepare
+
+ # prevent rebuild of QtCore and QtXml (bug 348034)
+ sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
+}
+
+multilib_src_configure() {
+ local myconf=(
+ -system-libpng -system-libjpeg -system-zlib
+ -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
+ -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+ -no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
+ -no-nas-sound -no-cups -no-nis -fontconfig
+ )
+ qt4_multilib_src_configure
+
+ if use compat; then
+ # syncqt knows nothing about these headers (bug 529398)
+ cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die
+ fi
+}
+
+multilib_src_compile() {
+ qt4_multilib_src_compile
+
+ # release tarballs are shipped with prebuilt docs
+ if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then
+ # qhelpgenerator needs libQtHelp.so.4
+ export LD_LIBRARY_PATH=${BUILD_DIR}/lib
+ export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
+ emake docs
+ fi
+}
+
+multilib_src_install() {
+ qt4_multilib_src_install
+
+ if multilib_is_native_abi; then
+ emake INSTALL_ROOT="${D}" install_qchdocs
+ use doc && emake INSTALL_ROOT="${D}" install_htmldocs
+
+ # do not compress .qch files
+ docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch
+ fi
+}
+
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
+
+ if use compat; then
+ insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
+ doins tools/assistant/compat/features/assistant.prf
+ fi
+}