dev-qt/qt-creator: version bump to 4.6.1

Closes: https://bugs.gentoo.org/651960
Closes: https://github.com/gentoo/gentoo/pull/8257
Package-Manager: Portage-2.3.38, Repoman-2.3.9

3 files changed, 174 insertions, 1 deletions

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2e69608aea8d..fd77dd7b3a12 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-4.5.2.tar.xz 21745192 BLAKE2B 4860c6041542758647d27ae3aaac15dbbc72bbecbcf335e3bceab378c720979a3e89777762936a4b68eacec02a7b285dec08a19003ac3260de1e2e4ee12706c0 SHA512 cc3f20c109e810e8958495fd0d84461bc9ead7b4172600229969a6a331341f0b76069a71893f1ba279550293b131f6cca5b79c112d67f3aebb6244415489c223
 DIST qt-creator-opensource-src-4.6.0-rc1.tar.xz 23389240 BLAKE2B 2fbfe5a6a3b09d439439846dbcbad87d1f5032a35c36fa713e8949d1c3f2c44cf1912fd465f9c97f29204803843cff4c4ecdf7083e8963f3512c0dbfa1594a1f SHA512 eb794935bdbe26362a8dc5a7e62dc8004e808d1485039739af06c92b6e98a6b9d4870f68e5912990acd9970bd8ec518aacd759ece60fe6f0eafc7cd1af981d7d
+DIST qt-creator-opensource-src-4.6.1.tar.xz 23403488 BLAKE2B 32fc6d655616302721cccedc82e54a2f3c6e61a5736f0e0f08d56e53dba7ba130ac601c4b3ca9034f9d90cc6f97b3b152a4a985c71f996cd3860124159b9f0e1 SHA512 c5cf1eac02390ce0a52799b90664faf6ba5c5106aa1f5f2ecf4397b45bfb6dcd11480a29dc94600b6e99a911949f71f3f844b34201623edb35fbd5364ce53236
diff --git a/dev-qt/qt-creator/qt-creator-4.6.1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
new file mode 100644
index 000000000000..f18340089d13
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	clangcodemodel? ( >=sys-devel/clang-5:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.11.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/\(dumpers\|offsets\)\.pro/ d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
+	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 29fd39334fc0..9a301fa2fae8 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -53,7 +53,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-5:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.10.1 )
+	qbs? ( >=dev-util/qbs-1.11.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "