gentoo resync : 14.07.2018

8 files changed, 297 insertions, 0 deletions

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
new file mode 100644
index 000000000000..bdc4bd77f117
--- /dev/null
+++ b/dev-qt/qthelp/Manifest
@@ -0,0 +1,13 @@
+AUX qthelp-4.8.6-compat-install.patch 899 BLAKE2B c79463971979a10c05e792593b66bab186c091ed9e983c982c389ce517cda973d49a8f3d7685dc3242a3ddbab00284c1c503cd3e65aeb7e1dac9dbe7dee191a9 SHA512 dc960f735a92a8bfa7a10e2c898eeb1dbdbf273cf342af3b0924240a1f3bc15694e86679b0f6cbd28f24246bfad3a5d799a6f383503deafa5b4adeb368a69158
+AUX qthelp-4.8.6-compat-syncqt.patch 884 BLAKE2B 25cb103e5c013c262d8c99cf21218083dbee6edd56203ee61a4acf637930c72d63b6428eac45ae6cf5e74ddee9a45c5d34e635712e97e7cb33260e8cc0295c54 SHA512 ee18303ca95569a66b1680f10a65766d67caca33928eb5d4f7ae2a4ffa883caa32dcb4adf7f48536e5bf78dcc26d30521c1309e9dfb0226284322220895ec20a
+DIST qt-assistant-compat-headers-4.7.tar.gz 448 BLAKE2B ca3318ff64a4484faec0254d17f3831f75bc5d96ff6eef8dd57219076074c3b5cf23bdbc84266dc40c66231aba7342d9fb2cf9102c2bec05ce33d8854935a8e3 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb
+DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 BLAKE2B b84c207a7633229a1b06aee1560f969bc5088ef65d1c6366ac817017a5713c6c50915df95109fa1a8fadef4bf8c2de22d16dc95e36325a92f419051c1dcfe5b3 SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
+DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
+DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
+DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
+EBUILD qthelp-4.8.7.ebuild 3122 BLAKE2B 5c8e30e3826be0493b2304890022648b2073a2e30bcea15c620aef22763dd0f7bbb6805553f44b411482dbfdab8bd83ba7412a331a605c29bbbb845d0d88c46f SHA512 d06253208591e380d378db2e3496c42940581b781c1c4e82fdd3dba9d2bea6623161d4ada16b80bd6fcf503d78f0eb83972932e3ada501104539587857261d58
+EBUILD qthelp-5.11.1.ebuild 652 BLAKE2B 7f6f32e0e641cb4fc3cb370b28ce1eb2cfef9a1179bf3201c29167928d8e46665ffbbc2699d54f61b31cbc8e10de6b2bc15665897dea40abbf6f2006c418b483 SHA512 430038abf54f5b7d4394fe6a02f488a59fb8cc2a09fd2431ca9b41f4a77456f6e7d56fa9ba6c1ae53b03c79f3cc0cf5af545959bbd3da3917fa179ad4404e99a
+EBUILD qthelp-5.9.4.ebuild 648 BLAKE2B 0d520f2d3f9d4670aebc9fe0f1d33298f90802818363f0314fbe0a8500be839adf3433ecdc436bae0944190b24de11a114fbd117f83a412b753c2dad0d517962 SHA512 cd10ec0a0413197b7558a0b3749ba70f8100316faae82df3b92c2bcc2389cf8e934623d06e905c04269211cbd563020e320e007e02ce45a24ff3dd3f087cb88b
+EBUILD qthelp-5.9.6.ebuild 651 BLAKE2B ef83842daeb168cf67c9bfe4e902d2f7760453b383341ac20838a94c825fc0c4b442813740e1835e9c6ed5b8c84083e72c23eacc0734e5d40178484da30352d3 SHA512 e1493eb2e9fd1eaa01fb9dfbc6d98d4c47fe22ddfed6d56b687c385914e36e7ddc84cfd9972cfef150335ed7ad39b3d60b6ee4ac2282efef2e287299a0003cdb
+MISC metadata.xml 825 BLAKE2B de978b130ccf71032fb98469ae3562a483b4fd791a13bab4f0d34990ad5638325c90b2ae057e870cc9d4af156114b90498d13828ea51dd2cbe9d3f1c3709b9a7 SHA512 54d474dfe7325966022026beab59b144932f523ced472f0d5d49f72727f6129923af821211fff3d42bc8dd02701e80f313e9e8c0f34e2cf18db1888ad8907026
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
new file mode 100644
index 000000000000..e157381c8f05
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
@@ -0,0 +1,35 @@
+From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Wed, 6 May 2015 23:21:54 +0200
+Subject: [PATCH] Install assistant_adp binary.
+
+---
+ tools/assistant/compat/compat.pro | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
+index 171106a..a14e3f8 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 \
+-- 
+2.4.0
+
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
new file mode 100644
index 000000000000..4ba6b6ff7417
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
@@ -0,0 +1,25 @@
+From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Wed, 6 May 2015 22:44:57 +0200
+Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers.
+
+See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47
+---
+ bin/syncqt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bin/syncqt b/bin/syncqt
+index dd94d4d..cc5a7bf 100755
+--- a/bin/syncqt
++++ b/bin/syncqt
+@@ -81,6 +81,7 @@ my %modules = ( # path to module name map
+         "ActiveQt" => "$basedir/src/activeqt",
+         "QtTest" => "$basedir/src/testlib",
+         "QtHelp" => "$basedir/tools/assistant/lib",
++        "QtAssistant" => "$basedir/tools/assistant/compat/lib",
+         "QtDesigner" => "$basedir/tools/designer/src/lib",
+         "QtUiTools" => "$basedir/tools/designer/src/uitools",
+         "QtDBus" => "$basedir/src/dbus",
+-- 
+2.4.0
+
diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
new file mode 100644
index 000000000000..a1b560594940
--- /dev/null
+++ b/dev-qt/qthelp/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="compat">Build the extra compatibility layer required by a few packages, see
+			http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
+		<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>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qthelp/qthelp-4.8.7.ebuild b/dev-qt/qthelp/qthelp-4.8.7.ebuild
new file mode 100644
index 000000000000..0587f38e146e
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-4.8.7.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="The Help module for the Qt toolkit"
+SRC_URI+="
+	compat? (
+		http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
+		https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
+	)"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
+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.io/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
+		find "${S}"/tools/assistant/compat -type f -execdir chmod a-x '{}' + || die
+	fi
+}
+
+src_prepare() {
+	use compat && PATCHES+=(
+		"${FILESDIR}/${PN}-4.8.6-compat-install.patch"
+		"${FILESDIR}/${PN}-4.8.6-compat-syncqt.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
+}
+
+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
+}
diff --git a/dev-qt/qthelp/qthelp-5.11.1.ebuild b/dev-qt/qthelp/qthelp-5.11.1.ebuild
new file mode 100644
index 000000000000..1e0ee9ab67fe
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qthelp/qthelp-5.9.4.ebuild b/dev-qt/qthelp/qthelp-5.9.4.ebuild
new file mode 100644
index 000000000000..fdda00079f8c
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qthelp/qthelp-5.9.6.ebuild b/dev-qt/qthelp/qthelp-5.9.6.ebuild
new file mode 100644
index 000000000000..76e1db65cd83
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.9.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpconverter
+	src/assistant/qhelpgenerator
+)