public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2013-03-08  8:13 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2013-03-08  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     c2e8539923915ee962ea75a1a4e9cce34fda12ef
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Mar  8 08:13:34 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 08:13:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c2e85399

[dev-qt/qthelp] Fix bug 460654.

Package-Manager: portage-2.2.0_alpha166

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 93a0557..a04ca36 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -59,11 +59,11 @@ src_unpack() {
 	qt4-build_src_unpack
 
 	# compat version
-	# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
+	# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
 	if use compat; then
-		unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
-			${PN}-compat-headers-4.7.tar.gz
-		mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \
+		unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
+			qt-assistant-compat-headers-4.7.tar.gz
+		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
 			"${S}"/tools/assistant/compat || die
 		mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
 	fi
@@ -117,6 +117,7 @@ src_install() {
 	qt4-build_src_install
 
 	emake INSTALL_ROOT="${D}" install_qchdocs
+
 	# do not compress .qch files
 	docompress -x "${QTDOCDIR}"/qch
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2013-07-11 18:17 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2013-07-11 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     7fcd609eccf0c8ec99e668a56d8739f2af0c414b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 18:14:51 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 18:14:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7fcd609e

[dev-qt/qthelp] Fix target directories causing configure failure wrt bug #476552.

Package-Manager: portage-2.1.12.13

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index bfa28ec..8c05f8d 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -32,9 +32,9 @@ RDEPEND="${DEPEND}"
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		tools/assistant/lib
-		tools/assistant/qhelpgenerator
-		tools/assistant/qcollectiongenerator
-		tools/assistant/qhelpconverter
+		tools/assistant/tools/qhelpgenerator
+		tools/assistant/tools/qcollectiongenerator
+		tools/assistant/tools/qhelpconverter
 		tools/qdoc3"
 	QT4_EXTRACT_DIRECTORIES="
 		demos


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2013-07-18 14:03 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2013-07-18 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     0112faceb179f0077a7de541c8d950977467b4d7
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 14:00:50 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 14:01:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0112face

[dev-qt/qthelp] Fix build failure related to ebuild splitting wrt bug #476614.

Package-Manager: portage-2.1.12.13

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 8c05f8d..0ee9df7 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
+		tools/assistant/lib/fulltextsearch
 		tools/assistant/lib
 		tools/assistant/tools/qhelpgenerator
 		tools/assistant/tools/qcollectiongenerator


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2013-08-01  6:58 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2013-08-01  6:58 UTC (permalink / raw
  To: gentoo-commits

commit:     f147c432cc6eb8df86922eef81977ce22852688e
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Aug  1 06:58:54 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 06:58:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f147c432

[dev-qt/qthelp] Sync again.

Package-Manager: portage-2.2.0_alpha191

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 4749453..c616962 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -84,7 +84,7 @@ src_configure() {
 		-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-svg -no-webkit -no-xmlpatterns
+		-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
 		-no-nas-sound -no-cups -no-nis -fontconfig"
 
 	qt4-build_src_configure


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2014-05-15 16:52 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2014-05-15 16:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a8470eea89f2127a7549c97df6f5224e7b8d3214
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 16:49:00 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 15 16:50:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a8470eea

[dev-qt/qthelp] Add Qt5 version.

Package-Manager: portage-2.2.8-r1

---
 dev-qt/qthelp/Manifest               |  1 +
 dev-qt/qthelp/qthelp-5.3.0_rc.ebuild | 33 +++++++++++++++++++++++++++++++++
 dev-qt/qthelp/qthelp-5.3.9999.ebuild | 33 +++++++++++++++++++++++++++++++++
 dev-qt/qthelp/qthelp-5.9999.ebuild   | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 100 insertions(+)

diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 7abb861..96b5ab6 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,2 +1,3 @@
 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 qttools-opensource-src-5.3.0-RC.tar.xz 8988688 SHA256 4e39e77c589fb6e5d1773e18b8c76f49747bc2ff1b7eb1012ab4f05feb37ede7 SHA512 cc040c95c2d42758de2e1e3779ff6c9580a27254fe4937f362a575f1526f323359d36b9046857c8083cedc54126fefa798c298ae04c1c1bb0e54e45a2e7038e5 WHIRLPOOL 621bdbd5a0c4186cc39ab4b01f441b77865282a0207735b554daa693b4ae44b5870b26f4de4ba7443eba6e7b4ce40037af5f66952962b3c2da867d1933821236

diff --git a/dev-qt/qthelp/qthelp-5.3.0_rc.ebuild b/dev-qt/qthelp/qthelp-5.3.0_rc.ebuild
new file mode 100644
index 0000000..3228701
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.3.0_rc.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtsql-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/clucene
+	src/assistant/help
+)

diff --git a/dev-qt/qthelp/qthelp-5.3.9999.ebuild b/dev-qt/qthelp/qthelp-5.3.9999.ebuild
new file mode 100644
index 0000000..3228701
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.3.9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtsql-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/clucene
+	src/assistant/help
+)

diff --git a/dev-qt/qthelp/qthelp-5.9999.ebuild b/dev-qt/qthelp/qthelp-5.9999.ebuild
new file mode 100644
index 0000000..3228701
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE="qttools"
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtsql-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/clucene
+	src/assistant/help
+)


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2014-05-27 22:59 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2014-05-27 22:59 UTC (permalink / raw
  To: gentoo-commits

commit:     40289fb225374d71db90b76fc64daa9790b1a70b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 22:57:28 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 22:57:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=40289fb2

[dev-qt/qthelp:4] Minor cleanup.

Package-Manager: portage-2.2.10

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index e9aa312..ff5f20b 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 
 	qt4-build-multilib_src_prepare
 
-	# bug 348034
+	# prevent rebuild of QtCore and QtXml (bug 348034)
 	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
 }
 
@@ -93,8 +93,9 @@ src_configure() {
 src_compile() {
 	qt4-build-multilib_src_compile
 
-	# ugly hack to build docs
-	"${S}"/bin/qmake "LIBS+=-L${QT4_LIBDIR}" "CONFIG+=nostrip" || die
+	# this generates a top-level Makefile containing the targets
+	# used below to build and install the documentation
+	"${S}"/bin/qmake || die
 
 	if use doc; then
 		emake docs


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2014-05-27 22:59 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2014-05-27 22:59 UTC (permalink / raw
  To: gentoo-commits

commit:     f096b03059faa341f7c16dc3825cdf235c80fefe
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 22:36:40 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 22:36:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f096b030

[dev-qt/qthelp:4] Remove obsolete workaround.

It was needed to build the assistant binary,
which is now in a separate package.

Package-Manager: portage-2.2.10

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 3e4ec00..e9aa312 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -91,10 +91,6 @@ src_configure() {
 }
 
 src_compile() {
-	# help libQtHelp find freshly built libQtCLucene (bug #289811)
-	export LD_LIBRARY_PATH="${S}/lib:${QT4_LIBDIR}"
-	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
-
 	qt4-build-multilib_src_compile
 
 	# ugly hack to build docs


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2014-07-11  1:35 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2014-07-11  1:35 UTC (permalink / raw
  To: gentoo-commits

commit:     314ebc2b484200c00dcd332e74c5b4a1783f4321
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 11 01:35:17 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 11 01:35:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=314ebc2b

[dev-qt/qthelp:4] Unbreak and simplify docs generation/installation.

Fixes bug 514942

Package-Manager: portage-2.2.10

---
 dev-qt/qthelp/qthelp-4.8.6.ebuild    | 30 +++++++++++++-----------------
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 30 +++++++++++++-----------------
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild
index 9b7a09c..7f63af5 100644
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
@@ -83,32 +83,28 @@ multilib_src_configure() {
 multilib_src_compile() {
 	qt4_multilib_src_compile
 
-	# qhelpgenerator needs libQtHelp.so.4
-	export LD_LIBRARY_PATH=${BUILD_DIR}/lib
-	export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
-
-	if use doc; then
+	# 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
-	elif [[ ${QT4_BUILD_TYPE} == release ]]; then
-		# live ebuild cannot build qch_docs, it will build them through emake docs
-		emake qch_docs
 	fi
 }
 
 multilib_src_install() {
 	qt4_multilib_src_install
 
-	emake INSTALL_ROOT="${D}" install_qchdocs
-
-	# do not compress .qch files
-	docompress -x "${QT4_DOCDIR}"/qch
-
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs
-	fi
-
 	if use compat; then
 		insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
 		doins tools/assistant/compat/features/assistant.prf
 	fi
+
+	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}"/qch
+	fi
 }

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 9b7a09c..7f63af5 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -83,32 +83,28 @@ multilib_src_configure() {
 multilib_src_compile() {
 	qt4_multilib_src_compile
 
-	# qhelpgenerator needs libQtHelp.so.4
-	export LD_LIBRARY_PATH=${BUILD_DIR}/lib
-	export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
-
-	if use doc; then
+	# 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
-	elif [[ ${QT4_BUILD_TYPE} == release ]]; then
-		# live ebuild cannot build qch_docs, it will build them through emake docs
-		emake qch_docs
 	fi
 }
 
 multilib_src_install() {
 	qt4_multilib_src_install
 
-	emake INSTALL_ROOT="${D}" install_qchdocs
-
-	# do not compress .qch files
-	docompress -x "${QT4_DOCDIR}"/qch
-
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs
-	fi
-
 	if use compat; then
 		insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
 		doins tools/assistant/compat/features/assistant.prf
 	fi
+
+	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}"/qch
+	fi
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2014-09-02  0:08 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2014-09-02  0:08 UTC (permalink / raw
  To: gentoo-commits

commit:     ad5cd71b7885e2fbe2346f59542855a1243e93d9
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  1 23:42:57 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Sep  1 23:42:57 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ad5cd71b

[dev-qt/qthelp:4] Raise minimum deps to ensure correct multilib USE deps.

Package-Manager: portage-2.2.12-r1

---
 dev-qt/qthelp/qthelp-4.8.6.ebuild    | 2 +-
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild
index 7f63af5..7235819 100644
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
 	compat? (
 		~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 7f63af5..7235819 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
 	compat? (
 		~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)
 "
 RDEPEND="${DEPEND}"


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2014-11-16  4:09 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2014-11-16  4:09 UTC (permalink / raw
  To: gentoo-commits

commit:     58eb7ba78812cedb1f458b0f719404af81ee800c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 16 04:09:42 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 16 04:09:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=58eb7ba7

[dev-qt/qthelp:4] Sync.

Package-Manager: portage-2.2.14

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 7235819..0bb1a0f 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -52,11 +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
-		unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
-			qt-assistant-compat-headers-4.7.tar.gz
 		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
 			"${S}"/tools/assistant/compat || die
-		mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
 	fi
 }
 
@@ -78,6 +75,11 @@ multilib_src_configure() {
 		-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 "${WORKDIR}"/QtAssistant "${BUILD_DIR}"/include || die
+	fi
 }
 
 multilib_src_compile() {
@@ -95,16 +97,20 @@ multilib_src_compile() {
 multilib_src_install() {
 	qt4_multilib_src_install
 
-	if use compat; then
-		insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
-		doins tools/assistant/compat/features/assistant.prf
-	fi
-
 	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}"/qch
+		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
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2014-11-26 18:30 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2014-11-26 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     b5add565b4d9e289ff9a4cfd70c7fec296a343a7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 26 18:29:50 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Nov 26 18:29:50 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b5add565

[dev-qt/qthelp:4] Sync.

Package-Manager: portage-2.2.14

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 0bb1a0f..55ad8ad 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -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
 }
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2016-07-13 17:37 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2016-07-13 17:37 UTC (permalink / raw
  To: gentoo-commits

commit:     6c2696fdc305431385096f7fb302b63cd3547d01
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 17:37:15 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 17:37:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6c2696fd

dev-qt/qthelp: improve DESCRIPTION

Package-Manager: portage-2.3.0

 dev-qt/qthelp/qthelp-5.6.9999.ebuild | 2 +-
 dev-qt/qthelp/qthelp-5.7.0.ebuild    | 2 +-
 dev-qt/qthelp/qthelp-5.7.9999.ebuild | 2 +-
 dev-qt/qthelp/qthelp-5.9999.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-5.6.9999.ebuild b/dev-qt/qthelp/qthelp-5.6.9999.ebuild
index 3412c74..e906010 100644
--- a/dev-qt/qthelp/qthelp-5.6.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.6.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 QT5_MODULE="qttools"
 inherit qt5-build
 
-DESCRIPTION="The Help module for the Qt5 framework"
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"

diff --git a/dev-qt/qthelp/qthelp-5.7.0.ebuild b/dev-qt/qthelp/qthelp-5.7.0.ebuild
index 3412c74..e906010 100644
--- a/dev-qt/qthelp/qthelp-5.7.0.ebuild
+++ b/dev-qt/qthelp/qthelp-5.7.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 QT5_MODULE="qttools"
 inherit qt5-build
 
-DESCRIPTION="The Help module for the Qt5 framework"
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"

diff --git a/dev-qt/qthelp/qthelp-5.7.9999.ebuild b/dev-qt/qthelp/qthelp-5.7.9999.ebuild
index 3412c74..e906010 100644
--- a/dev-qt/qthelp/qthelp-5.7.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.7.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 QT5_MODULE="qttools"
 inherit qt5-build
 
-DESCRIPTION="The Help module for the Qt5 framework"
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"

diff --git a/dev-qt/qthelp/qthelp-5.9999.ebuild b/dev-qt/qthelp/qthelp-5.9999.ebuild
index 3412c74..e906010 100644
--- a/dev-qt/qthelp/qthelp-5.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 QT5_MODULE="qttools"
 inherit qt5-build
 
-DESCRIPTION="The Help module for the Qt5 framework"
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2017-05-02  2:40 Davide Pesavento
  0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2017-05-02  2:40 UTC (permalink / raw
  To: gentoo-commits

commit:     a00a5aba5e3ad4483901c8e5a0b004f31f945acb
Author:     Takahiro HASHIMOTO <kenya888 <AT> gmail <DOT> com>
AuthorDate: Tue May  2 02:03:41 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May  2 02:37:57 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a00a5aba

dev-qt/qthelp: remove clucene subdir target

Gentoo-Bug: 617222

 dev-qt/qthelp/qthelp-5.9.9999.ebuild | 1 -
 dev-qt/qthelp/qthelp-5.9999.ebuild   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-5.9.9999.ebuild b/dev-qt/qthelp/qthelp-5.9.9999.ebuild
index ae741896..d9c3f9c4 100644
--- a/dev-qt/qthelp/qthelp-5.9.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9.9999.ebuild
@@ -23,7 +23,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
-	src/assistant/clucene
 	src/assistant/help
 	src/assistant/qcollectiongenerator
 	src/assistant/qhelpconverter

diff --git a/dev-qt/qthelp/qthelp-5.9999.ebuild b/dev-qt/qthelp/qthelp-5.9999.ebuild
index ae741896..d9c3f9c4 100644
--- a/dev-qt/qthelp/qthelp-5.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9999.ebuild
@@ -23,7 +23,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
-	src/assistant/clucene
 	src/assistant/help
 	src/assistant/qcollectiongenerator
 	src/assistant/qhelpconverter


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2017-11-25  3:33 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2017-11-25  3:33 UTC (permalink / raw
  To: gentoo-commits

commit:     d5add85828ff261de7f5785a2e22125b49b707fc
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 03:32:19 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 03:33:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d5add858

dev-qt/qthelp: sync keywords from main tree

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 dev-qt/qthelp/qthelp-5.10.9999.ebuild | 2 +-
 dev-qt/qthelp/qthelp-5.9.3.ebuild     | 2 +-
 dev-qt/qthelp/qthelp-5.9.9999.ebuild  | 2 +-
 dev-qt/qthelp/qthelp-5.9999.ebuild    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-5.10.9999.ebuild b/dev-qt/qthelp/qthelp-5.10.9999.ebuild
index 05bca269..07c54abf 100644
--- a/dev-qt/qthelp/qthelp-5.10.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.10.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qthelp/qthelp-5.9.3.ebuild b/dev-qt/qthelp/qthelp-5.9.3.ebuild
index 05bca269..07c54abf 100644
--- a/dev-qt/qthelp/qthelp-5.9.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qthelp/qthelp-5.9.9999.ebuild b/dev-qt/qthelp/qthelp-5.9.9999.ebuild
index 05bca269..07c54abf 100644
--- a/dev-qt/qthelp/qthelp-5.9.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qthelp/qthelp-5.9999.ebuild b/dev-qt/qthelp/qthelp-5.9999.ebuild
index 05bca269..07c54abf 100644
--- a/dev-qt/qthelp/qthelp-5.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
 IUSE=""


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2018-08-15 14:11 Jimi Huotari
  0 siblings, 0 replies; 20+ messages in thread
From: Jimi Huotari @ 2018-08-15 14:11 UTC (permalink / raw
  To: gentoo-commits

commit:     a38c16f9a1792a212038ffdbf481b676bfd02ba8
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 14:10:06 2018 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 14:11:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a38c16f9

dev-qt/qthelp: remove 'qcollectiongenerator' from 5.12

The 'qcollectiongenerator' has been merged with 'qhelpgenerator' in:
http://code.qt.io/cgit/qt/qttools.git/commit/?h=5.12&id=30a75f7f

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 dev-qt/qthelp/qthelp-5.12.9999.ebuild | 1 -
 dev-qt/qthelp/qthelp-5.9999.ebuild    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-5.12.9999.ebuild b/dev-qt/qthelp/qthelp-5.12.9999.ebuild
index 1e0ee9ab..3dde0ea7 100644
--- a/dev-qt/qthelp/qthelp-5.12.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.12.9999.ebuild
@@ -24,7 +24,6 @@ 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.9999.ebuild b/dev-qt/qthelp/qthelp-5.9999.ebuild
index 1e0ee9ab..3dde0ea7 100644
--- a/dev-qt/qthelp/qthelp-5.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9999.ebuild
@@ -24,7 +24,6 @@ RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
-	src/assistant/qcollectiongenerator
 	src/assistant/qhelpconverter
 	src/assistant/qhelpgenerator
 )


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2018-08-15 14:20 Jimi Huotari
  0 siblings, 0 replies; 20+ messages in thread
From: Jimi Huotari @ 2018-08-15 14:20 UTC (permalink / raw
  To: gentoo-commits

commit:     8a02d34bc9d32a7822cb45506aa3f2bfd043e3ec
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 14:20:11 2018 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 14:20:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8a02d34b

dev-qt/qthelp: remove 'qhelpconverter' from 5.12

The 'qhelpconverter' has been removed in:
http://code.qt.io/cgit/qt/qttools.git/commit/?h=5.12&id=f3d4e058

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 dev-qt/qthelp/qthelp-5.12.9999.ebuild | 1 -
 dev-qt/qthelp/qthelp-5.9999.ebuild    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-5.12.9999.ebuild b/dev-qt/qthelp/qthelp-5.12.9999.ebuild
index 3dde0ea7..ff83cd95 100644
--- a/dev-qt/qthelp/qthelp-5.12.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.12.9999.ebuild
@@ -24,6 +24,5 @@ RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
-	src/assistant/qhelpconverter
 	src/assistant/qhelpgenerator
 )

diff --git a/dev-qt/qthelp/qthelp-5.9999.ebuild b/dev-qt/qthelp/qthelp-5.9999.ebuild
index 3dde0ea7..ff83cd95 100644
--- a/dev-qt/qthelp/qthelp-5.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9999.ebuild
@@ -24,6 +24,5 @@ RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
-	src/assistant/qhelpconverter
 	src/assistant/qhelpgenerator
 )


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2019-02-24 15:21 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2019-02-24 15:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c56a6bbe366e4fae343e9eeab2184722f671ae90
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 14:54:19 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 15:20:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c56a6bbe

dev-qt/qthelp: Add back qcollectiongenerator to QT5_TARGET_SUBDIRS

See also commit a38c16f9a1792a212038ffdbf481b676bfd02ba8.
Various revdeps have not been ported to qhelpgenerator yet.

Closes: https://bugs.gentoo.org/673894
Reported-by: Helmut Jarausch <jarausch <AT> igpm.rwth-aachen.de>
Thanks-to: Urmet Saar <urmet.saar <AT> gmail.com>
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qthelp/{qthelp-5.13.9999.ebuild => qthelp-5.12.1-r1.ebuild} | 1 +
 dev-qt/qthelp/qthelp-5.12.9999.ebuild                              | 3 ++-
 dev-qt/qthelp/qthelp-5.13.9999.ebuild                              | 1 +
 dev-qt/qthelp/qthelp-5.9999.ebuild                                 | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qthelp/qthelp-5.13.9999.ebuild b/dev-qt/qthelp/qthelp-5.12.1-r1.ebuild
similarity index 94%
copy from dev-qt/qthelp/qthelp-5.13.9999.ebuild
copy to dev-qt/qthelp/qthelp-5.12.1-r1.ebuild
index 01861748..943173a1 100644
--- a/dev-qt/qthelp/qthelp-5.13.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.12.1-r1.ebuild
@@ -24,5 +24,6 @@ RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
+	src/assistant/qcollectiongenerator
 	src/assistant/qhelpgenerator
 )

diff --git a/dev-qt/qthelp/qthelp-5.12.9999.ebuild b/dev-qt/qthelp/qthelp-5.12.9999.ebuild
index 047208ad..943173a1 100644
--- a/dev-qt/qthelp/qthelp-5.12.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.12.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,5 +24,6 @@ RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
+	src/assistant/qcollectiongenerator
 	src/assistant/qhelpgenerator
 )

diff --git a/dev-qt/qthelp/qthelp-5.13.9999.ebuild b/dev-qt/qthelp/qthelp-5.13.9999.ebuild
index 01861748..943173a1 100644
--- a/dev-qt/qthelp/qthelp-5.13.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.13.9999.ebuild
@@ -24,5 +24,6 @@ RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
+	src/assistant/qcollectiongenerator
 	src/assistant/qhelpgenerator
 )

diff --git a/dev-qt/qthelp/qthelp-5.9999.ebuild b/dev-qt/qthelp/qthelp-5.9999.ebuild
index 047208ad..cc6b9745 100644
--- a/dev-qt/qthelp/qthelp-5.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9999.ebuild
@@ -24,5 +24,6 @@ RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
+	src/assistant/qcollectiongenerator
 	src/assistant/qhelpgenerator
 )


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2019-02-24 15:21 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2019-02-24 15:21 UTC (permalink / raw
  To: gentoo-commits

commit:     8670ffd486a6cdd94d0156a7d995a02a557f4068
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 14:55:46 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 15:21:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8670ffd4

dev-qt/qthelp: Drop 5.12.1 (r0)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qthelp/qthelp-5.12.1.ebuild | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-5.12.1.ebuild b/dev-qt/qthelp/qthelp-5.12.1.ebuild
deleted file mode 100644
index 01861748..00000000
--- a/dev-qt/qthelp/qthelp-5.12.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~sparc ~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/qhelpgenerator
-)


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2022-03-18 18:07 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2022-03-18 18:07 UTC (permalink / raw
  To: gentoo-commits

commit:     50965d13a0f9561c0c1210d2c4495355946b7ff6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 18:00:37 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 18:07:10 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=50965d13

dev-qt/qthelp: Drop bogus dev-qt/qtnetwork DEPEND

Upstream pending patch, see also:
https://invent.kde.org/qt/qt/qttools/-/merge_requests/2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qthelp/qthelp-5.15.3.9999.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-5.15.3.9999.ebuild b/dev-qt/qthelp/qthelp-5.15.3.9999.ebuild
index d3ceff6b..0495ddc0 100644
--- a/dev-qt/qthelp/qthelp-5.15.3.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,12 +17,14 @@ IUSE=""
 DEPEND="
 	=dev-qt/qtcore-${QT5_PV}*:5=
 	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
 	=dev-qt/qtsql-${QT5_PV}*[sqlite]
 	=dev-qt/qtwidgets-${QT5_PV}*
 "
 RDEPEND="${DEPEND}"
 
+# https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
+PATCHES=( "${FILESDIR}/${PN}-5.15.3-bogusdep.patch" )
+
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help
 	src/assistant/qcollectiongenerator


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/
@ 2023-01-08 21:22 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2023-01-08 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     2941a239c6d7116d47abe9caece6d8f9590427b1
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 06:49:26 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 21:20:55 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2941a239

dev-qt/qthelp: keyword 5.15.7 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qthelp/qthelp-5.15.8.9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qthelp/qthelp-5.15.8.9999.ebuild b/dev-qt/qthelp/qthelp-5.15.8.9999.ebuild
index f7ded931..102a630d 100644
--- a/dev-qt/qthelp/qthelp-5.15.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.8.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 QT5_MODULE="qttools"


^ permalink raw reply related	[flat|nested] 20+ messages in thread
end of thread, other threads:[~2023-01-08 21:22 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-02  2:40 [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/ Davide Pesavento
  -- strict thread matches above, loose matches on Subject: below --
2023-01-08 21:22 Andreas Sturmlechner
2022-03-18 18:07 Andreas Sturmlechner
2019-02-24 15:21 Andreas Sturmlechner
2019-02-24 15:21 Andreas Sturmlechner
2018-08-15 14:20 Jimi Huotari
2018-08-15 14:11 Jimi Huotari
2017-11-25  3:33 Michael Palimaka
2016-07-13 17:37 Davide Pesavento
2014-11-26 18:30 Davide Pesavento
2014-11-16  4:09 Davide Pesavento
2014-09-02  0:08 Davide Pesavento
2014-07-11  1:35 Davide Pesavento
2014-05-27 22:59 Davide Pesavento
2014-05-27 22:59 Davide Pesavento
2014-05-15 16:52 Michael Palimaka
2013-08-01  6:58 Davide Pesavento
2013-07-18 14:03 Michael Palimaka
2013-07-11 18:17 Michael Palimaka
2013-03-08  8:13 Davide Pesavento

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox