public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-04-23  8:01 Patrick Lauer (patrick)
  0 siblings, 0 replies; 17+ messages in thread
From: Patrick Lauer (patrick) @ 2014-04-23  8:01 UTC (permalink / raw
  To: gentoo-commits

patrick     14/04/23 08:01:30

  Modified:             ChangeLog
  Added:                qt5-build.eclass
  Log:
  Add qt5-build eclass from qt overlay

Revision  Changes    Path
1.1223               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1223&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1223&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1222&r2=1.1223

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1222
retrieving revision 1.1223
diff -u -r1.1222 -r1.1223
--- ChangeLog	22 Apr 2014 20:12:53 -0000	1.1222
+++ ChangeLog	23 Apr 2014 08:01:30 -0000	1.1223
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1222 2014/04/22 20:12:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1223 2014/04/23 08:01:30 patrick Exp $
+
+  23 Apr 2014; Patrick Lauer <patrick@gentoo.org> +qt5-build.eclass:
+  Add qt5-build eclass from qt overlay
 
   22 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
   Remove the QA warning from multilib_is_native_abi() till we decide which one



1.1                  eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.1&content-type=text/plain

Index: qt5-build.eclass
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.1 2014/04/23 08:01:30 patrick Exp $

# @ECLASS: qt5-build.eclass
# @MAINTAINER:
# Qt herd <qt@gentoo.org>
# @AUTHOR:
# Davide Pesavento <pesa@gentoo.org>
# @BLURB: Eclass for Qt5 split ebuilds.
# @DESCRIPTION:
# This eclass contains various functions that are used when building Qt5.
# Requires EAPI 5.

case ${EAPI} in
	5)	: ;;
	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
esac

# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
# @DESCRIPTION:
# For proper description see virtualx.eclass manpage.
# Here we redefine default value to be manual, if your package needs virtualx
# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
: ${VIRTUALX_REQUIRED:=manual}

inherit eutils flag-o-matic multilib toolchain-funcs versionator virtualx

HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
LICENSE="|| ( LGPL-2.1 GPL-3 )"
SLOT="5"

# @ECLASS-VARIABLE: QT5_MODULE
# @DESCRIPTION:
# The upstream name of the module this package belongs to. Used for
# SRC_URI and EGIT_REPO_URI. Must be defined before inheriting the eclass.
: ${QT5_MODULE:=${PN}}

case ${PV} in
	5.9999)
		# git dev branch
		QT5_BUILD_TYPE="live"
		EGIT_BRANCH="dev"
		;;
	5.?.9999)
		# git stable branch
		QT5_BUILD_TYPE="live"
		EGIT_BRANCH="stable"
		;;
	*_alpha*|*_beta*|*_rc*)
		# pre-releases
		QT5_BUILD_TYPE="release"
		MY_P="${QT5_MODULE}-opensource-src-${PV/_/-}"
		SRC_URI="http://download.qt-project.org/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
		S=${WORKDIR}/${MY_P}
		;;
	*)
		# official stable releases
		QT5_BUILD_TYPE="release"
		MY_P="${QT5_MODULE}-opensource-src-${PV}"
		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
		S=${WORKDIR}/${MY_P}
		;;
esac

EGIT_REPO_URI=(
	"git://gitorious.org/qt/${QT5_MODULE}.git"
	"https://git.gitorious.org/qt/${QT5_MODULE}.git"
)
[[ ${QT5_BUILD_TYPE} == "live" ]] && inherit git-r3

IUSE="debug test"

DEPEND="
	>=dev-lang/perl-5.14
	virtual/pkgconfig
"
if [[ ${PN} != "qttest" ]]; then
	if [[ ${QT5_MODULE} == "qtbase" ]]; then
		DEPEND+=" test? ( ~dev-qt/qttest-${PV}[debug=] )"
	else
		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
	fi
fi

EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm

# @ECLASS-VARIABLE: PATCHES
# @DEFAULT_UNSET
# @DESCRIPTION:
# Array variable containing all the patches to be applied. This variable
# is expected to be defined in the global scope of ebuilds. Make sure to
# specify the full path. This variable is used in src_prepare phase.
#
# Example:
# @CODE
#	PATCHES=(
#		"${FILESDIR}/mypatch.patch"
#		"${FILESDIR}/mypatch2.patch"
#	)
# @CODE

# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
# @DEFAULT_UNSET
# @DESCRIPTION:
# Array variable containing the source directories that should be built.
# All paths must be relative to ${S}.

# @ECLASS-VARIABLE: QT5_BUILD_DIR
# @DESCRIPTION:
# Build directory for out-of-source builds.
: ${QT5_BUILD_DIR:=${S}_build}

# @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
# @DESCRIPTION:
# Set to false to reduce build output during compilation.
: ${QT5_VERBOSE_BUILD:=true}

# @ECLASS-VARIABLE: QCONFIG_ADD
# @DEFAULT_UNSET
# @DESCRIPTION:
# Array of options that must be added to QT_CONFIG in qconfig.pri

# @ECLASS-VARIABLE: QCONFIG_REMOVE
# @DEFAULT_UNSET
# @DESCRIPTION:
# Array of options that must be removed from QT_CONFIG in qconfig.pri

# @ECLASS-VARIABLE: QCONFIG_DEFINE
# @DEFAULT_UNSET
# @DESCRIPTION:
# Array of macros that must be defined in QtCore/qconfig.h

# @FUNCTION: qt5-build_pkg_setup
# @DESCRIPTION:
# Warns and/or dies if the user is trying to downgrade Qt.
qt5-build_pkg_setup() {
	# Warn users of possible breakage when downgrading to a previous release.
	# Downgrading revisions within the same release is safe.
	if has_version ">${CATEGORY}/${P}-r9999:5"; then
		ewarn
		ewarn "Downgrading Qt is completely unsupported and can break your system!"
		ewarn
	fi
}

# @FUNCTION: qt5-build_src_unpack
# @DESCRIPTION:
# Unpacks the sources.
qt5-build_src_unpack() {
	if ! version_is_at_least 4.4 $(gcc-version); then
		ewarn
		ewarn "Using a GCC version lower than 4.4 is not supported."
		ewarn
	fi

	if [[ ${PN} == "qtwebkit" ]]; then
		eshopts_push -s extglob
		if is-flagq '-g?(gdb)?([1-9])'; then
			ewarn
			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
			ewarn "You may experience really long compilation times and/or increased memory usage."
			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
			ewarn "For more info check out https://bugs.gentoo.org/307861"
			ewarn
		fi
		eshopts_pop
	fi

	case ${QT5_BUILD_TYPE} in
		live)
			git-r3_src_unpack
			;;
		release)
			default
			;;
	esac
}

# @FUNCTION: qt5-build_src_prepare
# @DESCRIPTION:
# Prepares the sources before the configure phase.
qt5-build_src_prepare() {
	qt5_prepare_env

	if [[ ${QT5_MODULE} == "qtbase" ]]; then
		# Avoid unnecessary qmake recompilations
		sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
			configure || die "sed failed (skip qmake bootstrap)"

		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
			-e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \
			configure || die "sed failed (respect env for qmake build)"
		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"

		# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
		# or they will override user's flags (bug 427782)
		sed -i -e '/^SYSTEM_VARIABLES=/ i \
			QMakeVar set QMAKE_CFLAGS_RELEASE\
			QMakeVar set QMAKE_CFLAGS_DEBUG\
			QMakeVar set QMAKE_CXXFLAGS_RELEASE\
			QMakeVar set QMAKE_CXXFLAGS_DEBUG\
			QMakeVar set QMAKE_LFLAGS_RELEASE\
			QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
			configure || die "sed failed (QMAKE_*FLAGS_{RELEASE,DEBUG})"

		# Respect CXX in configure
		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
			configure || die "sed failed (QMAKE_CONF_COMPILER)"

		# Respect toolchain and flags in config.tests
		find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
			sed -ri -e '/CXXFLAGS=/ s/"(\$CXXFLAGS) (\$PARAM)"/"\2 \1"/' \
				-e '/LFLAGS=/ s/"(\$LFLAGS) (\$PARAM)"/"\2 \1"/' \
				-e '/bin\/qmake/ s/-nocache //' \
			|| die "sed failed (config.tests)"
	fi

	if [[ ${PN} != "qtcore" ]]; then
		qt5_symlink_tools_to_buildtree
	fi

	# Apply patches
	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
	epatch_user
}

# @FUNCTION: qt5-build_src_configure
# @DESCRIPTION:
# Runs qmake, possibly preceded by ./configure.
qt5-build_src_configure() {
	# toolchain setup
	tc-export CC CXX RANLIB STRIP
	# qmake-generated Makefiles use LD/LINK for linking
	export LD="$(tc-getCXX)"

	mkdir -p "${QT5_BUILD_DIR}" || die
	pushd "${QT5_BUILD_DIR}" > /dev/null || die

	if [[ ${QT5_MODULE} == "qtbase" ]]; then
		qt5_base_configure
	fi

	qt5_foreach_target_subdir qt5_qmake

	popd > /dev/null || die
}

# @FUNCTION: qt5-build_src_compile
# @DESCRIPTION:
# Compiles the code in target directories.
qt5-build_src_compile() {
	qt5_foreach_target_subdir emake
}

# @FUNCTION: qt5-build_src_test
# @DESCRIPTION:
# Runs tests in target directories.
# TODO: find a way to avoid circular deps with USE=test.
qt5-build_src_test() {
	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"

	# create a custom testrunner script that correctly sets
	# {,DY}LD_LIBRARY_PATH before executing the given test
	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
	cat <<-EOF > "${testrunner}"
	#!/bin/sh
	export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
	export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
	"\$@"
	EOF
	chmod +x "${testrunner}"

	qt5_foreach_target_subdir qt5_qmake
	qt5_foreach_target_subdir emake

	_test_runner() {
		qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
	}

	if [[ ${VIRTUALX_REQUIRED} == test ]]; then
		VIRTUALX_COMMAND="_test_runner" virtualmake
	else
		_test_runner
	fi
}

# @FUNCTION: qt5-build_src_install
# @DESCRIPTION:
# Performs the actual installation of target directories.
qt5-build_src_install() {
	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install

	if [[ ${PN} == "qtcore" ]]; then
		pushd "${QT5_BUILD_DIR}" > /dev/null || die
		einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake,syncqt}"
		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
		popd > /dev/null || die

		# create an empty Gentoo/gentoo-qconfig.h
		dodir "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo
		: > "${D}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h

		# include gentoo-qconfig.h at the beginning of QtCore/qconfig.h
		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
			|| die "sed failed (qconfig.h)"
	fi

	qt5_install_module_qconfigs

	# remove .la files since we are building only shared libraries
	prune_libtool_files
}

# @FUNCTION: qt5-build_pkg_postinst
# @DESCRIPTION:
# Regenerate configuration, plus throw a message about possible
# breakages and proposed solutions.
qt5-build_pkg_postinst() {
	qt5_regenerate_global_qconfigs
}

# @FUNCTION: qt5-build_pkg_postrm
# @DESCRIPTION:
# Regenerate configuration when the package is completely removed.
qt5-build_pkg_postrm() {
	if [[ -z ${REPLACED_BY_VERSION} && ${PN} != "qtcore" ]]; then
		qt5_regenerate_global_qconfigs
	fi
}

# @FUNCTION: qt_use
# @USAGE: <flag> [feature] [enableval]
# @DESCRIPTION:
# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
# "-no-${feature}" if it's disabled. If [feature] is not specified,
# <flag> will be used for that. If [enableval] is not specified, the
# "-${enableval}" prefix is omitted.
qt_use() {
	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
}

# @FUNCTION: qt_use_disable_mod
# @USAGE: <flag> <module> <files...>
# @DESCRIPTION:
# <flag> is the name of a flag in IUSE.
# <module> is the (lowercase) name of a Qt5 module.
# <files...> is a list of one or more qmake project files.
#
# This function patches <files> to treat <module> as not installed
# when <flag> is disabled, otherwise it does nothing.
# This can be useful to avoid an automagic dependency when the module
# is present on the system but the corresponding USE flag is disabled.
qt_use_disable_mod() {
	[[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least 3 arguments"

	local flag=$1
	local module=$2
	shift 2

	use "${flag}" && return

	echo "$@" | xargs sed -i -e "s/qtHaveModule(${module})/false/g" || die
}


######  Internal functions  ######

# @FUNCTION: qt5_prepare_env
# @INTERNAL
# @DESCRIPTION:
# Prepares the environment for building Qt.
qt5_prepare_env() {
	# setup installation directories
	QT5_PREFIX=${EPREFIX}/usr
	QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
	QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
	QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
	QT5_BINDIR=${QT5_ARCHDATADIR}/bin
	QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
	QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
	QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
	QT5_DATADIR=${QT5_PREFIX}/share/qt5
	QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
	QT5_TESTSDIR=${QT5_DATADIR}/tests
	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5

	if [[ ${QT5_MODULE} == "qtbase" ]]; then
		# see mkspecs/features/qt_config.prf
		# note: this could be the cause of bug 451456, so do it
		#       only when really needed, i.e. for qtbase modules
		export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules"
	fi
}

# @FUNCTION: qt5_symlink_tools_to_buildtree
# @INTERNAL
# @DESCRIPTION:
# Symlinks qtcore tools to buildtree, so they can be used when building other modules.
qt5_symlink_tools_to_buildtree() {
	mkdir -p "${QT5_BUILD_DIR}"/bin || die

	local bin
	for bin in "${QT5_BINDIR}"/{qmake,moc,rcc,uic,qdoc,qdbuscpp2xml,qdbusxml2cpp}; do
		if [[ -e ${bin} ]]; then
			ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
		fi
	done
}

# @FUNCTION: qt5_base_configure
# @INTERNAL
# @DESCRIPTION:
# Runs ./configure for modules belonging to qtbase.
qt5_base_configure() {
	# configure arguments
	local conf=(
		# installation paths
		-prefix "${QT5_PREFIX}"
		-bindir "${QT5_BINDIR}"
		-headerdir "${QT5_HEADERDIR}"
		-libdir "${QT5_LIBDIR}"
		-archdatadir "${QT5_ARCHDATADIR}"
		-plugindir "${QT5_PLUGINDIR}"
		-libexecdir "${QT5_LIBEXECDIR}"
		-importdir "${QT5_IMPORTDIR}"
		-qmldir "${QT5_QMLDIR}"
		-datadir "${QT5_DATADIR}"
		-docdir "${QT5_DOCDIR}"
		-translationdir "${QT5_TRANSLATIONDIR}"
		-sysconfdir "${QT5_SYSCONFDIR}"
		-examplesdir "${QT5_EXAMPLESDIR}"
		-testsdir "${QT5_TESTSDIR}"

		# debug/release
		$(use debug && echo -debug || echo -release)
		-no-separate-debug-info

		# licensing stuff
		-opensource -confirm-license

		# build shared libraries
		-shared

		# disabling accessibility support is not recommended by upstream,
		# as it will break QStyle and may break other internal parts of Qt
		-accessibility

		# use pkg-config to detect include and library paths
		-pkg-config

		# prefer system libraries
		-system-zlib
		-system-pcre
		-system-xcb
		-system-xkbcommon

		# exclude examples and tests from default build
		-nomake examples
		-nomake tests

		# disable rpath on non-prefix (bugs 380415 and 417169)
		$(use prefix || echo -no-rpath)

		# verbosity of the configure and build phases
		-verbose $(${QT5_VERBOSE_BUILD} || echo -silent)

		# don't strip
		-no-strip

		# precompiled headers aren't really useful for us
		# and cause problems on hardened, so turn them off
		-no-pch

		# reduce relocations in libraries through extra linker optimizations
		# requires GNU ld >= 2.18
		-reduce-relocations

		# disable all SQL drivers by default, override in qtsql
		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds

		# disable all platform plugins by default, override in qtgui
		-no-xcb -no-xrender -no-eglfs -no-directfb -no-linuxfb -no-kms

		# disable gtkstyle because it adds qt4 include paths to the compiler
		# command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
		-no-gtkstyle

		# do not build with -Werror
		-no-warnings-are-errors

		# module-specific options
		"${myconf[@]}"
	)

	einfo "Configuring with: ${conf[@]}"
	"${S}"/configure "${conf[@]}" || die "configure failed"
}

# @FUNCTION: qt5_qmake
# @INTERNAL
# @DESCRIPTION:
# Helper function that runs qmake in the current target subdir.
# Intended to be called by qt5_foreach_target_subdir().
qt5_qmake() {
	local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}}

	"${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" \
		|| die "qmake failed (${projectdir})"
}

# @FUNCTION: qt5_foreach_target_subdir
# @INTERNAL
# @DESCRIPTION:
# Executes the arguments inside each directory listed in QT5_TARGET_SUBDIRS.
qt5_foreach_target_subdir() {
	[[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")

	local subdir
	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
		if [[ ${EBUILD_PHASE} == "test" ]]; then
			subdir=tests/auto${subdir#src}
			[[ -d ${S}/${subdir} ]] || continue
		fi

		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
		pushd "${QT5_BUILD_DIR}/${subdir}" > /dev/null || die

		einfo "Running $* ${subdir:+in ${subdir}}"
		"$@"

		popd > /dev/null || die
	done
}

# @FUNCTION: qt5_install_module_qconfigs
# @INTERNAL
# @DESCRIPTION:
# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
qt5_install_module_qconfigs() {
	local x

	# qconfig.h
	: > "${T}"/${PN}-qconfig.h
	for x in "${QCONFIG_DEFINE[@]}"; do
		echo "#define ${x}" >> "${T}"/${PN}-qconfig.h
	done
	[[ -s ${T}/${PN}-qconfig.h ]] && (
		insinto "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo
		doins "${T}"/${PN}-qconfig.h
	)

	# qconfig.pri
	: > "${T}"/${PN}-qconfig.pri
	[[ -n ${QCONFIG_ADD[@]} ]] && echo "QCONFIG_ADD=${QCONFIG_ADD[@]}" \
		>> "${T}"/${PN}-qconfig.pri
	[[ -n ${QCONFIG_REMOVE[@]} ]] && echo "QCONFIG_REMOVE=${QCONFIG_REMOVE[@]}" \
		>> "${T}"/${PN}-qconfig.pri
	[[ -s ${T}/${PN}-qconfig.pri ]] && (
		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
		doins "${T}"/${PN}-qconfig.pri
	)
}

# @FUNCTION: qt5_regenerate_global_qconfigs
# @INTERNAL
# @DESCRIPTION:
# Generates gentoo-specific qconfig.{h,pri}.
# Don't die here because dying in pkg_post{inst,rm} just makes things worse.
qt5_regenerate_global_qconfigs() {
	einfo "Regenerating gentoo-qconfig.h"

	find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \
		-name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \
		-execdir cat '{}' + > "${T}"/gentoo-qconfig.h

	[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty"
	mv -f "${T}"/gentoo-qconfig.h "${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
		|| eerror "Failed to install new gentoo-qconfig.h"

	einfo "Updating QT_CONFIG in qconfig.pri"

	local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
	if [[ -f ${qconfig_pri} ]]; then
		local x qconfig_add= qconfig_remove=
		local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}")
		local new_qt_config=

		# generate list of QT_CONFIG entries from the existing list,
		# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
		eshopts_push -s nullglob
		for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=\s*//p' "${x}")"
			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=\s*//p' "${x}")"
		done
		eshopts_pop
		for x in ${qt_config} ${qconfig_add}; do
			if ! has "${x}" ${new_qt_config} ${qconfig_remove}; then
				new_qt_config+=" ${x}"
			fi
		done

		# now replace the existing QT_CONFIG with the generated list
		sed -i -e "s/^QT_CONFIG\s*+=.*/QT_CONFIG +=${new_qt_config}/" \
			"${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in ${qconfig_pri}"
	else
		ewarn "${qconfig_pri} does not exist or is not a regular file"
	fi
}





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-04-23 11:53 Mikle Kolyada (zlogene)
  0 siblings, 0 replies; 17+ messages in thread
From: Mikle Kolyada (zlogene) @ 2014-04-23 11:53 UTC (permalink / raw
  To: gentoo-commits

zlogene     14/04/23 11:53:32

  Modified:             ChangeLog
  Removed:              qt5-build.eclass
  Log:
  Drop qt5-build eclass

Revision  Changes    Path
1.1224               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1224&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1224&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1223&r2=1.1224

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1223
retrieving revision 1.1224
diff -u -r1.1223 -r1.1224
--- ChangeLog	23 Apr 2014 08:01:30 -0000	1.1223
+++ ChangeLog	23 Apr 2014 11:53:32 -0000	1.1224
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1223 2014/04/23 08:01:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1224 2014/04/23 11:53:32 zlogene Exp $
+
+  23 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> -qt5-build.eclass:
+  Drop qt5-build eclass
 
   23 Apr 2014; Patrick Lauer <patrick@gentoo.org> +qt5-build.eclass:
   Add qt5-build eclass from qt overlay





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-08-29 23:38 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2014-08-29 23:38 UTC (permalink / raw
  To: gentoo-commits

pesa        14/08/29 23:38:05

  Modified:             ChangeLog
  Added:                qt5-build.eclass
  Log:
  Initial commit of qt5-build.eclass

Revision  Changes    Path
1.1360               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1360&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1360&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1359&r2=1.1360

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1359
retrieving revision 1.1360
diff -u -r1.1359 -r1.1360
--- ChangeLog	29 Aug 2014 18:50:39 -0000	1.1359
+++ ChangeLog	29 Aug 2014 23:38:05 -0000	1.1360
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1359 2014/08/29 18:50:39 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1360 2014/08/29 23:38:05 pesa Exp $
+
+  30 Aug 2014; Davide Pesavento <pesa@gentoo.org> +qt5-build.eclass:
+  Initial commit of qt5-build.eclass
 
   30 Aug 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
   Fix percona-server SRC_URI, add missing dep on mariadb-galera for rsync sst,



1.3                  eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.2&r2=1.3






^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-09-11  0:08 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2014-09-11  0:08 UTC (permalink / raw
  To: gentoo-commits

pesa        14/09/11 00:08:57

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Restrict tests on 5.3.x (except live).

Revision  Changes    Path
1.1367               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1367&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1367&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1366&r2=1.1367

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1366
retrieving revision 1.1367
diff -u -r1.1366 -r1.1367
--- ChangeLog	4 Sep 2014 14:52:58 -0000	1.1366
+++ ChangeLog	11 Sep 2014 00:08:57 -0000	1.1367
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1366 2014/09/04 14:52:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1367 2014/09/11 00:08:57 pesa Exp $
+
+  11 Sep 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Restrict tests on 5.3.x (except live).
 
   04 Sep 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass,
   tests/python-utils-r1.sh:



1.5                  eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.4&r2=1.5

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt5-build.eclass	29 Aug 2014 23:54:14 -0000	1.4
+++ qt5-build.eclass	11 Sep 2014 00:08:57 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.4 2014/08/29 23:54:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.5 2014/09/11 00:08:57 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -71,6 +71,8 @@
 
 IUSE="debug test"
 
+[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT="test"
+
 DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-09-16 14:18 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2014-09-16 14:18 UTC (permalink / raw
  To: gentoo-commits

pesa        14/09/16 14:18:43

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Exclude installed_cmake tests as well.

Revision  Changes    Path
1.1370               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1370&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1370&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1369&r2=1.1370

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1369
retrieving revision 1.1370
diff -u -r1.1369 -r1.1370
--- ChangeLog	15 Sep 2014 17:54:11 -0000	1.1369
+++ ChangeLog	16 Sep 2014 14:18:43 -0000	1.1370
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1369 2014/09/15 17:54:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1370 2014/09/16 14:18:43 pesa Exp $
+
+  16 Sep 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Exclude installed_cmake tests as well.
 
   15 Sep 2014; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
   Allow RPMS specified as array



1.6                  eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.5&r2=1.6

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt5-build.eclass	11 Sep 2014 00:08:57 -0000	1.5
+++ qt5-build.eclass	16 Sep 2014 14:18:43 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.5 2014/09/11 00:08:57 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.6 2014/09/16 14:18:43 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -225,8 +225,8 @@
 qt5-build_src_test() {
 	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
 
-	# '-after SUBDIRS-=cmake' disables broken tests - bug #474004
-	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
+	# '-after SUBDIRS-=...' disables broken cmake tests (bug 474004)
+	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake SUBDIRS-=installed_cmake
 	qt5_foreach_target_subdir emake
 
 	# create a custom testrunner script that correctly sets





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-10-07 16:23 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2014-10-07 16:23 UTC (permalink / raw
  To: gentoo-commits

pesa        14/10/07 16:23:39

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Restrict mirror for qtwebkit wrt bug #524584

Revision  Changes    Path
1.1380               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1380&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1380&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1379&r2=1.1380

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1379
retrieving revision 1.1380
diff -u -r1.1379 -r1.1380
--- ChangeLog	28 Sep 2014 20:11:05 -0000	1.1379
+++ ChangeLog	7 Oct 2014 16:23:39 -0000	1.1380
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1379 2014/09/28 20:11:05 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1380 2014/10/07 16:23:39 pesa Exp $
+
+  07 Oct 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Restrict mirror for qtwebkit wrt bug #524584
 
   28 Sep 2014; Anthony G. Basile <blueness@gentoo.org> pax-utils.eclass:
   Suppress annoying warning, see



1.8                  eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.7&r2=1.8

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt5-build.eclass	22 Sep 2014 00:03:25 -0000	1.7
+++ qt5-build.eclass	7 Oct 2014 16:23:39 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.7 2014/09/22 00:03:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.8 2014/10/07 16:23:39 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -71,7 +71,8 @@
 
 IUSE="debug test"
 
-[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT="test"
+[[ ${PN} == qtwebkit ]] && RESTRICT="mirror" # bug 524584
+[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT="test" # bug 457182
 
 DEPEND="
 	dev-lang/perl





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-10-09 16:55 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2014-10-09 16:55 UTC (permalink / raw
  To: gentoo-commits

pesa        14/10/09 16:55:28

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Fix assignments to RESTRICT.

Revision  Changes    Path
1.1382               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1382&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1382&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1381&r2=1.1382

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1381
retrieving revision 1.1382
diff -u -r1.1381 -r1.1382
--- ChangeLog	8 Oct 2014 17:25:46 -0000	1.1381
+++ ChangeLog	9 Oct 2014 16:55:28 -0000	1.1382
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1381 2014/10/08 17:25:46 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1382 2014/10/09 16:55:28 pesa Exp $
+
+  09 Oct 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Fix assignments to RESTRICT.
 
   08 Oct 2014; Brian Evans <grknight@gentoo.org> mysql-cmake.eclass,
   mysql-multilib.eclass:



1.9                  eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.8&r2=1.9

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt5-build.eclass	7 Oct 2014 16:23:39 -0000	1.8
+++ qt5-build.eclass	9 Oct 2014 16:55:28 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.8 2014/10/07 16:23:39 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.9 2014/10/09 16:55:28 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -71,8 +71,8 @@
 
 IUSE="debug test"
 
-[[ ${PN} == qtwebkit ]] && RESTRICT="mirror" # bug 524584
-[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT="test" # bug 457182
+[[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584
+[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT+=" test" # bug 457182
 
 DEPEND="
 	dev-lang/perl





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-11-14  2:49 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2014-11-14  2:49 UTC (permalink / raw
  To: gentoo-commits

pesa        14/11/14 02:49:57

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Install global docs (part of bug 457028). Generate and install qtchooser configuration file.

Revision  Changes    Path
1.1420               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1420&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1420&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1419&r2=1.1420

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1419
retrieving revision 1.1420
diff -u -r1.1419 -r1.1420
--- ChangeLog	13 Nov 2014 07:15:54 -0000	1.1419
+++ ChangeLog	14 Nov 2014 02:49:57 -0000	1.1420
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1419 2014/11/13 07:15:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1420 2014/11/14 02:49:57 pesa Exp $
+
+  14 Nov 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Install global docs (part of bug 457028). Generate and install qtchooser
+  configuration file.
 
   13 Nov 2014; Ulrich Müller <ulm@gentoo.org> bzr.eclass:
   Remove Emacs team from maintainers of bzr.eclass.



1.10                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.9&r2=1.10

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt5-build.eclass	9 Oct 2014 16:55:28 -0000	1.9
+++ qt5-build.eclass	14 Nov 2014 02:49:57 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.9 2014/10/09 16:55:28 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.10 2014/11/14 02:49:57 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -261,12 +261,14 @@
 	if [[ ${PN} == qtcore ]]; then
 		pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
-		set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
+		set -- emake INSTALL_ROOT="${D}" install_{global_docs,mkspecs,qmake,syncqt}
 		einfo "Running $*"
 		"$@"
 
 		popd >/dev/null || die
 
+		docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global
+
 		# install an empty Gentoo/gentoo-qconfig.h in ${D}
 		# so that it's placed under package manager control
 		> "${T}"/gentoo-qconfig.h
@@ -276,9 +278,24 @@
 		)
 
 		# include gentoo-qconfig.h at the beginning of QtCore/qconfig.h
-		sed -i -e '1a#include <Gentoo/gentoo-qconfig.h>\n' \
+		sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
+
+		# install qtchooser configuration file
+		cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_
+			${QT5_BINDIR}
+			${QT5_LIBDIR}
+		_EOF_
+
+		(
+			insinto /etc/xdg/qtchooser
+			doins "${T}/qt5-${CHOST}.conf"
+		)
+
+		# convenience symlinks
+		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
+		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
 	fi
 
 	qt5_install_module_qconfigs





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-11-20  2:44 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2014-11-20  2:44 UTC (permalink / raw
  To: gentoo-commits

pesa        14/11/20 02:44:10

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Add RDEPEND on dev-qt/qtchooser.

Revision  Changes    Path
1.1432               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1432&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1432&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1431&r2=1.1432

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1431
retrieving revision 1.1432
diff -u -r1.1431 -r1.1432
--- ChangeLog	19 Nov 2014 19:52:06 -0000	1.1431
+++ ChangeLog	20 Nov 2014 02:44:10 -0000	1.1432
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1431 2014/11/19 19:52:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1432 2014/11/20 02:44:10 pesa Exp $
+
+  20 Nov 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Add RDEPEND on dev-qt/qtchooser.
 
   19 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
   Make calling perl-module_pkg_preinst trigger a real warning



1.11                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.10&r2=1.11

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt5-build.eclass	14 Nov 2014 02:49:57 -0000	1.10
+++ qt5-build.eclass	20 Nov 2014 02:44:10 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.10 2014/11/14 02:49:57 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.11 2014/11/20 02:44:10 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -85,9 +85,13 @@
 		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
 	fi
 fi
+RDEPEND="
+	dev-qt/qtchooser
+"
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
 
+
 # @ECLASS-VARIABLE: PATCHES
 # @DEFAULT_UNSET
 # @DESCRIPTION:





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2014-12-12 17:30 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2014-12-12 17:30 UTC (permalink / raw
  To: gentoo-commits

pesa        14/12/12 17:30:40

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Restrict tests for all release versions.

Revision  Changes    Path
1.1459               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1459&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1459&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1458&r2=1.1459

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1458
retrieving revision 1.1459
diff -u -r1.1458 -r1.1459
--- ChangeLog	11 Dec 2014 18:32:30 -0000	1.1458
+++ ChangeLog	12 Dec 2014 17:30:40 -0000	1.1459
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1458 2014/12/11 18:32:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1459 2014/12/12 17:30:40 pesa Exp $
+
+  12 Dec 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Restrict tests for all release versions.
 
   11 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Always restore initial directory after sub-phase run. Fixes bug #532168 and



1.12                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.11&r2=1.12

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qt5-build.eclass	20 Nov 2014 02:44:10 -0000	1.11
+++ qt5-build.eclass	12 Dec 2014 17:30:40 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.11 2014/11/20 02:44:10 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.12 2014/12/12 17:30:40 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -72,7 +72,7 @@
 IUSE="debug test"
 
 [[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584
-[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT+=" test" # bug 457182
+[[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
 
 DEPEND="
 	dev-lang/perl





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2015-02-18 14:15 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2015-02-18 14:15 UTC (permalink / raw
  To: gentoo-commits

pesa        15/02/18 14:15:37

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Drop support for Qt 5.3 and earlier.

Revision  Changes    Path
1.1539               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1539&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1539&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1538&r2=1.1539

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1538
retrieving revision 1.1539
diff -u -r1.1538 -r1.1539
--- ChangeLog	18 Feb 2015 06:19:32 -0000	1.1538
+++ ChangeLog	18 Feb 2015 14:15:37 -0000	1.1539
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1538 2015/02/18 06:19:32 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1539 2015/02/18 14:15:37 pesa Exp $
+
+  18 Feb 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Drop support for Qt 5.3 and earlier.
 
   18 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> cmake-utils.eclass:
   Add Fortran compiler to Gentoo override rules, wrt bug 486626.



1.14                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.13&r2=1.14

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qt5-build.eclass	18 Jan 2015 01:49:43 -0000	1.13
+++ qt5-build.eclass	18 Feb 2015 14:15:37 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.13 2015/01/18 01:49:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.14 2015/02/18 14:15:37 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -23,11 +23,7 @@
 QT5_MINOR_VERSION=${QT5_MINOR_VERSION%%.*}
 
 HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
-if [[ ${QT5_MINOR_VERSION} -ge 4 ]]; then
-	LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-else
-	LICENSE="|| ( LGPL-2.1 GPL-3 )"
-fi
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
 
 # @ECLASS-VARIABLE: QT5_MODULE





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2015-04-19 18:22 Michael Palimaka (kensington)
  0 siblings, 0 replies; 17+ messages in thread
From: Michael Palimaka (kensington) @ 2015-04-19 18:22 UTC (permalink / raw
  To: gentoo-commits

kensington    15/04/19 18:22:15

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Sync with qt overlay - export AR and OBJDUMP too, use new configure option '-no-libproxy' beginning with Qt 5.5, and update gtkstyle comment.

Revision  Changes    Path
1.1590               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1590&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1590&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1589&r2=1.1590

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1589
retrieving revision 1.1590
diff -u -r1.1589 -r1.1590
--- ChangeLog	18 Apr 2015 13:19:47 -0000	1.1589
+++ ChangeLog	19 Apr 2015 18:22:15 -0000	1.1590
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1589 2015/04/18 13:19:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1590 2015/04/19 18:22:15 kensington Exp $
+
+  19 Apr 2015; Michael Palimaka <kensington@gentoo.org> qt5-build.eclass:
+  Sync with qt overlay - export AR and OBJDUMP too, use new configure option
+  '-no-libproxy' beginning with Qt 5.5, and update gtkstyle comment.
 
   18 Apr 2015; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
   Ban eapi2 and 3 for gnome2.eclass (#539118)



1.16                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.15&r2=1.16

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt5-build.eclass	1 Apr 2015 18:45:04 -0000	1.15
+++ qt5-build.eclass	19 Apr 2015 18:22:15 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.15 2015/04/01 18:45:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.16 2015/04/19 18:22:15 kensington Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -469,7 +469,7 @@
 # Runs ./configure for modules belonging to qtbase.
 qt5_base_configure() {
 	# setup toolchain variables used by configure
-	tc-export CC CXX RANLIB STRIP
+	tc-export AR CC CXX OBJDUMP RANLIB STRIP
 	export LD="$(tc-getCXX)"
 
 	# configure arguments
@@ -534,6 +534,7 @@
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
 		-no-openssl
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy)
 		-no-xinput2 -no-xcb-xlib
 
 		# always enable glib event loop support
@@ -542,8 +543,8 @@
 		# disable everything to prevent automagic deps (part 2)
 		-no-pulseaudio -no-alsa
 
-		# disable gtkstyle because it adds qt4 include paths to the compiler
-		# command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
+		# override in qtgui and qtwidgets where x11-libs/cairo[qt4] is blocked
+		# to avoid adding qt4 include paths (bug 433826)
 		-no-gtkstyle
 
 		# exclude examples and tests from default build





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2015-06-09 19:37 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-09 19:37 UTC (permalink / raw
  To: gentoo-commits

pesa        15/06/09 19:37:45

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Delete redundant echo.

Revision  Changes    Path
1.1647               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1647&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1647&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1646&r2=1.1647

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1646
retrieving revision 1.1647
diff -u -r1.1646 -r1.1647
--- ChangeLog	9 Jun 2015 18:13:42 -0000	1.1646
+++ ChangeLog	9 Jun 2015 19:37:45 -0000	1.1647
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1646 2015/06/09 18:13:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1647 2015/06/09 19:37:45 pesa Exp $
+
+  09 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Delete redundant echo.
 
   09 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
   Remove two seds that are no longer needed on current Qt versions.



1.18                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.17&r2=1.18

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qt5-build.eclass	10 May 2015 14:27:29 -0000	1.17
+++ qt5-build.eclass	9 Jun 2015 19:37:45 -0000	1.18
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.17 2015/05/10 14:27:29 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.18 2015/06/09 19:37:45 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -225,8 +225,6 @@
 # @DESCRIPTION:
 # Runs tests in the target directories.
 qt5-build_src_test() {
-	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
-
 	# '-after SUBDIRS-=...' disables broken cmake tests (bug 474004)
 	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake SUBDIRS-=installed_cmake
 	qt5_foreach_target_subdir emake





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2015-06-17 15:48 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-17 15:48 UTC (permalink / raw
  To: gentoo-commits

pesa        15/06/17 15:48:58

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Update from qt overlay: allow configuring debug/release on a per-package basis; add instruction set support (similarly to qt4-build-multilib); use usex().

Revision  Changes    Path
1.1671               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1671&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1671&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1670&r2=1.1671

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1670
retrieving revision 1.1671
diff -u -r1.1670 -r1.1671
--- ChangeLog	17 Jun 2015 09:48:12 -0000	1.1670
+++ ChangeLog	17 Jun 2015 15:48:58 -0000	1.1671
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1670 2015/06/17 09:48:12 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1671 2015/06/17 15:48:58 pesa Exp $
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Update from qt overlay: allow configuring debug/release on a per-package
+  basis; add instruction set support (similarly to qt4-build-multilib); use
+  usex().
 
   17 Jun 2015; James Le Cuirot <chewi@gentoo.org> java-pkg-2.eclass:
   Remove eclass dependency on python[xml] and replace with some ugly grep that



1.20                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.19&r2=1.20

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt5-build.eclass	9 Jun 2015 20:16:59 -0000	1.19
+++ qt5-build.eclass	17 Jun 2015 15:48:58 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.19 2015/06/09 20:16:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.20 2015/06/17 15:48:58 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -39,19 +39,19 @@
 		EGIT_BRANCH="dev"
 		;;
 	5.?.9999)
-		# git stable branches (5.x)
+		# git stable branch
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	*_alpha*|*_beta*|*_rc*)
-		# development releases
+		# development release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)
-		# official stable releases
+		# official stable release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV}
 		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
@@ -77,9 +77,9 @@
 "
 if [[ ${PN} != qttest ]]; then
 	if [[ ${QT5_MODULE} == qtbase ]]; then
-		DEPEND+=" test? ( ~dev-qt/qttest-${PV}[debug=] )"
+		DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 	else
-		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
+		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5 )"
 	fi
 fi
 RDEPEND="
@@ -321,18 +321,17 @@
 ######  Public helpers  ######
 
 # @FUNCTION: qt_use
-# @USAGE: <flag> [feature] [enableopt]
+# @USAGE: <flag> [feature] [enableval]
 # @DESCRIPTION:
 # <flag> is the name of a flag in IUSE.
 #
-# Echoes "-${enableopt}-${feature}" if <flag> is enabled, or "-no-${feature}"
-# if it is disabled. If [feature] is not specified, it defaults to the value
-# of <flag>. If [enableopt] is not specified, the whole "-${enableopt}" prefix
-# is omitted.
+# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
+# otherwise. If [feature] is not specified, <flag> is used in its place.
+# If [enableval] is not specified, the "-${enableval}" prefix is omitted.
 qt_use() {
 	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
 
-	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+	usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}"
 }
 
 # @FUNCTION: qt_use_compile_test
@@ -490,8 +489,9 @@
 		-examplesdir "${QT5_EXAMPLESDIR}"
 		-testsdir "${QT5_TESTSDIR}"
 
-		# debug/release
-		$(use debug && echo -debug || echo -release)
+		# configure in release mode by default,
+		# override via the CONFIG qmake variable
+		-release
 		-no-separate-debug-info
 
 		# licensing stuff
@@ -517,6 +517,17 @@
 		# obsolete flag, does nothing
 		#-qml-debug
 
+		# instruction set support
+		$(is-flagq -mno-sse2    && echo -no-sse2)
+		$(is-flagq -mno-sse3    && echo -no-sse3)
+		$(is-flagq -mno-ssse3   && echo -no-ssse3)
+		$(is-flagq -mno-sse4.1  && echo -no-sse4.1)
+		$(is-flagq -mno-sse4.2  && echo -no-sse4.2)
+		$(is-flagq -mno-avx     && echo -no-avx)
+		$(is-flagq -mno-avx2    && echo -no-avx2)
+		$(is-flagq -mno-dsp     && echo -no-mips_dsp)
+		$(is-flagq -mno-dspr2   && echo -no-mips_dspr2)
+
 		# use pkg-config to detect include and library paths
 		-pkg-config
 
@@ -552,7 +563,7 @@
 		-no-compile-examples
 
 		# disable rpath on non-prefix (bugs 380415 and 417169)
-		$(use prefix || echo -no-rpath)
+		$(usex prefix '' -no-rpath)
 
 		# print verbose information about each configure test
 		-verbose
@@ -639,6 +650,8 @@
 	fi
 
 	"${qmakepath}"/qmake \
+		CONFIG+=$(usex debug debug release) \
+		CONFIG-=$(usex debug release debug) \
 		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \
 		QMAKE_LINK_C="$(tc-getCC)" \





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2015-07-13  0:51 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2015-07-13  0:51 UTC (permalink / raw
  To: gentoo-commits

pesa        15/07/13 00:51:16

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Initial support for Qt 5.5

Revision  Changes    Path
1.1708               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1708&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1708&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1707&r2=1.1708

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1707
retrieving revision 1.1708
diff -u -r1.1707 -r1.1708
--- ChangeLog	9 Jul 2015 20:21:05 -0000	1.1707
+++ ChangeLog	13 Jul 2015 00:51:16 -0000	1.1708
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1707 2015/07/09 20:21:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1708 2015/07/13 00:51:16 pesa Exp $
+
+  13 Jul 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Initial support for Qt 5.5
 
   09 Jul 2015; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Do not attempt to use submodules for which the checkout path does not exist



1.21                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.20&r2=1.21

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qt5-build.eclass	17 Jun 2015 15:48:58 -0000	1.20
+++ qt5-build.eclass	13 Jul 2015 00:51:16 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.20 2015/06/17 15:48:58 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.21 2015/07/13 00:51:16 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -535,9 +535,6 @@
 		-system-zlib
 		-system-pcre
 
-		# don't specify -no-gif because there is no way to override it later
-		#-no-gif
-
 		# disable everything to prevent automagic deps (part 1)
 		-no-mtdev
 		-no-journald
@@ -545,8 +542,12 @@
 		-no-freetype -no-harfbuzz
 		-no-openssl
 		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy)
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-{x11,evdev})
 		-no-xinput2 -no-xcb-xlib
 
+		# don't specify -no-gif because there is no way to override it later
+		#-no-gif
+
 		# always enable glib event loop support
 		-glib
 
@@ -578,7 +579,10 @@
 		-iconv
 
 		# disable everything to prevent automagic deps (part 3)
-		-no-cups -no-evdev -no-icu -no-fontconfig -no-dbus
+		-no-cups -no-evdev
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-tslib)
+		-no-icu -no-fontconfig
+		-no-dbus
 
 		# don't strip
 		-no-strip
@@ -614,9 +618,16 @@
 		# typedef qreal to double (warning: changing this flag breaks the ABI)
 		-qreal double
 
-		# disable opengl and egl by default, override in qtgui and qtopengl
+		# disable OpenGL and EGL support by default, override in qtgui,
+		# qtopengl, qtprintsupport and qtwidgets
 		-no-opengl -no-egl
 
+		# disable libinput-based generic plugin by default, override in qtgui
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libinput)
+
+		# disable gstreamer by default, override in qtmultimedia
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-gstreamer)
+
 		# use upstream default
 		#-no-system-proxies
 
@@ -673,7 +684,7 @@
 		QMAKE_LFLAGS_DEBUG= \
 		"${projectdir}" \
 		"$@" \
-		|| die "qmake failed (${projectdir})"
+		|| die "qmake failed (${projectdir#${S}/})"
 }
 
 # @FUNCTION: qt5_install_module_qconfigs





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2015-08-07  1:07 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2015-08-07  1:07 UTC (permalink / raw
  To: gentoo-commits

pesa        15/08/07 01:07:09

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Allow passing arguments to qmake from ebuilds via the myqmakeargs array.

Revision  Changes    Path
1.1748               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1748&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1748&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1747&r2=1.1748

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1747
retrieving revision 1.1748
diff -u -r1.1747 -r1.1748
--- ChangeLog	6 Aug 2015 08:20:33 -0000	1.1747
+++ ChangeLog	7 Aug 2015 01:07:09 -0000	1.1748
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1747 2015/08/06 08:20:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1748 2015/08/07 01:07:09 pesa Exp $
+
+  07 Aug 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Allow passing arguments to qmake from ebuilds via the myqmakeargs array.
 
   06 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass,
   haskell-cabal.eclass:



1.22                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.21&r2=1.22

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qt5-build.eclass	13 Jul 2015 00:51:16 -0000	1.21
+++ qt5-build.eclass	7 Aug 2015 01:07:09 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.21 2015/07/13 00:51:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.22 2015/08/07 01:07:09 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -225,8 +225,10 @@
 # @DESCRIPTION:
 # Runs tests in the target directories.
 qt5-build_src_test() {
-	# '-after SUBDIRS-=...' disables broken cmake tests (bug 474004)
-	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake SUBDIRS-=installed_cmake
+	# disable broken cmake tests (bug 474004)
+	local myqmakeargs=("${myqmakeargs[@]}" -after SUBDIRS-=cmake SUBDIRS-=installed_cmake)
+
+	qt5_foreach_target_subdir qt5_qmake
 	qt5_foreach_target_subdir emake
 
 	# create a custom testrunner script that correctly sets
@@ -661,6 +663,7 @@
 	fi
 
 	"${qmakepath}"/qmake \
+		"${projectdir}" \
 		CONFIG+=$(usex debug debug release) \
 		CONFIG-=$(usex debug release debug) \
 		QMAKE_AR="$(tc-getAR) cqs" \
@@ -682,8 +685,7 @@
 		QMAKE_LFLAGS="${LDFLAGS}" \
 		QMAKE_LFLAGS_RELEASE= \
 		QMAKE_LFLAGS_DEBUG= \
-		"${projectdir}" \
-		"$@" \
+		"${myqmakeargs[@]}" \
 		|| die "qmake failed (${projectdir#${S}/})"
 }
 





^ permalink raw reply	[flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
@ 2015-08-07  2:05 Davide Pesavento (pesa)
  0 siblings, 0 replies; 17+ messages in thread
From: Davide Pesavento (pesa) @ 2015-08-07  2:05 UTC (permalink / raw
  To: gentoo-commits

pesa        15/08/07 02:05:19

  Modified:             ChangeLog qt5-build.eclass
  Log:
  Fix bugs #549140 and #552942.

Revision  Changes    Path
1.1749               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1749&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1749&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1748&r2=1.1749

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1748
retrieving revision 1.1749
diff -u -r1.1748 -r1.1749
--- ChangeLog	7 Aug 2015 01:07:09 -0000	1.1748
+++ ChangeLog	7 Aug 2015 02:05:19 -0000	1.1749
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1748 2015/08/07 01:07:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1749 2015/08/07 02:05:19 pesa Exp $
+
+  07 Aug 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Fix bugs #549140 and #552942.
 
   07 Aug 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
   Allow passing arguments to qmake from ebuilds via the myqmakeargs array.



1.23                 eclass/qt5-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.22&r2=1.23

Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qt5-build.eclass	7 Aug 2015 01:07:09 -0000	1.22
+++ qt5-build.eclass	7 Aug 2015 02:05:19 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.22 2015/08/07 01:07:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.23 2015/08/07 02:05:19 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -195,6 +195,14 @@
 		find config.tests/unix -name '*.test' -type f \
 			-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \
 			|| die "sed failed (config.tests)"
+
+		# Don't add -O3 to CXXFLAGS (bug 549140)
+		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
+
+		# Don't force sse2 on x86 (bug 552942)
+		sed -i -e 's/^sse2:/false:&/' \
+			mkspecs/features/qt_module.prf || die "sed failed (sse2)"
 	fi
 
 	# apply patches





^ permalink raw reply	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2015-08-07  2:05 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-16 14:18 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass Davide Pesavento (pesa)
  -- strict thread matches above, loose matches on Subject: below --
2015-08-07  2:05 Davide Pesavento (pesa)
2015-08-07  1:07 Davide Pesavento (pesa)
2015-07-13  0:51 Davide Pesavento (pesa)
2015-06-17 15:48 Davide Pesavento (pesa)
2015-06-09 19:37 Davide Pesavento (pesa)
2015-04-19 18:22 Michael Palimaka (kensington)
2015-02-18 14:15 Davide Pesavento (pesa)
2014-12-12 17:30 Davide Pesavento (pesa)
2014-11-20  2:44 Davide Pesavento (pesa)
2014-11-14  2:49 Davide Pesavento (pesa)
2014-10-09 16:55 Davide Pesavento (pesa)
2014-10-07 16:23 Davide Pesavento (pesa)
2014-09-11  0:08 Davide Pesavento (pesa)
2014-08-29 23:38 Davide Pesavento (pesa)
2014-04-23 11:53 Mikle Kolyada (zlogene)
2014-04-23  8:01 Patrick Lauer (patrick)

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