* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2014-05-15 16:52 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2014-05-15 16:52 UTC (permalink / raw
To: gentoo-commits
commit: de06b6b27147e3c68e34ce0083e535dd21144c1b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 16:51:34 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 15 16:51:34 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=de06b6b2
[dev-qt/assistant] Add Qt5 version.
Package-Manager: portage-2.2.8-r1
---
dev-qt/assistant/Manifest | 1 +
dev-qt/assistant/assistant-5.3.0_rc.ebuild | 42 ++++++++++++++++++++++++++++++
dev-qt/assistant/assistant-5.3.9999.ebuild | 33 +++++++++++++++++++++++
dev-qt/assistant/assistant-5.9999.ebuild | 33 +++++++++++++++++++++++
4 files changed, 109 insertions(+)
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
new file mode 100644
index 0000000..6c71c92
--- /dev/null
+++ b/dev-qt/assistant/Manifest
@@ -0,0 +1 @@
+DIST qttools-opensource-src-5.3.0-RC.tar.xz 8988688 SHA256 4e39e77c589fb6e5d1773e18b8c76f49747bc2ff1b7eb1012ab4f05feb37ede7 SHA512 cc040c95c2d42758de2e1e3779ff6c9580a27254fe4937f362a575f1526f323359d36b9046857c8083cedc54126fefa798c298ae04c1c1bb0e54e45a2e7038e5 WHIRLPOOL 621bdbd5a0c4186cc39ab4b01f441b77865282a0207735b554daa693b4ae44b5870b26f4de4ba7443eba6e7b4ce40037af5f66952962b3c2da867d1933821236
diff --git a/dev-qt/assistant/assistant-5.3.0_rc.ebuild b/dev-qt/assistant/assistant-5.3.0_rc.ebuild
new file mode 100644
index 0000000..ab4edd8
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.3.0_rc.ebuild
@@ -0,0 +1,42 @@
+# 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="webkit"
+
+DEPEND="
+ >=dev-qt/qtcore-${PV}:5[debug=]
+ >=dev-qt/qtgui-${PV}:5[debug=]
+ >=dev-qt/qthelp-${PV}:5[debug=]
+ >=dev-qt/qtnetwork-${PV}:5[debug=]
+ >=dev-qt/qtprintsupport-${PV}:5[debug=]
+ >=dev-qt/qtsql-${PV}:5[debug=,sqlite]
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/assistant/assistant
+)
+
+src_prepare() {
+ qt_use_disable_mod webkit webkitwidgets \
+ src/assistant/assistant/assistant.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/assistant/assistant-5.3.9999.ebuild b/dev-qt/assistant/assistant-5.3.9999.ebuild
new file mode 100644
index 0000000..3228701
--- /dev/null
+++ b/dev-qt/assistant/assistant-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/assistant/assistant-5.9999.ebuild b/dev-qt/assistant/assistant-5.9999.ebuild
new file mode 100644
index 0000000..3228701
--- /dev/null
+++ b/dev-qt/assistant/assistant-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] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2014-05-15 17:07 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2014-05-15 17:07 UTC (permalink / raw
To: gentoo-commits
commit: e76060d3f4b0de10da6bb2f6345b4bea6961c850
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 17:06:56 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 15 17:06:56 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e76060d3
[dev-qt/assistant] Use correct live ebuilds.
Package-Manager: portage-2.2.8-r1
---
dev-qt/assistant/assistant-5.3.9999.ebuild | 17 +++++++++++++----
dev-qt/assistant/assistant-5.9999.ebuild | 17 +++++++++++++----
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.3.9999.ebuild b/dev-qt/assistant/assistant-5.3.9999.ebuild
index 3228701..ab4edd8 100644
--- a/dev-qt/assistant/assistant-5.3.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.3.9999.ebuild
@@ -16,18 +16,27 @@ else
KEYWORDS="~amd64"
fi
-IUSE=""
+IUSE="webkit"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
+ >=dev-qt/qthelp-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtprintsupport-${PV}:5[debug=]
+ >=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
"
RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
- src/assistant/clucene
- src/assistant/help
+ src/assistant/assistant
)
+
+src_prepare() {
+ qt_use_disable_mod webkit webkitwidgets \
+ src/assistant/assistant/assistant.pro
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/assistant/assistant-5.9999.ebuild b/dev-qt/assistant/assistant-5.9999.ebuild
index 3228701..ab4edd8 100644
--- a/dev-qt/assistant/assistant-5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9999.ebuild
@@ -16,18 +16,27 @@ else
KEYWORDS="~amd64"
fi
-IUSE=""
+IUSE="webkit"
DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
+ >=dev-qt/qthelp-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtprintsupport-${PV}:5[debug=]
+ >=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
"
RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
- src/assistant/clucene
- src/assistant/help
+ src/assistant/assistant
)
+
+src_prepare() {
+ qt_use_disable_mod webkit webkitwidgets \
+ src/assistant/assistant/assistant.pro
+
+ qt5-build_src_prepare
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2016-01-06 13:49 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2016-01-06 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 58183f2170343139ef6fccc604acb0749631e44e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 13:32:37 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 13:32:37 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=58183f21
dev-qt/assistant: depend upon the last released version of qtwebkit
No further releases are expected.
Package-Manager: portage-2.2.26
dev-qt/assistant/assistant-5.5.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.6.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.5.9999.ebuild b/dev-qt/assistant/assistant-5.5.9999.ebuild
index 7505c99..7b1842a 100644
--- a/dev-qt/assistant/assistant-5.5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.5.9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( ~dev-qt/qtwebkit-${PV} )
+ webkit? ( >=dev-qt/qtwebkit-5.5.1 )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-5.6.9999.ebuild b/dev-qt/assistant/assistant-5.6.9999.ebuild
index 7505c99..7b1842a 100644
--- a/dev-qt/assistant/assistant-5.6.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.6.9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( ~dev-qt/qtwebkit-${PV} )
+ webkit? ( >=dev-qt/qtwebkit-5.5.1 )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-5.9999.ebuild b/dev-qt/assistant/assistant-5.9999.ebuild
index 7505c99..7b1842a 100644
--- a/dev-qt/assistant/assistant-5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( ~dev-qt/qtwebkit-${PV} )
+ webkit? ( >=dev-qt/qtwebkit-5.5.1 )
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2016-02-10 13:26 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2016-02-10 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 2d1e91e180b113b5577bf89013e3e85641a6bfc8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 13:19:55 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 13:25:52 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2d1e91e1
Revert "dev-qt/assistant: depend upon the last released version of qtwebkit"
Upstream will still be providing unsupported source-only releases.
This reverts commit 58183f2170343139ef6fccc604acb0749631e44e.
Gentoo-bug: 573562
dev-qt/assistant/assistant-5.6.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.6.9999.ebuild b/dev-qt/assistant/assistant-5.6.9999.ebuild
index 41c24c2..2fcad05 100644
--- a/dev-qt/assistant/assistant-5.6.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.6.9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( >=dev-qt/qtwebkit-5.5.1 )
+ webkit? ( ~dev-qt/qtwebkit-${PV} )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-5.9999.ebuild b/dev-qt/assistant/assistant-5.9999.ebuild
index 41c24c2..2fcad05 100644
--- a/dev-qt/assistant/assistant-5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( >=dev-qt/qtwebkit-5.5.1 )
+ webkit? ( ~dev-qt/qtwebkit-${PV} )
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2016-04-09 16:11 Davide Pesavento
0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2016-04-09 16:11 UTC (permalink / raw
To: gentoo-commits
commit: c1b67d1ee74a820f558ac1c8ade28a9bf309d1e6
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 16:03:57 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 16:03:57 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c1b67d1e
dev-qt/assistant: revert the last bit of 58183f2170343139ef6fccc604acb0749631e44e
We do have a proper qtwebkit-5.6.0 release now.
Package-Manager: portage-2.2.28
dev-qt/assistant/assistant-5.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/assistant/assistant-5.6.0.ebuild b/dev-qt/assistant/assistant-5.6.0.ebuild
index 875ef33..bd7939c 100644
--- a/dev-qt/assistant/assistant-5.6.0.ebuild
+++ b/dev-qt/assistant/assistant-5.6.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( >=dev-qt/qtwebkit-5.5.1 )
+ webkit? ( ~dev-qt/qtwebkit-${PV} )
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2017-10-07 18:08 Davide Pesavento
0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2017-10-07 18:08 UTC (permalink / raw
To: gentoo-commits
commit: 72af4e9d1d0c58c53e0e40e2748797f0eb20a389
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 7 18:03:51 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct 7 18:03:51 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=72af4e9d
dev-qt/assistant: add missing slot
Package-Manager: Portage-2.3.11, Repoman-2.3.3
dev-qt/assistant/assistant-5.10.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.9.2.ebuild | 2 +-
dev-qt/assistant/assistant-5.9.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.10.9999.ebuild b/dev-qt/assistant/assistant-5.10.9999.ebuild
index 02ad7650..6342c0fd 100644
--- a/dev-qt/assistant/assistant-5.10.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.10.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( >=dev-qt/qtwebkit-5.9.1 )
+ webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-5.9.2.ebuild b/dev-qt/assistant/assistant-5.9.2.ebuild
index 02ad7650..6342c0fd 100644
--- a/dev-qt/assistant/assistant-5.9.2.ebuild
+++ b/dev-qt/assistant/assistant-5.9.2.ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( >=dev-qt/qtwebkit-5.9.1 )
+ webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-5.9.9999.ebuild b/dev-qt/assistant/assistant-5.9.9999.ebuild
index 02ad7650..6342c0fd 100644
--- a/dev-qt/assistant/assistant-5.9.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( >=dev-qt/qtwebkit-5.9.1 )
+ webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-5.9999.ebuild b/dev-qt/assistant/assistant-5.9999.ebuild
index 02ad7650..6342c0fd 100644
--- a/dev-qt/assistant/assistant-5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( >=dev-qt/qtwebkit-5.9.1 )
+ webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2017-12-25 2:42 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2017-12-25 2:42 UTC (permalink / raw
To: gentoo-commits
commit: 03235d3408db759181a4c82263cd1dd782e8abab
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 02:42:02 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 02:42:14 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=03235d34
dev-qt/assistant: install icons and desktop file
Bug: https://bugs.gentoo.org/634566
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/assistant/assistant-5.10.0.ebuild | 20 +++++++++++++++++++-
dev-qt/assistant/assistant-5.10.9999.ebuild | 20 +++++++++++++++++++-
dev-qt/assistant/assistant-5.9.9999.ebuild | 20 +++++++++++++++++++-
dev-qt/assistant/assistant-5.9999.ebuild | 20 +++++++++++++++++++-
4 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.10.0.ebuild b/dev-qt/assistant/assistant-5.10.0.ebuild
index 6342c0fd..633d6456 100644
--- a/dev-qt/assistant/assistant-5.10.0.ebuild
+++ b/dev-qt/assistant/assistant-5.10.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
QT5_MODULE="qttools"
-inherit qt5-build
+inherit desktop gnome2-utils qt5-build
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
@@ -35,3 +35,21 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_install() {
+ qt5-build_src_install
+
+ doicon -s 32 src/assistant/assistant/images/assistant.png
+ newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+ qt5-build_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ qt5-build_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-qt/assistant/assistant-5.10.9999.ebuild b/dev-qt/assistant/assistant-5.10.9999.ebuild
index 6342c0fd..633d6456 100644
--- a/dev-qt/assistant/assistant-5.10.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.10.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
QT5_MODULE="qttools"
-inherit qt5-build
+inherit desktop gnome2-utils qt5-build
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
@@ -35,3 +35,21 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_install() {
+ qt5-build_src_install
+
+ doicon -s 32 src/assistant/assistant/images/assistant.png
+ newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+ qt5-build_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ qt5-build_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-qt/assistant/assistant-5.9.9999.ebuild b/dev-qt/assistant/assistant-5.9.9999.ebuild
index 6342c0fd..633d6456 100644
--- a/dev-qt/assistant/assistant-5.9.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
QT5_MODULE="qttools"
-inherit qt5-build
+inherit desktop gnome2-utils qt5-build
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
@@ -35,3 +35,21 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_install() {
+ qt5-build_src_install
+
+ doicon -s 32 src/assistant/assistant/images/assistant.png
+ newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+ qt5-build_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ qt5-build_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-qt/assistant/assistant-5.9999.ebuild b/dev-qt/assistant/assistant-5.9999.ebuild
index 6342c0fd..633d6456 100644
--- a/dev-qt/assistant/assistant-5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
QT5_MODULE="qttools"
-inherit qt5-build
+inherit desktop gnome2-utils qt5-build
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
@@ -35,3 +35,21 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_install() {
+ qt5-build_src_install
+
+ doicon -s 32 src/assistant/assistant/images/assistant.png
+ newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+ make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+ qt5-build_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ qt5-build_pkg_postrm
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2017-12-25 7:49 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2017-12-25 7:49 UTC (permalink / raw
To: gentoo-commits
commit: 969dcff479b5930914ba94206dce2748a4433cff
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 07:48:44 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 07:48:53 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=969dcff4
dev-qt/assistant: use fully qualified executable path
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/assistant/assistant-5.10.0.ebuild | 2 +-
dev-qt/assistant/assistant-5.10.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.9.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.10.0.ebuild b/dev-qt/assistant/assistant-5.10.0.ebuild
index 633d6456..dcfcae78 100644
--- a/dev-qt/assistant/assistant-5.10.0.ebuild
+++ b/dev-qt/assistant/assistant-5.10.0.ebuild
@@ -41,7 +41,7 @@ src_install() {
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
- make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+ make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 'Qt;Development;Documentation'
}
pkg_postinst() {
diff --git a/dev-qt/assistant/assistant-5.10.9999.ebuild b/dev-qt/assistant/assistant-5.10.9999.ebuild
index 633d6456..dcfcae78 100644
--- a/dev-qt/assistant/assistant-5.10.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.10.9999.ebuild
@@ -41,7 +41,7 @@ src_install() {
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
- make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+ make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 'Qt;Development;Documentation'
}
pkg_postinst() {
diff --git a/dev-qt/assistant/assistant-5.9.9999.ebuild b/dev-qt/assistant/assistant-5.9.9999.ebuild
index 633d6456..dcfcae78 100644
--- a/dev-qt/assistant/assistant-5.9.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9.9999.ebuild
@@ -41,7 +41,7 @@ src_install() {
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
- make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+ make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 'Qt;Development;Documentation'
}
pkg_postinst() {
diff --git a/dev-qt/assistant/assistant-5.9999.ebuild b/dev-qt/assistant/assistant-5.9999.ebuild
index 633d6456..dcfcae78 100644
--- a/dev-qt/assistant/assistant-5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9999.ebuild
@@ -41,7 +41,7 @@ src_install() {
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
- make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+ make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 'Qt;Development;Documentation'
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2017-12-25 7:56 Michael Palimaka
0 siblings, 0 replies; 12+ messages in thread
From: Michael Palimaka @ 2017-12-25 7:56 UTC (permalink / raw
To: gentoo-commits
commit: 18b5775c3c9b1454e84f42c899ddddd7a766b2a8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 07:56:00 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 07:56:15 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=18b5775c
dev-qt/assistant: be clear that this is Qt 5
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/assistant/assistant-5.10.0.ebuild | 2 +-
dev-qt/assistant/assistant-5.10.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.9.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.10.0.ebuild b/dev-qt/assistant/assistant-5.10.0.ebuild
index dcfcae78..ed774c31 100644
--- a/dev-qt/assistant/assistant-5.10.0.ebuild
+++ b/dev-qt/assistant/assistant-5.10.0.ebuild
@@ -41,7 +41,7 @@ src_install() {
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
- make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 'Qt;Development;Documentation'
+ make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
}
pkg_postinst() {
diff --git a/dev-qt/assistant/assistant-5.10.9999.ebuild b/dev-qt/assistant/assistant-5.10.9999.ebuild
index dcfcae78..ed774c31 100644
--- a/dev-qt/assistant/assistant-5.10.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.10.9999.ebuild
@@ -41,7 +41,7 @@ src_install() {
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
- make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 'Qt;Development;Documentation'
+ make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
}
pkg_postinst() {
diff --git a/dev-qt/assistant/assistant-5.9.9999.ebuild b/dev-qt/assistant/assistant-5.9.9999.ebuild
index dcfcae78..ed774c31 100644
--- a/dev-qt/assistant/assistant-5.9.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9.9999.ebuild
@@ -41,7 +41,7 @@ src_install() {
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
- make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 'Qt;Development;Documentation'
+ make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
}
pkg_postinst() {
diff --git a/dev-qt/assistant/assistant-5.9999.ebuild b/dev-qt/assistant/assistant-5.9999.ebuild
index dcfcae78..ed774c31 100644
--- a/dev-qt/assistant/assistant-5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9999.ebuild
@@ -41,7 +41,7 @@ src_install() {
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
- make_desktop_entry "${QT5_BINDIR}"/assistant Assistant assistant 'Qt;Development;Documentation'
+ make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2020-11-22 22:56 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-11-22 22:56 UTC (permalink / raw
To: gentoo-commits
commit: e7498cf21ad79110e81d43a1fac60f645d994603
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 21:02:17 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 21:02:17 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e7498cf2
dev-qt/assistant: Drop IUSE=webkit
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/assistant/assistant-5.15.9999.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.15.9999.ebuild b/dev-qt/assistant/assistant-5.15.9999.ebuild
index 7f0b3ec1..cb232618 100644
--- a/dev-qt/assistant/assistant-5.15.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.15.9999.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qttools"
inherit desktop qt5-build xdg-utils
@@ -11,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
fi
-IUSE="webkit"
+IUSE=""
DEPEND="
~dev-qt/qtcore-${PV}:5=
@@ -21,7 +22,6 @@ DEPEND="
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtsql-${PV}[sqlite]
~dev-qt/qtwidgets-${PV}
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
"
RDEPEND="${DEPEND}"
@@ -30,8 +30,8 @@ QT5_TARGET_SUBDIRS=(
)
src_prepare() {
- qt_use_disable_mod webkit webkitwidgets \
- src/assistant/assistant/assistant.pro
+ sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
+ -i src/assistant/assistant/assistant.pro || die
qt5-build_src_prepare
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2021-09-15 20:33 Davide Pesavento
0 siblings, 0 replies; 12+ messages in thread
From: Davide Pesavento @ 2021-09-15 20:33 UTC (permalink / raw
To: gentoo-commits
commit: 068106352defed14782534201d45c009745a19a9
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 20:24:38 2021 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 20:24:38 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=06810635
dev-qt/assistant: png support in qtgui is required
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
dev-qt/assistant/assistant-5.15.2.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/assistant/assistant-5.15.2.9999.ebuild b/dev-qt/assistant/assistant-5.15.2.9999.ebuild
index 54070de8..f9f9de34 100644
--- a/dev-qt/assistant/assistant-5.15.2.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.15.2.9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
- =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*[png]
=dev-qt/qthelp-${QT5_PV}*
=dev-qt/qtnetwork-${QT5_PV}*
=dev-qt/qtprintsupport-${QT5_PV}*
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/
@ 2022-03-21 10:06 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2022-03-21 10:06 UTC (permalink / raw
To: gentoo-commits
commit: 626b5041b583a5b90aeedc571a0619ec59a42d26
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 21:01:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:04:46 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=626b5041
dev-qt/assistant: Symlink assistant to /usr/bin/assistant
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/assistant/assistant-5.15.3.9999.ebuild | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.15.3.9999.ebuild b/dev-qt/assistant/assistant-5.15.3.9999.ebuild
index f9f9de34..52bf83ac 100644
--- a/dev-qt/assistant/assistant-5.15.3.9999.ebuild
+++ b/dev-qt/assistant/assistant-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
@@ -23,7 +23,10 @@ DEPEND="
=dev-qt/qtsql-${QT5_PV}*[sqlite]
=dev-qt/qtwidgets-${QT5_PV}*
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !dev-qt/${PN}:5
+ !<dev-qt/qtchooser-66-r2
+"
QT5_TARGET_SUBDIRS=(
src/assistant/assistant
@@ -38,6 +41,7 @@ src_prepare() {
src_install() {
qt5-build_src_install
+ qt5_symlink_binary_to_path assistant
doicon -s 32 src/assistant/assistant/images/assistant.png
newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-03-21 10:06 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-09 16:11 [gentoo-commits] proj/qt:master commit in: dev-qt/assistant/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2022-03-21 10:06 Andreas Sturmlechner
2021-09-15 20:33 Davide Pesavento
2020-11-22 22:56 Andreas Sturmlechner
2017-12-25 7:56 Michael Palimaka
2017-12-25 7:49 Michael Palimaka
2017-12-25 2:42 Michael Palimaka
2017-10-07 18:08 Davide Pesavento
2016-02-10 13:26 Michael Palimaka
2016-01-06 13:49 Michael Palimaka
2014-05-15 17:07 Michael Palimaka
2014-05-15 16:52 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox