diff options
| -rw-r--r-- | dev-qt/qdoc/Manifest | 1 | ||||
| -rw-r--r-- | dev-qt/qdoc/qdoc-5.15.2-r1.ebuild | 32 | ||||
| -rw-r--r-- | dev-qt/qdoc/qdoc-5.15.2-r10.ebuild | 43 |
3 files changed, 44 insertions, 32 deletions
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest index c9faaf55f594..2ad3df5c2a7f 100644 --- a/dev-qt/qdoc/Manifest +++ b/dev-qt/qdoc/Manifest @@ -1 +1,2 @@ +DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b diff --git a/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild b/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild deleted file mode 100644 index 09d86b11c1d4..000000000000 --- a/dev-qt/qdoc/qdoc-5.15.2-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt documentation generator" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtcore-${PV}:5= - sys-devel/clang:= - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -# TODO: we know it is bogus, figure out how to disable checks, bug 802492 -DEPEND="${RDEPEND} - ~dev-qt/qtxml-${PV} -" - -src_prepare() { - qt_use_disable_mod qml qmldevtools-private \ - src/qdoc/qdoc.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild b/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild new file mode 100644 index 000000000000..1a250f857b1d --- /dev/null +++ b/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402 +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="Qt documentation generator" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +IUSE="qml" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-devel/clang:= + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/qdoc +) + +src_prepare() { + qt_use_disable_mod qml qmldevtools-private \ + src/qdoc/qdoc.pro + + qt5-build_src_prepare +} + +src_configure() { + # qt5_tools_configure() not enough here, needs another fix, bug 676948 + mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die + qt5_qmake "${QT5_BUILD_DIR}" + cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die + + qt5-build_src_configure +} |