summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-05-18 13:57:58 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-05-18 15:40:02 +0200
commite8719d56d82240c83b667d947ed88fc4fcfa9058 (patch)
treed37971662638d70ff932c5a5215f7a03145a854c /dev-qt/qdoc
parentdev-qt: Add Qt 5.11.0_rc2 (diff)
downloadgentoo-e8719d56d82240c83b667d947ed88fc4fcfa9058.tar.gz
gentoo-e8719d56d82240c83b667d947ed88fc4fcfa9058.tar.bz2
gentoo-e8719d56d82240c83b667d947ed88fc4fcfa9058.zip
dev-qt: Drop Qt 5.11.0_rc (1)
Package-Manager: Portage-2.3.38, Repoman-2.3.9
Diffstat (limited to 'dev-qt/qdoc')
-rw-r--r--dev-qt/qdoc/Manifest1
-rw-r--r--dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch239
-rw-r--r--dev-qt/qdoc/qdoc-5.11.0_rc.ebuild39
3 files changed, 0 insertions, 279 deletions
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 3ac8313e33dd..374a927a2add 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,4 +1,3 @@
-DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
DIST qttools-everywhere-src-5.11.0-rc2.tar.xz 9683312 BLAKE2B bca18b76d3519e8c3f62c54fafce0438c2403d2f3d3f88992216b068dadfacec71997437867a62b2b48764ef48d5433b78bfad24b5c17713c764927ca7d4e3b1 SHA512 0892645bafe1ada37dd353f3d6b8b3d4bd945a974501cb58354681310acab074705c98e91b2c4142b57b975e7806c2c712172c56c33bdfa9597201fbd5f26bfd
DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
diff --git a/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch b/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch
deleted file mode 100644
index e5496019b8e5..000000000000
--- a/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-Reverting upstream regression.
-
-
-From fddf7ee536e4fd0061d0ee933707881cebe54223 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@qt.io>
-Date: Wed, 18 Apr 2018 13:35:10 +0200
-Subject: Link qdoc to static libclang
-
-Done-with: Mikhail Svetkin <mikhail.svetkin@qt.io>
-Change-Id: Ifbd4e1b27f658f7d4f287a8a51f0cda54814e754
-Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
----
- mkspecs/features/qt_find_clang.prf | 197 ------------------------------------+
- src/qdoc/qdoc.pro | 8 --
- 2 files changed, 3 insertions(+), 202 deletions(-)
-
---- a/mkspecs/features/qt_find_clang.prf 2018-05-03 13:02:49.000000000 +0200
-+++ b/mkspecs/features/qt_find_clang.prf 2018-05-10 12:54:26.778546039 +0200
-@@ -90,200 +90,9 @@
-
- !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR): CLANG_LIBS = -L$${CLANG_LIBDIR}
- equals(QMAKE_HOST.os, Windows): \
-- CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore
-- else: {
-- !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group
-- CLANG_LIBS += -lclangAnalysis \
-- -lclangApplyReplacements \
-- -lclangARCMigrate \
-- -lclangAST \
-- -lclangASTMatchers \
-- -lclangBasic \
-- -lclangChangeNamespace \
-- -lclangCodeGen \
-- -lclangCrossTU \
-- -lclangDaemon \
-- -lclangDriver \
-- -lclangDynamicASTMatchers \
-- -lclangEdit \
-- -lclangFormat \
-- -lclangFrontend \
-- -lclangFrontendTool \
-- -lclangHandleCXX \
-- -lclangIncludeFixer \
-- -lclangIncludeFixerPlugin \
-- -lclangIndex \
-- -lclangLex \
-- -lclangMove \
-- -lclangParse \
-- -lclangQuery \
-- -lclangReorderFields \
-- -lclangRewrite \
-- -lclangRewriteFrontend \
-- -lclangSema \
-- -lclangSerialization \
-- -lclang_static \
-- -lclangStaticAnalyzerCheckers \
-- -lclangStaticAnalyzerCore \
-- -lclangStaticAnalyzerFrontend \
-- -lclangTidy \
-- -lclangTidyAndroidModule \
-- -lclangTidyBoostModule \
-- -lclangTidyBugproneModule \
-- -lclangTidyCERTModule \
-- -lclangTidyCppCoreGuidelinesModule \
-- -lclangTidyFuchsiaModule \
-- -lclangTidyGoogleModule \
-- -lclangTidyHICPPModule \
-- -lclangTidyLLVMModule \
-- -lclangTidyMiscModule \
-- -lclangTidyModernizeModule \
-- -lclangTidyMPIModule \
-- -lclangTidyObjCModule \
-- -lclangTidyPerformanceModule \
-- -lclangTidyPlugin \
-- -lclangTidyReadabilityModule \
-- -lclangTidyUtils \
-- -lclangTooling \
-- -lclangToolingASTDiff \
-- -lclangToolingCore \
-- -lclangToolingRefactor \
-- -lfindAllSymbols \
-- -lLLVMAArch64AsmParser \
-- -lLLVMAArch64AsmPrinter \
-- -lLLVMAArch64CodeGen \
-- -lLLVMAArch64Desc \
-- -lLLVMAArch64Disassembler \
-- -lLLVMAArch64Info \
-- -lLLVMAArch64Utils \
-- -lLLVMAMDGPUAsmParser \
-- -lLLVMAMDGPUAsmPrinter \
-- -lLLVMAMDGPUCodeGen \
-- -lLLVMAMDGPUDesc \
-- -lLLVMAMDGPUDisassembler \
-- -lLLVMAMDGPUInfo \
-- -lLLVMAMDGPUUtils \
-- -lLLVMAnalysis \
-- -lLLVMARMAsmParser \
-- -lLLVMARMAsmPrinter \
-- -lLLVMARMCodeGen \
-- -lLLVMARMDesc \
-- -lLLVMARMDisassembler \
-- -lLLVMARMInfo \
-- -lLLVMARMUtils \
-- -lLLVMAsmParser \
-- -lLLVMAsmPrinter \
-- -lLLVMBinaryFormat \
-- -lLLVMBitReader \
-- -lLLVMBitWriter \
-- -lLLVMBPFAsmParser \
-- -lLLVMBPFAsmPrinter \
-- -lLLVMBPFCodeGen \
-- -lLLVMBPFDesc \
-- -lLLVMBPFDisassembler \
-- -lLLVMBPFInfo \
-- -lLLVMCodeGen \
-- -lLLVMCore \
-- -lLLVMCoroutines \
-- -lLLVMCoverage \
-- -lLLVMDebugInfoCodeView \
-- -lLLVMDebugInfoDWARF \
-- -lLLVMDebugInfoMSF \
-- -lLLVMDebugInfoPDB \
-- -lLLVMDemangle \
-- -lLLVMDlltoolDriver \
-- -lLLVMExecutionEngine \
-- -lLLVMFuzzMutate \
-- -lLLVMGlobalISel \
-- -lLLVMHexagonAsmParser \
-- -lLLVMHexagonCodeGen \
-- -lLLVMHexagonDesc \
-- -lLLVMHexagonDisassembler \
-- -lLLVMHexagonInfo \
-- -lLLVMInstCombine \
-- -lLLVMInstrumentation \
-- -lLLVMInterpreter \
-- -lLLVMipo \
-- -lLLVMIRReader \
-- -lLLVMLanaiAsmParser \
-- -lLLVMLanaiAsmPrinter \
-- -lLLVMLanaiCodeGen \
-- -lLLVMLanaiDesc \
-- -lLLVMLanaiDisassembler \
-- -lLLVMLanaiInfo \
-- -lLLVMLibDriver \
-- -lLLVMLineEditor \
-- -lLLVMLinker \
-- -lLLVMLTO \
-- -lLLVMMC \
-- -lLLVMMCDisassembler \
-- -lLLVMMCJIT \
-- -lLLVMMCParser \
-- -lLLVMMipsAsmParser \
-- -lLLVMMipsAsmPrinter \
-- -lLLVMMipsCodeGen \
-- -lLLVMMipsDesc \
-- -lLLVMMipsDisassembler \
-- -lLLVMMipsInfo \
-- -lLLVMMIRParser \
-- -lLLVMMSP430AsmPrinter \
-- -lLLVMMSP430CodeGen \
-- -lLLVMMSP430Desc \
-- -lLLVMMSP430Info \
-- -lLLVMNVPTXAsmPrinter \
-- -lLLVMNVPTXCodeGen \
-- -lLLVMNVPTXDesc \
-- -lLLVMNVPTXInfo \
-- -lLLVMObjCARCOpts \
-- -lLLVMObject \
-- -lLLVMObjectYAML \
-- -lLLVMOption \
-- -lLLVMOrcJIT \
-- -lLLVMPasses \
-- -lLLVMPowerPCAsmParser \
-- -lLLVMPowerPCAsmPrinter \
-- -lLLVMPowerPCCodeGen \
-- -lLLVMPowerPCDesc \
-- -lLLVMPowerPCDisassembler \
-- -lLLVMPowerPCInfo \
-- -lLLVMProfileData \
-- -lLLVMRuntimeDyld \
-- -lLLVMScalarOpts \
-- -lLLVMSelectionDAG \
-- -lLLVMSparcAsmParser \
-- -lLLVMSparcAsmPrinter \
-- -lLLVMSparcCodeGen \
-- -lLLVMSparcDesc \
-- -lLLVMSparcDisassembler \
-- -lLLVMSparcInfo \
-- -lLLVMSupport \
-- -lLLVMSymbolize \
-- -lLLVMSystemZAsmParser \
-- -lLLVMSystemZAsmPrinter \
-- -lLLVMSystemZCodeGen \
-- -lLLVMSystemZDesc \
-- -lLLVMSystemZDisassembler \
-- -lLLVMSystemZInfo \
-- -lLLVMTableGen \
-- -lLLVMTarget \
-- -lLLVMTransformUtils \
-- -lLLVMVectorize \
-- -lLLVMWindowsManifest \
-- -lLLVMX86AsmParser \
-- -lLLVMX86AsmPrinter \
-- -lLLVMX86CodeGen \
-- -lLLVMX86Desc \
-- -lLLVMX86Disassembler \
-- -lLLVMX86Info \
-- -lLLVMX86Utils \
-- -lLLVMXCoreAsmPrinter \
-- -lLLVMXCoreCodeGen \
-- -lLLVMXCoreDesc \
-- -lLLVMXCoreDisassembler \
-- -lLLVMXCoreInfo \
-- -lLLVMXRay
-- !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--end-group
-- }
-+ CLANG_LIBS += -llibclang -ladvapi32 -lshell32
-+ else: \
-+ CLANG_LIBS += -lclang
-
- !versionIsAtLeast($$CLANG_VERSION, "3.9.0") {
- log("LLVM/Clang version >= 3.9.0 required, version provided: $${CLANG_VERSION}.$$escape_expand(\\n)")
---- a/src/qdoc/qdoc.pro 2018-05-10 12:51:22.832458913 +0200
-+++ b/src/qdoc/qdoc.pro 2018-05-10 12:54:27.746557021 +0200
-@@ -15,14 +15,6 @@
- LIBS += $$CLANG_LIBS
- !contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH
-
--# Support static libclang linking on different platforms
--equals(QMAKE_HOST.os, Windows): {
-- DEFINES += CINDEX_LINKAGE=
--} else {
-- LIBS += -lz -ldl
-- equals(QMAKE_HOST.os, Darwin): LIBS += -lcurses -lm -lxml2
--}
--
- !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR):!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR
- DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"$${CLANG_LIBDIR}/clang/$${CLANG_VERSION}/include\")
-
diff --git a/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild b/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild
deleted file mode 100644
index 2d1c8473347a..000000000000
--- a/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- sys-devel/clang:=
- qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/qdoc
-)
-
-PATCHES=( "${FILESDIR}/${PN}-5.11.0-revert-static-clang.patch" )
-
-src_prepare() {
- qt_use_disable_mod qml qmldevtools-private \
- src/qdoc/qdoc.pro
-
- export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
- # this is normally loaded in qttools.pro, so skipped by using
- # QT_TARGET_SUBDIRS causing build to fail
- sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
-
- qt5-build_src_prepare
-}