[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-11-12 19:01 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-11-12 19:01 UTC (permalink / raw
  To: gentoo-commits

pesa        11/11/12 19:01:56

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Set qt@g.o as maintainer, minor cleanups (quoting, whitespace, etc.)

Revision  Changes    Path
1.10                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog	12 Nov 2011 18:26:59 -0000	1.9
+++ ChangeLog	12 Nov 2011 19:01:56 -0000	1.10
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.9 2011/11/12 18:26:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.10 2011/11/12 19:01:56 pesa Exp $
+
+  12 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Set qt@g.o as maintainer, minor cleanups (quoting, whitespace, etc.)
 
   12 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt4-r2.eclass:
   Remove ${S} fallback from src_unpack, set qt@g.o as maintainer, remove



1.98                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- qt4-build.eclass	2 Nov 2011 18:01:00 -0000	1.97
+++ qt4-build.eclass	12 Nov 2011 19:01:56 -0000	1.98
@@ -1,16 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.97 2011/11/02 18:01:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.98 2011/11/12 19:01:56 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
-# Ben de Groot <yngwin@gentoo.org>,
-# Markos Chandras <hwoarang@gentoo.org>,
-# Caleb Tennis <caleb@gentoo.org>
-# Alex Alexander <wired@gentoo.org>
+# Qt herd <qt@gentoo.org>
 # @BLURB: Eclass for Qt4 split ebuilds.
 # @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt4
+# This eclass contains various functions that are used when building Qt4.
 
 inherit base eutils multilib toolchain-funcs flag-o-matic versionator
 
@@ -87,7 +84,7 @@
 		fi
 	fi
 
-	if [[ "${PN}" == "qt-webkit" ]]; then
+	if [[ ${PN} == "qt-webkit" ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			echo
@@ -187,10 +184,11 @@
 			-i config.tests/unix/fvisibility.test ||
 				die "visibility fixing sed failed"
 	fi
-	# fix libx11 dependency on non X packages
+
+	# fix libX11 dependency on non X packages
 	if version_is_at_least "4.7.0_beta2"; then
-		local NOLIBX11PKG="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
-		has ${PN} ${NOLIBX11PKG} && qt_nolibx11
+		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
+		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
 		[[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup
 	fi
 
@@ -228,6 +226,7 @@
 		ewarn "disabled."
 		append-flags -std=c++0x
 	fi
+
 	# Unsupported old gcc versions - hardened needs this :(
 	if [[ $(gcc-major-version) -lt 4 ]] ; then
 		ewarn "Appending -fno-stack-protector to CXXFLAGS"
@@ -246,7 +245,8 @@
 	# Bug 282984 && Bug 295530
 	sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
 		-i configure || die "sed qmake compilers failed"
-	# bug 321335
+
+	# Bug 321335
 	if version_is_at_least 4.6; then
 		find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
 			xargs -0 \
@@ -326,7 +326,7 @@
 	use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
 		myconf+=" -liconv"
 
-	if has glib ${IUSE//+} && use glib; then
+	if use_if_iuse glib; then
 		# use -I, -L and -l from configure
 		local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
 		# avoid the -pthread argument
@@ -334,7 +334,7 @@
 		unset glibflags
 	fi
 
-	if has qpa ${IUSE//+} && use qpa; then
+	if use_if_iuse qpa; then
 		ewarn
 		ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
 		ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
@@ -427,10 +427,12 @@
 qt4-build_src_install() {
 	[[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
 	setqtenv
+
 	install_directories ${QT4_TARGET_DIRECTORIES}
 	install_qconfigs
 	fix_library_files
 	fix_includes
+
 	# remove .la files since we are building only shared Qt libraries
 	find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
 }
@@ -536,7 +538,7 @@
 prepare_directories() {
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null
-		einfo "running qmake in: $x"
+		einfo "Running qmake in: ${x}"
 		# avoid running over the maximum argument number, bug #299810
 		{
 			echo "${S}"/mkspecs/common/*.conf
@@ -690,7 +692,7 @@
 # Don't need to build qmake, as it's already installed from qt-core
 skip_qmake_build_patch() {
 	# Don't need to build qmake, as it's already installed from qt-core
-	sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed"
+	sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed"
 }
 
 # @FUNCTION: skip_project_generation_patch
@@ -699,7 +701,7 @@
 skip_project_generation_patch() {
 	# Exit the script early by throwing in an exit before all of the .pro files are scanned
 	sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
-		-i "${S}"/configure || die "Sed failed"
+		-i "${S}"/configure || die "sed failed"
 }
 
 # @FUNCTION: symlink_binaries_to_buildtree
@@ -708,7 +710,7 @@
 # time
 symlink_binaries_to_buildtree() {
 	for bin in qmake moc uic rcc; do
-		ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed."
+		ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
 	done
 }
 
@@ -719,19 +721,19 @@
 fix_library_files() {
 	for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
 		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed."
+			sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
 		fi
 	done
 
 	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
 	for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
 		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
+			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed failed"
 
 		# Move .pc files into the pkgconfig directory
 		dodir ${QTPCDIR#${EPREFIX}}
 		mv ${libfile} "${D}"/${QTPCDIR}/ \
-			|| die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
+			|| die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
 		fi
 	done
 
@@ -790,7 +792,7 @@
 		*-linux-*|*-linux)
 			spec=linux ;;
 		*)
-			die "Unknown CHOST, no platform choosen."
+			die "Unknown CHOST, no platform chosen."
 	esac
 
 	CXX=$(tc-getCXX)
@@ -799,7 +801,7 @@
 	elif [[ ${CXX} == *icpc* ]]; then
 		spec+=-icc
 	else
-		die "Unknown compiler ${CXX}."
+		die "Unknown compiler '${CXX}'."
 	fi
 	if [[ -n ${LIBDIR/lib} ]]; then
 		spec+=-${LIBDIR/lib}
@@ -846,7 +848,7 @@
 # @DESCRIPTION:
 # Ignore X11 tests for packages that don't need X libraries installed
 qt_nolibx11() {
-	einfo "removing X11 check to allow X-less compilation"
+	einfo "Removing X11 check to allow X-less compilation"
 	sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
 		die "x11 check sed failed"
 }






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-11-19 20:00 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-11-19 20:00 UTC (permalink / raw
  To: gentoo-commits

pesa        11/11/19 20:00:35

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Make qt_assistant_cleanup() a no-op for Qt 4.7.4 and later (bug #386709).

Revision  Changes    Path
1.18                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	18 Nov 2011 20:51:10 -0000	1.17
+++ ChangeLog	19 Nov 2011 20:00:35 -0000	1.18
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.17 2011/11/18 20:51:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.18 2011/11/19 20:00:35 pesa Exp $
+
+  19 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Make qt_assistant_cleanup() a no-op for Qt 4.7.4 and later (bug #386709).
 
   18 Nov 2011; Michał Górny <mgorny@gentoo.org> scons-utils.eclass:
   Add DESTDIR-like variable to the example.



1.99                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- qt4-build.eclass	12 Nov 2011 19:01:56 -0000	1.98
+++ qt4-build.eclass	19 Nov 2011 20:00:35 -0000	1.99
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.98 2011/11/12 19:01:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.99 2011/11/19 20:00:35 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -185,11 +185,12 @@
 				die "visibility fixing sed failed"
 	fi
 
-	# fix libX11 dependency on non X packages
-	if version_is_at_least "4.7.0_beta2"; then
+	if version_is_at_least "4.7"; then
+		# fix libX11 dependency on non X packages
 		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
 		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
-		[[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup
+
+		qt_assistant_cleanup
 	fi
 
 	if use aqua; then
@@ -823,9 +824,16 @@
 # @FUNCTION: qt_assistant_cleanup
 # @RETURN: nothing
 # @DESCRIPTION:
-# Tries to clean up tools.pro for qt-assistant ebuilds
-# Meant to be called in src_prepare
+# Tries to clean up tools.pro for qt-assistant ebuilds.
+# Meant to be called in src_prepare().
+# Since Qt 4.7.4 this function is a no-op.
 qt_assistant_cleanup() {
+	# apply patching to qt-assistant ebuilds only
+	[[ ${PN} != "qt-assistant" ]] && return
+
+	# no longer needed for 4.7.4 and later
+	version_is_at_least "4.7.4" && return
+
 	# different versions (and branches...) may need different handling,
 	# add a case if you need special handling
 	case "${MY_PV_EXTRA}" in






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-11-19 20:31 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-11-19 20:31 UTC (permalink / raw
  To: gentoo-commits

pesa        11/11/19 20:31:12

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Remove support for Qt 4.5, add blockers for qt-declarative, small cleanup.

Revision  Changes    Path
1.19                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog	19 Nov 2011 20:00:35 -0000	1.18
+++ ChangeLog	19 Nov 2011 20:31:12 -0000	1.19
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.18 2011/11/19 20:00:35 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.19 2011/11/19 20:31:12 pesa Exp $
+
+  19 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Remove support for Qt 4.5, add blockers for qt-declarative, small cleanup.
 
   19 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Make qt_assistant_cleanup() a no-op for Qt 4.7.4 and later (bug #386709).



1.100                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- qt4-build.eclass	19 Nov 2011 20:00:35 -0000	1.99
+++ qt4-build.eclass	19 Nov 2011 20:31:12 -0000	1.100
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.99 2011/11/19 20:00:35 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.100 2011/11/19 20:31:12 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -12,24 +12,21 @@
 inherit base eutils multilib toolchain-funcs flag-o-matic versionator
 
 MY_PV=${PV/_/-}
-if version_is_at_least 4.5.99999999; then
-	MY_P=qt-everywhere-opensource-src-${MY_PV}
-	[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
-		[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
-			IUSE="+exceptions"
-else
-	MY_P=qt-x11-opensource-src-${MY_PV}
-fi
-
-if version_is_at_least 4.7.99999999; then
-	IUSE+=" c++0x qpa"
-fi
+MY_P=qt-everywhere-opensource-src-${MY_PV}
 
 HOMEPAGE="http://qt.nokia.com/"
 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
-IUSE+=" debug pch aqua"
+
+IUSE="aqua debug pch"
+
+[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
+[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
+	IUSE+=" +exceptions"
+
+if version_is_at_least 4.7.99999999; then
+	IUSE+=" c++0x qpa"
+fi
 
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
@@ -38,6 +35,8 @@
 	!>x11-libs/qt-core-${PV}-r9999
 	!<x11-libs/qt-dbus-${PV}
 	!>x11-libs/qt-dbus-${PV}-r9999
+	!<x11-libs/qt-declarative-${PV}
+	!>x11-libs/qt-declarative-${PV}-r9999
 	!<x11-libs/qt-demo-${PV}
 	!>x11-libs/qt-demo-${PV}-r9999
 	!<x11-libs/qt-gui-${PV}
@@ -74,8 +73,8 @@
 
 	# Protect users by not allowing downgrades between releases
 	# Downgrading revisions within the same release should be allowed
-	if has_version '>'${CATEGORY}/${P}-r9999 ; then
-		if [[ -z $I_KNOW_WHAT_I_AM_DOING ]] ; then
+	if has_version '>'${CATEGORY}/${P}-r9999; then
+		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
 			eerror "Sanity check to keep you from breaking your system:"
 			eerror "  Downgrading Qt is completely unsupported and will break your system!"
 			die "aborting to save your system"
@@ -203,8 +202,8 @@
 	fi
 
 	if [[ ${PN} != qt-core ]]; then
-		skip_qmake_build_patch
-		skip_project_generation_patch
+		skip_qmake_build
+		skip_project_generation
 		symlink_binaries_to_buildtree
 	fi
 
@@ -219,7 +218,7 @@
 		append-flags -fno-gcse
 	fi
 
-	if has c++0x ${IUSE//+} && use c++0x; then
+	if use_if_iuse c++0x; then
 		ewarn "You are about to build Qt4 using the C++11 standard. Even though"
 		ewarn "this is an official standard, some of the reverse dependencies"
 		ewarn "may fail to compile or link againt the Qt4 libraries. Before"
@@ -501,17 +500,9 @@
 		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 
-	# 4.5: build everything but qt-xmlpatterns w/o exceptions
-	# 4.6: exceptions USE flag
+	# exceptions USE flag
 	local exceptions="-exceptions"
-	case "${PV}" in
-		4.5.*)
-			[[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
-		;;
-		*)
-			has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)"
-		;;
-	esac
+	in_iuse exceptions && exceptions="$(qt_use exceptions)"
 
 	# note about -reduce-relocations:
 	# That flag seems to introduce major breakage to applications,
@@ -688,18 +679,18 @@
 	generate_qconfigs
 }
 
-# @FUNCTION: skip_qmake_build_patch
+# @FUNCTION: skip_qmake_build
 # @DESCRIPTION:
 # Don't need to build qmake, as it's already installed from qt-core
-skip_qmake_build_patch() {
+skip_qmake_build() {
 	# Don't need to build qmake, as it's already installed from qt-core
 	sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed"
 }
 
-# @FUNCTION: skip_project_generation_patch
+# @FUNCTION: skip_project_generation
 # @DESCRIPTION:
 # Exit the script early by throwing in an exit before all of the .pro files are scanned
-skip_project_generation_patch() {
+skip_project_generation() {
 	# Exit the script early by throwing in an exit before all of the .pro files are scanned
 	sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
 		-i "${S}"/configure || die "sed failed"
@@ -711,7 +702,7 @@
 # time
 symlink_binaries_to_buildtree() {
 	for bin in qmake moc uic rcc; do
-		ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
+		ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
 	done
 }
 
@@ -793,7 +784,7 @@
 		*-linux-*|*-linux)
 			spec=linux ;;
 		*)
-			die "Unknown CHOST, no platform chosen."
+			die "Unknown CHOST, no platform chosen"
 	esac
 
 	CXX=$(tc-getCXX)
@@ -802,7 +793,7 @@
 	elif [[ ${CXX} == *icpc* ]]; then
 		spec+=-icc
 	else
-		die "Unknown compiler '${CXX}'."
+		die "Unknown compiler '${CXX}'"
 	fi
 	if [[ -n ${LIBDIR/lib} ]]; then
 		spec+=-${LIBDIR/lib}






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-11-19 20:52 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-11-19 20:52 UTC (permalink / raw
  To: gentoo-commits

pesa        11/11/19 20:52:50

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Add dependency on dev-util/pkgconfig (#385835 and #387783).

Revision  Changes    Path
1.20                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog	19 Nov 2011 20:31:12 -0000	1.19
+++ ChangeLog	19 Nov 2011 20:52:50 -0000	1.20
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.19 2011/11/19 20:31:12 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.20 2011/11/19 20:52:50 pesa Exp $
+
+  19 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Add dependency on dev-util/pkgconfig (#385835 and #387783).
 
   19 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Remove support for Qt 4.5, add blockers for qt-declarative, small cleanup.



1.101                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- qt4-build.eclass	19 Nov 2011 20:31:12 -0000	1.100
+++ qt4-build.eclass	19 Nov 2011 20:52:50 -0000	1.101
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.100 2011/11/19 20:31:12 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.101 2011/11/19 20:52:50 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -28,6 +28,7 @@
 	IUSE+=" c++0x qpa"
 fi
 
+DEPEND="dev-util/pkgconfig"
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
 	!>x11-libs/qt-assistant-${PV}-r9999






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-12-08 17:21 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-12-08 17:21 UTC (permalink / raw
  To: gentoo-commits

pesa        11/12/08 17:21:45

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Update HOMEPAGE (bug #388133).

Revision  Changes    Path
1.37                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog	7 Dec 2011 00:29:38 -0000	1.36
+++ ChangeLog	8 Dec 2011 17:21:45 -0000	1.37
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.36 2011/12/07 00:29:38 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.37 2011/12/08 17:21:45 pesa Exp $
+
+  08 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Update HOMEPAGE (bug #388133).
 
   07 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
   Disappear disappeared devs.



1.102                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- qt4-build.eclass	19 Nov 2011 20:52:50 -0000	1.101
+++ qt4-build.eclass	8 Dec 2011 17:21:45 -0000	1.102
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.101 2011/11/19 20:52:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.102 2011/12/08 17:21:45 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -14,7 +14,7 @@
 MY_PV=${PV/_/-}
 MY_P=qt-everywhere-opensource-src-${MY_PV}
 
-HOMEPAGE="http://qt.nokia.com/"
+HOMEPAGE="http://qt.nokia.com/ http://qt-project.org/"
 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-12-10 17:28 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-12-10 17:28 UTC (permalink / raw
  To: gentoo-commits

pesa        11/12/10 17:28:16

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Handle sparc64-* in arch configuration.

Revision  Changes    Path
1.38                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog	8 Dec 2011 17:21:45 -0000	1.37
+++ ChangeLog	10 Dec 2011 17:28:16 -0000	1.38
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.37 2011/12/08 17:21:45 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.38 2011/12/10 17:28:16 pesa Exp $
+
+  10 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Handle sparc64-* in arch configuration.
 
   08 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Update HOMEPAGE (bug #388133).



1.103                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- qt4-build.eclass	8 Dec 2011 17:21:45 -0000	1.102
+++ qt4-build.eclass	10 Dec 2011 17:28:16 -0000	1.103
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.102 2011/12/08 17:21:45 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.103 2011/12/10 17:28:16 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -490,14 +490,14 @@
 	# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
 	# $(tc-arch). Therefore we convert it to supported values.
 	case "$(tc-arch)" in
-		amd64|x64-*) myconf+=" -arch x86_64" ;;
-		ppc-macos) myconf+=" -arch ppc" ;;
-		ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;;
-		sparc|sparc-*) myconf+=" -arch sparc" ;;
-		x86-macos) myconf+=" -arch x86" ;;
-		x86|x86-*) myconf+=" -arch i386" ;;
-		alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
-		hppa|sh) myconf+=" -arch generic" ;;
+		amd64|x64-*)		  myconf+=" -arch x86_64" ;;
+		ppc-macos)		  myconf+=" -arch ppc" ;;
+		ppc|ppc64|ppc-*)	  myconf+=" -arch powerpc" ;;
+		sparc|sparc-*|sparc64-*)  myconf+=" -arch sparc" ;;
+		x86-macos)		  myconf+=" -arch x86" ;;
+		x86|x86-*)		  myconf+=" -arch i386" ;;
+		alpha|arm|ia64|mips|s390) myconf+=" -arch $(tc-arch)" ;;
+		hppa|sh)		  myconf+=" -arch generic" ;;
 		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-12-16 20:02 Jonathan Callen (abcd)
  0 siblings, 0 replies; 48+ messages in thread
From: Jonathan Callen (abcd) @ 2011-12-16 20:02 UTC (permalink / raw
  To: gentoo-commits

abcd        11/12/16 20:02:48

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Set importdir to be /usr/$(get_libdir)/qt4/imports instead of the non-FHS-compliant /usr/imports

Revision  Changes    Path
1.46                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog	16 Dec 2011 16:40:46 -0000	1.45
+++ ChangeLog	16 Dec 2011 20:02:48 -0000	1.46
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.45 2011/12/16 16:40:46 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.46 2011/12/16 20:02:48 abcd Exp $
+
+  16 Dec 2011; Jonathan Callen <abcd@gentoo.org> qt4-build.eclass:
+  Set importdir to be /usr/$(get_libdir)/qt4/imports instead of the
+  non-FHS-compliant /usr/imports
 
   16 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> leechcraft.eclass:
   Add app-arch/xz-utils dependency to leechcraft.eclass



1.104                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- qt4-build.eclass	10 Dec 2011 17:28:16 -0000	1.103
+++ qt4-build.eclass	16 Dec 2011 20:02:48 -0000	1.104
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.103 2011/12/10 17:28:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.104 2011/12/16 20:02:48 abcd Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -451,6 +451,7 @@
 	QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
 	QTHEADERDIR=${EPREFIX}/usr/include/qt4
 	QTPLUGINDIR=${QTLIBDIR}/plugins
+	QTIMPORTDIR=${QTLIBDIR}/imports
 	QTSYSCONFDIR=${EPREFIX}/etc/qt4
 	QTTRANSDIR=${QTDATADIR}/translations
 	QTEXAMPLESDIR=${QTDATADIR}/examples
@@ -517,7 +518,7 @@
 		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
 		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
 		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
-		-demosdir ${QTDEMOSDIR} -silent -fast -opensource
+		-demosdir ${QTDEMOSDIR} -importdir ${QTIMPORTDIR} -silent -fast -opensource
 		${exceptions}
 		-nomake examples -nomake demos"
 
@@ -536,7 +537,10 @@
 		{
 			echo "${S}"/mkspecs/common/*.conf
 			find "${S}" -name '*.pr[io]'
-		} | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
+		} | xargs sed -i \
+			-e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
+			-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
+			|| die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
 		popd >/dev/null
 	done






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-12-21 22:36 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-12-21 22:36 UTC (permalink / raw
  To: gentoo-commits

pesa        11/12/21 22:36:47

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Remove obsolete workaround.

Revision  Changes    Path
1.51                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog	18 Dec 2011 23:38:11 -0000	1.50
+++ ChangeLog	21 Dec 2011 22:36:47 -0000	1.51
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.50 2011/12/18 23:38:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.51 2011/12/21 22:36:47 pesa Exp $
+
+  21 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Remove obsolete workaround.
 
   18 Dec 2011; Robin H. Johnson <robbat2@gentoo.org> python.eclass:
   Bug #390691: Be careful about cp call to coreutils with --no-preserve option



1.105                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- qt4-build.eclass	16 Dec 2011 20:02:48 -0000	1.104
+++ qt4-build.eclass	21 Dec 2011 22:36:47 -0000	1.105
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.104 2011/12/16 20:02:48 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.105 2011/12/21 22:36:47 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -367,10 +367,6 @@
 		myconf+=" $(pkg-config --cflags freetype2)"
 	fi
 
-	# Disable SSE4.x, since auto-detection is currently broken
-	# Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623
-	[[ ${PV} == "4.7.1" ]] && myconf+=" -no-sse4.1 -no-sse4.2"
-
 	echo ./configure ${myconf}
 	./configure ${myconf} || die "./configure failed"
 	myconf=""






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-12-21 22:47 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-12-21 22:47 UTC (permalink / raw
  To: gentoo-commits

pesa        11/12/21 22:47:35

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Disable rpath for Qt 4.8 and later (bug #380415). Thanks to dilfridge for testing.

Revision  Changes    Path
1.52                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog	21 Dec 2011 22:36:47 -0000	1.51
+++ ChangeLog	21 Dec 2011 22:47:35 -0000	1.52
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.51 2011/12/21 22:36:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.52 2011/12/21 22:47:35 pesa Exp $
+
+  21 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Disable rpath for Qt 4.8 and later (bug #380415). Thanks to dilfridge for
+  testing.
 
   21 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Remove obsolete workaround.



1.106                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- qt4-build.eclass	21 Dec 2011 22:36:47 -0000	1.105
+++ qt4-build.eclass	21 Dec 2011 22:47:35 -0000	1.106
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.105 2011/12/21 22:36:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.106 2011/12/21 22:47:35 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -502,6 +502,9 @@
 	local exceptions="-exceptions"
 	in_iuse exceptions && exceptions="$(qt_use exceptions)"
 
+	# bug 380415
+	version_is_at_least 4.8 && myconf+=" -no-rpath"
+
 	# note about -reduce-relocations:
 	# That flag seems to introduce major breakage to applications,
 	# mostly to be seen as a core dump with the message "QPixmap: Must






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-12-25 18:49 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-12-25 18:49 UTC (permalink / raw
  To: gentoo-commits

pesa        11/12/25 18:49:52

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Delete obsolete sed on fvisibility.test, it's no longer needed in all versions of Qt currently available in the tree.

Revision  Changes    Path
1.54                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog	22 Dec 2011 18:01:12 -0000	1.53
+++ ChangeLog	25 Dec 2011 18:49:52 -0000	1.54
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.53 2011/12/22 18:01:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.54 2011/12/25 18:49:52 pesa Exp $
+
+  25 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Delete obsolete sed on fvisibility.test, it's no longer needed in all
+  versions of Qt currently available in the tree.
 
   22 Dec 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Add a note on AT_NOELIBTOOLIZE=yes in src_prepare(). Fixes #395649.



1.108                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- qt4-build.eclass	21 Dec 2011 23:38:45 -0000	1.107
+++ qt4-build.eclass	25 Dec 2011 18:49:52 -0000	1.108
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.107 2011/12/21 23:38:45 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.108 2011/12/25 18:49:52 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -178,13 +178,6 @@
 	setqtenv
 	cd "${S}"
 
-	# fix qt 4.7 regression that skips -fvisibility=hidden
-	if version_is_at_least "4.7.0_beta1"; then
-		sed -e "s/^gcc|g++)/*gcc|*g++)/" \
-			-i config.tests/unix/fvisibility.test ||
-				die "visibility fixing sed failed"
-	fi
-
 	if version_is_at_least "4.7"; then
 		# fix libX11 dependency on non X packages
 		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-12-26  0:11 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-12-26  0:11 UTC (permalink / raw
  To: gentoo-commits

pesa        11/12/26 00:11:07

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Misc cleanups, add a few missing "|| die", fix description of some functions.

Revision  Changes    Path
1.55                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog	25 Dec 2011 18:49:52 -0000	1.54
+++ ChangeLog	26 Dec 2011 00:11:07 -0000	1.55
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.54 2011/12/25 18:49:52 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.55 2011/12/26 00:11:07 pesa Exp $
+
+  26 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Misc cleanups, add a few missing "|| die", fix description of some functions.
 
   25 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Delete obsolete sed on fvisibility.test, it's no longer needed in all



1.109                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- qt4-build.eclass	25 Dec 2011 18:49:52 -0000	1.108
+++ qt4-build.eclass	26 Dec 2011 00:11:07 -0000	1.109
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.108 2011/12/25 18:49:52 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.109 2011/12/26 00:11:07 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -68,7 +68,7 @@
 
 # @FUNCTION: qt4-build_pkg_setup
 # @DESCRIPTION:
-# Sets up S, MY_P, PATH, and LD_LIBRARY_PATH
+# Sets up PATH and LD_LIBRARY_PATH.
 qt4-build_pkg_setup() {
 	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
 
@@ -125,47 +125,35 @@
 
 # @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
 # @DESCRIPTION:
-# Arguments for build_target_directories. Takes the directories, in which the
-# code should be compiled. This is a space-separated list
+# Arguments for build_target_directories. Takes the directories in which the
+# code should be compiled. This is a space-separated list.
 
 # @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
 # @DESCRIPTION:
-# Space separated list including the directories that will be extracted from Qt
-# tarball
+# Space-separated list including the directories that will be extracted from
+# Qt tarball.
 
 # @FUNCTION: qt4-build_src_unpack
 # @DESCRIPTION:
-# Unpacks the sources
+# Unpacks the sources.
 qt4-build_src_unpack() {
 	setqtenv
-	local unpack_p="${MY_P}"
-	case "${PV}" in
-		4.8.0_*)
-			unpack_p="qt-everywhere-opensource-src-${PV/_*}"
-		;;
-	esac
 	local target targets=
 	for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
 		src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
 		${QT4_EXTRACT_DIRECTORIES}; do
-			targets+=" ${unpack_p}/${target}"
+			targets+=" ${MY_P}/${target}"
 	done
 
 	echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
 	tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
-	case "${PV}" in
-		4.8.0_*)
-			mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
-				${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
-		;;
-	esac
 }
 
 # @ECLASS-VARIABLE: PATCHES
 # @DESCRIPTION:
 # In case you have patches to apply, specify them in PATCHES variable. Make sure
 # to specify the full path. This variable is necessary for src_prepare phase.
-# example:
+# Example:
 # PATCHES="${FILESDIR}"/mypatch.patch
 #   ${FILESDIR}"/mypatch2.patch"
 #
@@ -173,7 +161,7 @@
 # @FUNCTION: qt4-build_src_prepare
 # @DESCRIPTION:
 # Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
-# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
+# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
 qt4-build_src_prepare() {
 	setqtenv
 	cd "${S}"
@@ -192,7 +180,7 @@
 
 		sed -e '/^CONFIG/s:app_bundle::' \
 			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
-			-i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed"
+			-i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
 	fi
 
 	if [[ ${PN} != qt-core ]]; then
@@ -227,7 +215,7 @@
 		append-cxxflags -fno-stack-protector
 		# Bug 253127
 		sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
-		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
+			-i mkspecs/common/g++.conf || die
 	fi
 
 	# Bug 261632
@@ -236,21 +224,22 @@
 		append-flags -mminimal-toc
 	fi
 
-	# Bug 282984 && Bug 295530
-	sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
-		-i configure || die "sed qmake compilers failed"
+	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
+	sed -e "/^SYSTEM_VARIABLES=/i \
+		CC='$(tc-getCC)'\n\
+		CXX='$(tc-getCXX)'\n\
+		CFLAGS='${CFLAGS}'\n\
+		CXXFLAGS='${CXXFLAGS}'\n\
+		LDFLAGS='${LDFLAGS}'\n" \
+		-i configure || die "sed SYSTEM_VARIABLES failed"
 
 	# Bug 321335
-	if version_is_at_least 4.6; then
-		find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
-			xargs -0 \
-			sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \
-				-i || die "sed test compilers failed"
-	fi
+	find config.tests/unix -name '*.test' -type f -exec grep -lZ \$MAKE '{}' \; | xargs -0 \
+		sed -e "s:\(\$MAKE\):\1 CC='$(tc-getCC)' CXX='$(tc-getCXX)' LINK='$(tc-getCXX)':g" \
+			-i || die "sed test compilers failed"
 
 	# Bug 172219
-	sed -e "s:X11R6/::" \
-		-i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
+	sed -e "s:X11R6/::" -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
@@ -274,13 +263,13 @@
 			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
 			-e "s:-Xarch_x86_64::g" \
 			-e "s:-Xarch_ppc64::g" \
-			-i configure mkspecs/common/mac-g++.conf || die "sed configure failed"
+			-i configure mkspecs/common/mac-g++.conf || die "sed -arch/-Xarch failed"
 
 		# On Snow Leopard don't fall back to 10.5 deployment target.
 		if [[ ${CHOST} == *-apple-darwin10 ]] ; then
 			sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
 				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
-				-i configure mkspecs/common/mac-g++.conf || die "sed configure failed"
+				-i configure mkspecs/common/mac-g++.conf || die "sed deployment target failed"
 		fi
 	fi
 
@@ -387,7 +376,7 @@
 
 # @FUNCTION: fix_includes
 # @DESCRIPTION:
-# For MacOSX we need to add some symlinks when frameworks are
+# For MacOS X we need to add some symlinks when frameworks are
 # being used, to avoid complications with some more or less stupid packages.
 fix_includes() {
 	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
@@ -430,22 +419,22 @@
 # @FUNCTION: setqtenv
 setqtenv() {
 	# Set up installation directories
-	QTBASEDIR=${EPREFIX}/usr/$(get_libdir)/qt4
 	QTPREFIXDIR=${EPREFIX}/usr
 	QTBINDIR=${EPREFIX}/usr/bin
 	QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
-	QMAKE_LIBDIR_QT=${QTLIBDIR}
 	QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=${EPREFIX}/usr/share/qt4
 	QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
 	QTHEADERDIR=${EPREFIX}/usr/include/qt4
 	QTPLUGINDIR=${QTLIBDIR}/plugins
 	QTIMPORTDIR=${QTLIBDIR}/imports
-	QTSYSCONFDIR=${EPREFIX}/etc/qt4
+	QTDATADIR=${EPREFIX}/usr/share/qt4
 	QTTRANSDIR=${QTDATADIR}/translations
+	QTSYSCONFDIR=${EPREFIX}/etc/qt4
 	QTEXAMPLESDIR=${QTDATADIR}/examples
 	QTDEMOSDIR=${QTDATADIR}/demos
+	QMAKE_LIBDIR_QT=${QTLIBDIR}
 	QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
+
 	PLATFORM=$(qt_mkspecs_dir)
 
 	unset QMAKESPEC
@@ -513,10 +502,10 @@
 # @FUNCTION: prepare_directories
 # @USAGE: < directories >
 # @DESCRIPTION:
-# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
+# Generates Makefiles for the given list of directories.
 prepare_directories() {
 	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null
+		pushd "${S}"/${x} >/dev/null || die
 		einfo "Running qmake in: ${x}"
 		# avoid running over the maximum argument number, bug #299810
 		{
@@ -527,7 +516,7 @@
 			-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
 			|| die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
-		popd >/dev/null
+		popd >/dev/null || die
 	done
 }
 
@@ -535,26 +524,26 @@
 # @FUNCTION: build_directories
 # @USAGE: < directories >
 # @DESCRIPTION:
-# Compiles the code in $QT4_TARGET_DIRECTORIES
+# Compiles the code in the given list of directories.
 build_directories() {
 	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null
+		pushd "${S}"/${x} >/dev/null || die
 		emake CC="$(tc-getCC)" \
 			CXX="$(tc-getCXX)" \
 			LINK="$(tc-getCXX)" || die "emake failed"
-		popd >/dev/null
+		popd >/dev/null || die
 	done
 }
 
 # @FUNCTION: install_directories
 # @USAGE: < directories >
 # @DESCRIPTION:
-# run emake install in the given directories, which are separated by spaces
+# Runs emake install in the given directories, which are separated by spaces.
 install_directories() {
 	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}"
+		pushd "${S}"/${x} >/dev/null || die
 		emake INSTALL_ROOT="${D}" install || die "emake install failed"
-		popd >/dev/null || die "Can't popd from ${S}/${x}"
+		popd >/dev/null || die
 	done
 }
 
@@ -575,7 +564,7 @@
 
 # @FUNCTION: install_qconfigs
 # @DESCRIPTION:
-# Install gentoo-specific mkspecs configurations
+# Install gentoo-specific mkspecs configurations.
 install_qconfigs() {
 	local x
 	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
@@ -597,7 +586,7 @@
 
 # @FUNCTION: generate_qconfigs
 # @DESCRIPTION:
-# Generates gentoo-specific configurations
+# Generates gentoo-specific qconfig.{h,pri}.
 generate_qconfigs() {
 	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
 		local x qconfig_add qconfig_remove qconfig_new
@@ -656,14 +645,14 @@
 
 # @FUNCTION: qt4-build_pkg_postrm
 # @DESCRIPTION:
-# Generate configurations when the package is completely removed
+# Regenerate configuration when the package is completely removed.
 qt4-build_pkg_postrm() {
 	generate_qconfigs
 }
 
 # @FUNCTION: qt4-build_pkg_postinst
 # @DESCRIPTION:
-# Generate configuration, plus throws a message about possible
+# Regenerate configuration, plus throw a message about possible
 # breakages and proposed solutions.
 qt4-build_pkg_postinst() {
 	generate_qconfigs
@@ -671,25 +660,21 @@
 
 # @FUNCTION: skip_qmake_build
 # @DESCRIPTION:
-# Don't need to build qmake, as it's already installed from qt-core
+# Patches configure to skip qmake compilation, as it's already installed by qt-core.
 skip_qmake_build() {
-	# Don't need to build qmake, as it's already installed from qt-core
-	sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed"
+	sed -i -e "s:if true:if false:g" "${S}"/configure || die
 }
 
 # @FUNCTION: skip_project_generation
 # @DESCRIPTION:
-# Exit the script early by throwing in an exit before all of the .pro files are scanned
+# Exit the script early by throwing in an exit before all of the .pro files are scanned.
 skip_project_generation() {
-	# Exit the script early by throwing in an exit before all of the .pro files are scanned
-	sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
-		-i "${S}"/configure || die "sed failed"
+	sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
 }
 
 # @FUNCTION: symlink_binaries_to_buildtree
 # @DESCRIPTION:
-# Symlink generated binaries to buildtree so they can be used during compilation
-# time
+# Symlinks generated binaries to buildtree, so they can be used during compilation time.
 symlink_binaries_to_buildtree() {
 	for bin in qmake moc uic rcc; do
 		ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
@@ -698,24 +683,24 @@
 
 # @FUNCTION: fix_library_files
 # @DESCRIPTION:
-# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and
-# moves the *.pc-files into the pkgconfig directory
+# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
+# moves the *.pc files into the pkgconfig directory.
 fix_library_files() {
+	local libfile
 	for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
 		if [[ -e ${libfile} ]]; then
 			sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
 		fi
 	done
 
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
+	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations
 	for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
 		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed failed"
+			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
 
 		# Move .pc files into the pkgconfig directory
 		dodir ${QTPCDIR#${EPREFIX}}
-		mv ${libfile} "${D}"/${QTPCDIR}/ \
-			|| die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
+		mv ${libfile} "${D}"/${QTPCDIR}/ || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
 		fi
 	done
 
@@ -729,7 +714,7 @@
 # This will echo "${enableval}-${feature}" if <flag> is enabled, or
 # "-no-${feature} if the flag is disabled. If [feature] is not specified <flag>
 # will be used for that. If [enableval] is not specified, it omits the
-# assignment-part
+# assignment part.
 qt_use() {
 	local flag=$1
 	local feature=$1
@@ -750,9 +735,7 @@
 # @DESCRIPTION:
 # Allows us to define which mkspecs dir we want to use.
 qt_mkspecs_dir() {
-	# Allows us to define which mkspecs dir we want to use.
-	local spec
-
+	local spec=
 	case ${CHOST} in
 		*-freebsd*|*-dragonfly*)
 			spec=freebsd ;;
@@ -803,7 +786,6 @@
 }
 
 # @FUNCTION: qt_assistant_cleanup
-# @RETURN: nothing
 # @DESCRIPTION:
 # Tries to clean up tools.pro for qt-assistant ebuilds.
 # Meant to be called in src_prepare().
@@ -833,11 +815,9 @@
 }
 
 # @FUNCTION: qt_nolibx11
-# @RETURN: nothing
 # @DESCRIPTION:
-# Ignore X11 tests for packages that don't need X libraries installed
+# Ignore X11 tests for packages that don't need X libraries installed.
 qt_nolibx11() {
-	einfo "Removing X11 check to allow X-less compilation"
 	sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
 		die "x11 check sed failed"
 }






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-12-30 14:39 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-12-30 14:39 UTC (permalink / raw
  To: gentoo-commits

pesa        11/12/30 14:39:26

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Make the output of qt4-build_src_unpack() more readable.

Revision  Changes    Path
1.64                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog	28 Dec 2011 13:38:05 -0000	1.63
+++ ChangeLog	30 Dec 2011 14:39:26 -0000	1.64
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.63 2011/12/28 13:38:05 psomas Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.64 2011/12/30 14:39:26 pesa Exp $
+
+  30 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Make the output of qt4-build_src_unpack() more readable.
 
   28 Dec 2011; Stratos Psomadakis <psomas@gentoo.org> kernel-2.eclass:
   Fix URIs for longterm kernels



1.112                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- qt4-build.eclass	27 Dec 2011 16:04:27 -0000	1.111
+++ qt4-build.eclass	30 Dec 2011 14:39:26 -0000	1.112
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.111 2011/12/27 16:04:27 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.112 2011/12/30 14:39:26 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -138,15 +138,18 @@
 # Unpacks the sources.
 qt4-build_src_unpack() {
 	setqtenv
-	local target targets=
+
+	local tarball="${MY_P}.tar.gz" target= targets=
 	for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
-		src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
-		${QT4_EXTRACT_DIRECTORIES}; do
-			targets+=" ${MY_P}/${target}"
+		src/{qbase,qt_targets,qt_install}.pri bin config.tests \
+		mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
+	do
+		targets+="${MY_P}/${target} "
 	done
 
-	echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
-	tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
+	ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
+	tar -xzf "${DISTDIR}/${tarball}" ${targets}
+	eend $? || die "failed to unpack"
 }
 
 # @ECLASS-VARIABLE: PATCHES






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2011-12-31  0:46 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2011-12-31  0:46 UTC (permalink / raw
  To: gentoo-commits

pesa        11/12/31 00:46:04

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Respect {C,CXX,LD}FLAGS during config.tests (bug #336618).

Revision  Changes    Path
1.65                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog	30 Dec 2011 14:39:26 -0000	1.64
+++ ChangeLog	31 Dec 2011 00:46:04 -0000	1.65
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.64 2011/12/30 14:39:26 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.65 2011/12/31 00:46:04 pesa Exp $
+
+  31 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Respect {C,CXX,LD}FLAGS during config.tests (bug #336618).
 
   30 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Make the output of qt4-build_src_unpack() more readable.



1.113                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- qt4-build.eclass	30 Dec 2011 14:39:26 -0000	1.112
+++ qt4-build.eclass	31 Dec 2011 00:46:04 -0000	1.113
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.112 2011/12/30 14:39:26 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.113 2011/12/31 00:46:04 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -240,13 +240,15 @@
 		LDFLAGS='${LDFLAGS}'\n" \
 		-i configure || die "sed SYSTEM_VARIABLES failed"
 
-	# Bug 321335
-	find config.tests/unix -name '*.test' -type f -exec grep -lZ \$MAKE '{}' \; | xargs -0 \
-		sed -e "s:\(\$MAKE\):\1 CC='$(tc-getCC)' CXX='$(tc-getCXX)' LINK='$(tc-getCXX)':g" \
-			-i || die "sed test compilers failed"
+	# Respect CC, CXX, LINK and *FLAGS in config.tests
+	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
+		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
+			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
+			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+		|| die "sed config.tests failed"
 
 	# Bug 172219
-	sed -e "s:X11R6/::" -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
@@ -298,8 +300,9 @@
 	# don't flirt with non-Prefix stuff, we're quite possessive
 	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
 		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
-	# strip predefined CFLAGS from qmake ( bug #312689 )
-	sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
+
+	# strip predefined CFLAGS from mkspecs (bug 312689)
+	sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
 
 	base_src_prepare
 }






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-01-01 19:01 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-01-01 19:01 UTC (permalink / raw
  To: gentoo-commits

pesa        12/01/01 19:01:11

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Pass -importdir to configure only for qt >= 4.7 (bug #396685).

Revision  Changes    Path
1.67                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog	1 Jan 2012 05:02:27 -0000	1.66
+++ ChangeLog	1 Jan 2012 19:01:11 -0000	1.67
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.66 2012/01/01 05:02:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.67 2012/01/01 19:01:11 pesa Exp $
+
+  01 Jan 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Pass -importdir to configure only for qt >= 4.7 (bug #396685).
 
   01 Jan 2012; Mike Gilbert <floppym@gentoo.org> distutils.eclass,
   python.eclass:



1.115                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- qt4-build.eclass	1 Jan 2012 18:12:03 -0000	1.114
+++ qt4-build.eclass	1 Jan 2012 19:01:11 -0000	1.115
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.114 2012/01/01 18:12:03 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.115 2012/01/01 19:01:11 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -462,8 +462,9 @@
 standard_configure_options() {
 	local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
 		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR}
-		-importdir ${QTIMPORTDIR} -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR}
-		-sysconfdir ${QTSYSCONFDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
+		$(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
+		-datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} -sysconfdir ${QTSYSCONFDIR}
+		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
 		-opensource -confirm-license -shared -fast -largefile -stl -verbose
 		-platform $(qt_mkspecs_dir) -nomake examples -nomake demos"
 






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-01-31 23:02 Markos Chandras (hwoarang)
  0 siblings, 0 replies; 48+ messages in thread
From: Markos Chandras (hwoarang) @ 2012-01-31 23:02 UTC (permalink / raw
  To: gentoo-commits

hwoarang    12/01/31 23:02:01

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Initial EAPI4 support in qt4-build eclass

Revision  Changes    Path
1.110                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ChangeLog	31 Jan 2012 06:53:39 -0000	1.109
+++ ChangeLog	31 Jan 2012 23:02:00 -0000	1.110
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.109 2012/01/31 06:53:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.110 2012/01/31 23:02:00 hwoarang Exp $
+
+  31 Jan 2012; Markos Chandras <hwoarang@gentoo.org> qt4-build.eclass:
+  Initial EAPI4 support in qt4-build eclass
 
   31 Jan 2012; Ulrich Müller <ulm@gentoo.org> eutils.eclass:
   Use ${P}-${PR} instead of ${PF} in epatch_user.



1.116                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- qt4-build.eclass	1 Jan 2012 19:01:11 -0000	1.115
+++ qt4-build.eclass	31 Jan 2012 23:02:00 -0000	1.116
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.115 2012/01/01 19:01:11 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.116 2012/01/31 23:02:00 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -111,11 +111,11 @@
 	fi
 
 	# Make sure ebuilds use the required EAPI
-	if [[ ${EAPI} != [23] ]]; then
-		eerror "The qt4-build eclass requires EAPI=2 or EAPI=3, but this ebuild is using"
+	if [[ ${EAPI} != [234] ]]; then
+		eerror "The qt4-build eclass requires EAPI 2,3 or 4 but this ebuild is using"
 		eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be"
-		eerror "fixed. Using qt4-build eclass without EAPI=2 or EAPI=3 will fail."
-		die "qt4-build eclass requires EAPI=2 or EAPI=3"
+		eerror "fixed. Using qt4-build eclass without EAPI 2,3 or 4 will fail."
+		die "qt4-build eclass requires EAPI 2,3 or 4"
 	fi
 
 	if ! version_is_at_least 4.1 $(gcc-version); then






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-02-09 22:07 Markos Chandras (hwoarang)
  0 siblings, 0 replies; 48+ messages in thread
From: Markos Chandras (hwoarang) @ 2012-02-09 22:07 UTC (permalink / raw
  To: gentoo-commits

hwoarang    12/02/09 22:07:34

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Drop buggy code as discussed on qt@gentoo.org on 2012/02/02

Revision  Changes    Path
1.122                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- ChangeLog	9 Feb 2012 16:06:39 -0000	1.121
+++ ChangeLog	9 Feb 2012 22:07:34 -0000	1.122
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.121 2012/02/09 16:06:39 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.122 2012/02/09 22:07:34 hwoarang Exp $
+
+  09 Feb 2012; Markos Chandras <hwoarang@gentoo.org> qt4-build.eclass:
+  Drop buggy code as discussed on qt@gentoo.org on 2012/02/02
 
   09 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> gnustep-base.eclass:
   Use check on configuration file instead of has_version for EAPI0 ebuilds



1.117                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- qt4-build.eclass	31 Jan 2012 23:02:00 -0000	1.116
+++ qt4-build.eclass	9 Feb 2012 22:07:34 -0000	1.117
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.116 2012/01/31 23:02:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.117 2012/02/09 22:07:34 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -782,9 +782,6 @@
 	else
 		die "Unknown compiler '${CXX}'"
 	fi
-	if [[ -n ${LIBDIR/lib} ]]; then
-		spec+=-${LIBDIR/lib}
-	fi
 
 	# Add -64 for 64bit profiles
 	if use x64-freebsd ||






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-02-09 22:58 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-02-09 22:58 UTC (permalink / raw
  To: gentoo-commits

pesa        12/02/09 22:58:36

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Make src_test() a noop for qt-multimedia (bug #332299).

Revision  Changes    Path
1.123                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- ChangeLog	9 Feb 2012 22:07:34 -0000	1.122
+++ ChangeLog	9 Feb 2012 22:58:36 -0000	1.123
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.122 2012/02/09 22:07:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.123 2012/02/09 22:58:36 pesa Exp $
+
+  09 Feb 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Make src_test() a noop for qt-multimedia (bug #332299).
 
   09 Feb 2012; Markos Chandras <hwoarang@gentoo.org> qt4-build.eclass:
   Drop buggy code as discussed on qt@gentoo.org on 2012/02/02



1.118                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- qt4-build.eclass	9 Feb 2012 22:07:34 -0000	1.117
+++ qt4-build.eclass	9 Feb 2012 22:58:36 -0000	1.118
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.117 2012/02/09 22:07:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.118 2012/02/09 22:58:36 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -382,6 +382,9 @@
 # @DESCRIPTION:
 # Runs tests only in target directories.
 qt4-build_src_test() {
+	# QtMultimedia does not have any test suite (bug #332299)
+	[[ ${PN} == "qt-multimedia" ]] && return
+
 	for dir in ${QT4_TARGET_DIRECTORIES}; do
 		emake -j1 check -C ${dir}
 	done






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-02-28 18:19 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-02-28 18:19 UTC (permalink / raw
  To: gentoo-commits

pesa        12/02/28 18:19:29

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Add qt-openvg blocker.

Revision  Changes    Path
1.147                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog	27 Feb 2012 03:57:35 -0000	1.146
+++ ChangeLog	28 Feb 2012 18:19:29 -0000	1.147
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.146 2012/02/27 03:57:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.147 2012/02/28 18:19:29 pesa Exp $
+
+  28 Feb 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Add qt-openvg blocker.
 
   27 Feb 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
   Add a safety check to catch issues like bug 405299 earlier. Adapted from



1.119                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- qt4-build.eclass	9 Feb 2012 22:58:36 -0000	1.118
+++ qt4-build.eclass	28 Feb 2012 18:19:29 -0000	1.119
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.118 2012/02/09 22:58:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.119 2012/02/28 18:19:29 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -46,6 +46,8 @@
 	!>x11-libs/qt-multimedia-${PV}-r9999
 	!<x11-libs/qt-opengl-${PV}
 	!>x11-libs/qt-opengl-${PV}-r9999
+	!<x11-libs/qt-openvg-${PV}
+	!>x11-libs/qt-openvg-${PV}-r9999
 	!<x11-libs/qt-phonon-${PV}
 	!>x11-libs/qt-phonon-${PV}-r9999
 	!<x11-libs/qt-qt3support-${PV}






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-03-01 15:06 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-03-01 15:06 UTC (permalink / raw
  To: gentoo-commits

pesa        12/03/01 15:06:00

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Fold standard_configure_options() into qt4-build_src_configure().

Revision  Changes    Path
1.149                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- ChangeLog	1 Mar 2012 07:00:40 -0000	1.148
+++ ChangeLog	1 Mar 2012 15:06:00 -0000	1.149
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.148 2012/03/01 07:00:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.149 2012/03/01 15:06:00 pesa Exp $
+
+  01 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Fold standard_configure_options() into qt4-build_src_configure().
 
   01 Mar 2012; Ulrich Müller <ulm@gentoo.org> eutils.eclass:
   Cdrom functions split out to dedicated cdrom.eclass.



1.121                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- qt4-build.eclass	28 Feb 2012 18:53:45 -0000	1.120
+++ qt4-build.eclass	1 Mar 2012 15:06:00 -0000	1.121
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.120 2012/02/28 18:53:45 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.121 2012/03/01 15:06:00 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -317,18 +317,76 @@
 # Default configure phase
 qt4-build_src_configure() {
 	setqtenv
-	myconf="$(standard_configure_options) ${myconf}"
+
+	local conf="
+		-prefix ${QTPREFIXDIR}
+		-bindir ${QTBINDIR}
+		-libdir ${QTLIBDIR}
+		-docdir ${QTDOCDIR}
+		-headerdir ${QTHEADERDIR}
+		-plugindir ${QTPLUGINDIR}
+		$(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
+		-datadir ${QTDATADIR}
+		-translationdir ${QTTRANSDIR}
+		-sysconfdir ${QTSYSCONFDIR}
+		-examplesdir ${QTEXAMPLESDIR}
+		-demosdir ${QTDEMOSDIR}
+		-opensource -confirm-license
+		-shared -fast -largefile -stl -verbose
+		-nomake examples -nomake demos"
+
+	# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
+	# $(tc-arch). Therefore we convert it to supported values.
+	case "$(tc-arch)" in
+		amd64|x64-*)		  conf+=" -arch x86_64" ;;
+		ppc-macos)		  conf+=" -arch ppc" ;;
+		ppc|ppc64|ppc-*)	  conf+=" -arch powerpc" ;;
+		sparc|sparc-*|sparc64-*)  conf+=" -arch sparc" ;;
+		x86-macos)		  conf+=" -arch x86" ;;
+		x86|x86-*)		  conf+=" -arch i386" ;;
+		alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;;
+		hppa|sh)		  conf+=" -arch generic" ;;
+		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
+	esac
+
+	conf+=" -platform $(qt_mkspecs_dir)"
+
+	[[ $(get_libdir) != lib ]] && conf+=" -L${EPREFIX}/usr/$(get_libdir)"
+
+	# debug/release
+	if use debug; then
+		conf+=" -debug"
+	else
+		conf+=" -release"
+	fi
+	conf+=" -no-separate-debug-info"
+
+	# exceptions USE flag
+	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
+
+	# disable RPATH on Qt >= 4.8 (bug 380415)
+	version_is_at_least 4.8 && conf+=" -no-rpath"
+
+	# precompiled headers don't work on hardened, where the flag is masked
+	conf+=" $(qt_use pch)"
+
+	# -reduce-relocations
+	# This flag seems to introduce major breakage to applications,
+	# mostly to be seen as a core dump with the message "QPixmap: Must
+	# construct a QApplication before a QPaintDevice" on Solaris.
+	#   -- Daniel Vergien
+	[[ ${CHOST} != *-solaris* ]] && conf+=" -reduce-relocations"
 
 	# this one is needed for all systems with a separate -liconv, apart from
 	# Darwin, for which the sources already cater for -liconv
 	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
-		myconf+=" -liconv"
+		conf+=" -liconv"
 	fi
 
 	if use_if_iuse glib; then
 		local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
 		# avoid the -pthread argument
-		myconf+=" ${glibflags//-pthread}"
+		conf+=" ${glibflags//-pthread}"
 		unset glibflags
 	fi
 
@@ -338,17 +396,17 @@
 		ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
 		ewarn "disable it before reporting any bugs related to this useflag."
 		ewarn
-		myconf+=" -qpa"
+		conf+=" -qpa"
 	fi
 
 	if use aqua; then
 		# On (snow) leopard use the new (frameworked) cocoa code.
 		if [[ ${CHOST##*-darwin} -ge 9 ]]; then
-			myconf+=" -cocoa -framework"
+			conf+=" -cocoa -framework"
 			# We need the source's headers, not the installed ones.
-			myconf+=" -I${S}/include"
+			conf+=" -I${S}/include"
 			# Add hint for the framework location.
-			myconf+=" -F${QTLIBDIR}"
+			conf+=" -F${QTLIBDIR}"
 
 			# We are crazy and build cocoa + qt3support :-)
 			if use qt3support; then
@@ -356,17 +414,18 @@
 					-i configure || die
 			fi
 		else
-			myconf+=" -no-framework"
+			conf+=" -no-framework"
 		fi
 	else
-		# freetype2 include dir is non-standard, thus include it on configure
-		# use -I from configure
-		myconf+=" $(pkg-config --cflags freetype2)"
+		# freetype2 include dir is non-standard, thus pass it to configure
+		conf+=" $(pkg-config --cflags-only-I freetype2)"
 	fi
 
-	echo ./configure ${myconf}
-	./configure ${myconf} || die "./configure failed"
-	myconf=""
+	conf+=" ${myconf}"
+	myconf=
+
+	echo ./configure ${conf}
+	./configure ${conf} || die "./configure failed"
 
 	prepare_directories ${QT4_TARGET_DIRECTORIES}
 }
@@ -459,64 +518,6 @@
 	unset QMAKESPEC
 }
 
-# @FUNCTION: standard_configure_options
-# @INTERNAL
-# @DESCRIPTION:
-# Sets up some standard configure options, like libdir (if necessary), whether
-# debug info is wanted or not.
-standard_configure_options() {
-	local myconf="
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
-		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR}
-		$(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
-		-datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} -sysconfdir ${QTSYSCONFDIR}
-		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
-		-opensource -confirm-license -shared -fast -largefile -stl -verbose
-		-platform $(qt_mkspecs_dir) -nomake examples -nomake demos"
-
-	[[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
-
-	# debug/release
-	if use debug; then
-		myconf+=" -debug"
-	else
-		myconf+=" -release"
-	fi
-	myconf+=" -no-separate-debug-info"
-
-	# exceptions USE flag
-	myconf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
-
-	# disable RPATH on Qt >= 4.8 (bug 380415)
-	version_is_at_least 4.8 && myconf+=" -no-rpath"
-
-	# precompiled headers don't work on hardened, where the flag is masked
-	myconf+=" $(qt_use pch)"
-
-	# -reduce-relocations
-	# This flag seems to introduce major breakage to applications,
-	# mostly to be seen as a core dump with the message "QPixmap: Must
-	# construct a QApplication before a QPaintDevice" on Solaris.
-	#   -- Daniel Vergien
-	[[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
-
-	# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
-	# $(tc-arch). Therefore we convert it to supported values.
-	case "$(tc-arch)" in
-		amd64|x64-*)		  myconf+=" -arch x86_64" ;;
-		ppc-macos)		  myconf+=" -arch ppc" ;;
-		ppc|ppc64|ppc-*)	  myconf+=" -arch powerpc" ;;
-		sparc|sparc-*|sparc64-*)  myconf+=" -arch sparc" ;;
-		x86-macos)		  myconf+=" -arch x86" ;;
-		x86|x86-*)		  myconf+=" -arch i386" ;;
-		alpha|arm|ia64|mips|s390) myconf+=" -arch $(tc-arch)" ;;
-		hppa|sh)		  myconf+=" -arch generic" ;;
-		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
-	esac
-
-	echo "${myconf}"
-}
-
 # @FUNCTION: prepare_directories
 # @USAGE: < directories >
 # @INTERNAL






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-03-01 15:19 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-03-01 15:19 UTC (permalink / raw
  To: gentoo-commits

pesa        12/03/01 15:19:14

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Cleanup qt_mkspecs_dir().

Revision  Changes    Path
1.150                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ChangeLog	1 Mar 2012 15:06:00 -0000	1.149
+++ ChangeLog	1 Mar 2012 15:19:14 -0000	1.150
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.149 2012/03/01 15:06:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.150 2012/03/01 15:19:14 pesa Exp $
+
+  01 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Cleanup qt_mkspecs_dir().
 
   01 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Fold standard_configure_options() into qt4-build_src_configure().



1.122                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- qt4-build.eclass	1 Mar 2012 15:06:00 -0000	1.121
+++ qt4-build.eclass	1 Mar 2012 15:19:14 -0000	1.122
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.121 2012/03/01 15:06:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.122 2012/03/01 15:19:14 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -753,7 +753,8 @@
 # Allows us to define which mkspecs dir we want to use.
 qt_mkspecs_dir() {
 	local spec=
-	case ${CHOST} in
+
+	case "${CHOST}" in
 		*-freebsd*|*-dragonfly*)
 			spec=freebsd ;;
 		*-openbsd*)
@@ -774,17 +775,17 @@
 		*-linux-*|*-linux)
 			spec=linux ;;
 		*)
-			die "Unknown CHOST, no platform chosen"
+			die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;;
 	esac
 
-	CXX=$(tc-getCXX)
-	if [[ ${CXX} == *g++* ]]; then
-		spec+=-g++
-	elif [[ ${CXX} == *icpc* ]]; then
-		spec+=-icc
-	else
-		die "Unknown compiler '${CXX}'"
-	fi
+	case "$(tc-getCXX)" in
+		*g++*)
+			spec+=-g++ ;;
+		*icpc*)
+			spec+=-icc ;;
+		*)
+			die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;;
+	esac
 
 	# Add -64 for 64bit profiles
 	if use x64-freebsd ||






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-03-08 14:24 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-03-08 14:24 UTC (permalink / raw
  To: gentoo-commits

pesa        12/03/08 14:24:40

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Die earlier on unsupported EAPI.

Revision  Changes    Path
1.157                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- ChangeLog	7 Mar 2012 04:13:27 -0000	1.156
+++ ChangeLog	8 Mar 2012 14:24:40 -0000	1.157
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.156 2012/03/07 04:13:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.157 2012/03/08 14:24:40 pesa Exp $
+
+  08 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Die earlier on unsupported EAPI.
 
   07 Mar 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
   Fix default src_test implementation in EAPI 4. Patch by pesa.



1.123                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- qt4-build.eclass	1 Mar 2012 15:19:14 -0000	1.122
+++ qt4-build.eclass	8 Mar 2012 14:24:40 -0000	1.123
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.122 2012/03/01 15:19:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.123 2012/03/08 14:24:40 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -9,6 +9,11 @@
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt4.
 
+case ${EAPI} in
+	2|3|4)	: ;;
+	*)	die "qt4-build.eclass requires EAPI 2, 3 or 4." ;;
+esac
+
 inherit base eutils multilib toolchain-funcs flag-o-matic versionator
 
 MY_PV=${PV/_/-}
@@ -86,13 +91,13 @@
 		fi
 	fi
 
-	if [[ ${PN} == "qt-webkit" ]]; then
+	if [[ ${PN} == qt-webkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			echo
-			ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
+			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{,gdb} before reporting a bug."
+			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
 			ewarn "For more info check out bug #307861"
 			echo
 		fi
@@ -112,16 +117,8 @@
 				${QT4_EXTRACT_DIRECTORIES}"
 	fi
 
-	# Make sure ebuilds use the required EAPI
-	if [[ ${EAPI} != [234] ]]; then
-		eerror "The qt4-build eclass requires EAPI 2,3 or 4 but this ebuild is using"
-		eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be"
-		eerror "fixed. Using qt4-build eclass without EAPI 2,3 or 4 will fail."
-		die "qt4-build eclass requires EAPI 2,3 or 4"
-	fi
-
 	if ! version_is_at_least 4.1 $(gcc-version); then
-		ewarn "Using a GCC version lower than 4.1 is not supported!"
+		ewarn "Using a GCC version lower than 4.1 is not supported."
 	fi
 }
 
@@ -175,7 +172,7 @@
 	setqtenv
 	cd "${S}"
 
-	if version_is_at_least "4.7"; then
+	if version_is_at_least 4.7; then
 		# fix libX11 dependency on non X packages
 		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
 		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
@@ -210,11 +207,13 @@
 	fi
 
 	if use_if_iuse c++0x; then
+		echo
 		ewarn "You are about to build Qt4 using the C++11 standard. Even though"
 		ewarn "this is an official standard, some of the reverse dependencies"
 		ewarn "may fail to compile or link againt the Qt4 libraries. Before"
 		ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
 		ewarn "disabled."
+		echo
 		append-flags -std=c++0x
 	fi
 
@@ -391,11 +390,11 @@
 	fi
 
 	if use_if_iuse qpa; then
-		ewarn
+		echo
 		ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
 		ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
 		ewarn "disable it before reporting any bugs related to this useflag."
-		ewarn
+		echo
 		conf+=" -qpa"
 	fi
 
@@ -444,7 +443,7 @@
 # Runs tests only in target directories.
 qt4-build_src_test() {
 	# QtMultimedia does not have any test suite (bug #332299)
-	[[ ${PN} == "qt-multimedia" ]] && return
+	[[ ${PN} == qt-multimedia ]] && return
 
 	for dir in ${QT4_TARGET_DIRECTORIES}; do
 		emake -j1 check -C ${dir}
@@ -612,7 +611,7 @@
 # @DESCRIPTION:
 # Generates gentoo-specific qconfig.{h,pri}.
 generate_qconfigs() {
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qt-core ]]; then
 		local x qconfig_add qconfig_remove qconfig_new
 		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
 			[[ -f ${x} ]] || continue
@@ -808,10 +807,10 @@
 # Since Qt 4.7.4 this function is a no-op.
 qt_assistant_cleanup() {
 	# apply patching to qt-assistant ebuilds only
-	[[ ${PN} != "qt-assistant" ]] && return
+	[[ ${PN} != qt-assistant ]] && return
 
 	# no longer needed for 4.7.4 and later
-	version_is_at_least "4.7.4" && return
+	version_is_at_least 4.7.4 && return
 
 	# different versions (and branches...) may need different handling,
 	# add a case if you need special handling






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-04-04 16:37 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-04-04 16:37 UTC (permalink / raw
  To: gentoo-commits

pesa        12/04/04 16:37:50

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Update from qt overlay, fixes #407523.

Revision  Changes    Path
1.204                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- ChangeLog	4 Apr 2012 15:10:20 -0000	1.203
+++ ChangeLog	4 Apr 2012 16:37:50 -0000	1.204
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.203 2012/04/04 15:10:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.204 2012/04/04 16:37:50 pesa Exp $
+
+  04 Apr 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Update from qt overlay, fixes #407523.
 
   04 Apr 2012; Johannes Huber <johu@gentoo.org> kde4-base.eclass,
   kde4-meta.eclass:



1.124                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- qt4-build.eclass	8 Mar 2012 14:24:40 -0000	1.123
+++ qt4-build.eclass	4 Apr 2012 16:37:50 -0000	1.124
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.123 2012/03/08 14:24:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.124 2012/04/04 16:37:50 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -14,26 +14,45 @@
 	*)	die "qt4-build.eclass requires EAPI 2, 3 or 4." ;;
 esac
 
-inherit base eutils multilib toolchain-funcs flag-o-matic versionator
+inherit base eutils flag-o-matic multilib toolchain-funcs versionator
+
+if [[ ${PV} == *9999* ]]; then
+	QT4_BUILD_TYPE="live"
+	inherit git-2
+else
+	QT4_BUILD_TYPE="release"
+fi
+
+HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
 
 MY_PV=${PV/_/-}
 MY_P=qt-everywhere-opensource-src-${MY_PV}
 
-HOMEPAGE="http://qt.nokia.com/ http://qt-project.org/"
-SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
+case ${QT4_BUILD_TYPE} in
+	live)
+		EGIT_REPO_URI="git://gitorious.org/qt/qt.git
+			https://git.gitorious.org/qt/qt.git"
+		EGIT_BRANCH="${PV%.9999}"
+		;;
+	release)
+		SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
+		;;
+esac
 
 IUSE="aqua debug pch"
-
-[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
-[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
+if [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]]; then
 	IUSE+=" +exceptions"
-
-if version_is_at_least 4.7.99999999; then
+fi
+if version_is_at_least 4.8; then
 	IUSE+=" c++0x qpa"
 fi
 
 DEPEND="dev-util/pkgconfig"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	DEPEND+=" dev-lang/perl"
+fi
+
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
 	!>x11-libs/qt-assistant-${PV}-r9999
@@ -83,8 +102,10 @@
 	# Downgrading revisions within the same release should be allowed
 	if has_version '>'${CATEGORY}/${P}-r9999; then
 		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
+			eerror
 			eerror "Sanity check to keep you from breaking your system:"
 			eerror "  Downgrading Qt is completely unsupported and will break your system!"
+			eerror
 			die "aborting to save your system"
 		else
 			ewarn "Downgrading Qt is completely unsupported and will break your system!"
@@ -138,17 +159,24 @@
 qt4-build_src_unpack() {
 	setqtenv
 
-	local tarball="${MY_P}.tar.gz" target= targets=
-	for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
-		src/{qbase,qt_targets,qt_install}.pri bin config.tests \
-		mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
-	do
-		targets+="${MY_P}/${target} "
-	done
+	case ${QT4_BUILD_TYPE} in
+		live)
+			git-2_src_unpack
+			;;
+		release)
+			local tarball="${MY_P}.tar.gz" target= targets=
+			for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
+				src/{qbase,qt_targets,qt_install}.pri bin config.tests \
+				mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
+			do
+				targets+="${MY_P}/${target} "
+			done
 
-	ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
-	tar -xzf "${DISTDIR}/${tarball}" ${targets}
-	eend $? || die "failed to unpack"
+			ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
+			tar -xzf "${DISTDIR}/${tarball}" ${targets}
+			eend $? || die "failed to unpack"
+			;;
+	esac
 }
 
 # @ECLASS-VARIABLE: PATCHES
@@ -170,7 +198,10 @@
 # the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
 qt4-build_src_prepare() {
 	setqtenv
-	cd "${S}"
+
+	if [[ ${QT4_BUILD_TYPE} == live ]]; then
+		QTDIR="." ./bin/syncqt || die "syncqt failed"
+	fi
 
 	if version_is_at_least 4.7; then
 		# fix libX11 dependency on non X packages
@@ -196,8 +227,9 @@
 	fi
 
 	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
-		# qmake bus errors with -O2 but -O3 works
-		replace-flags -O2 -O3
+		# qmake bus errors with -O2 or -O3 but -O1 works
+		# Bug 373061
+		replace-flags -O[23] -O1
 	fi
 
 	# Bug 178652
@@ -258,17 +290,31 @@
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
 		# crippled (by design) :/
+		local mac_gpp_conf=
+		if [[ -f mkspecs/common/mac-g++.conf ]]; then
+			# qt < 4.8 has mac-g++.conf
+			mac_gpp_conf="mkspecs/common/mac-g++.conf"
+		elif [[ -f mkspecs/common/g++-macx.conf ]]; then
+			# qt >= 4.8 has g++-macx.conf
+			mac_gpp_conf="mkspecs/common/g++-macx.conf"
+		else
+			die "no known conf file for mac found"
+		fi
 		sed \
 			-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 			-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 			-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
 			-e "s:-arch\s\w*::g" \
-			-i mkspecs/common/mac-g++.conf \
-			|| die "sed mkspecs/common/mac-g++.conf failed"
+			-i ${mac_gpp_conf} \
+			|| die "sed ${mac_gpp_conf} failed"
 
 		# Fix configure's -arch settings that appear in qmake/Makefile and also
 		# fix arch handling (automagically duplicates our -arch arg and breaks
 		# pch). Additionally disable Xarch support.
+		local mac_gcc_confs="${mac_gpp_conf}"
+		if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then
+			mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf"
+		fi
 		sed \
 			-e "s:-arch i386::" \
 			-e "s:-arch ppc::" \
@@ -279,14 +325,14 @@
 			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
 			-e "s:-Xarch_x86_64::g" \
 			-e "s:-Xarch_ppc64::g" \
-			-i configure mkspecs/common/mac-g++.conf \
+			-i configure ${mac_gcc_confs} \
 			|| die "sed -arch/-Xarch failed"
 
 		# On Snow Leopard don't fall back to 10.5 deployment target.
 		if [[ ${CHOST} == *-apple-darwin10 ]]; then
 			sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
 				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
-				-i configure mkspecs/common/mac-g++.conf \
+				-i configure ${mac_gpp_conf} \
 				|| die "sed deployment target failed"
 		fi
 	fi






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-04-19 14:52 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-04-19 14:52 UTC (permalink / raw
  To: gentoo-commits

pesa        12/04/19 14:52:13

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Add appropriate blockers for qt-bearer.

Revision  Changes    Path
1.215                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- ChangeLog	18 Apr 2012 16:52:30 -0000	1.214
+++ ChangeLog	19 Apr 2012 14:52:12 -0000	1.215
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.214 2012/04/18 16:52:30 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.215 2012/04/19 14:52:12 pesa Exp $
+
+  19 Apr 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Add appropriate blockers for qt-bearer.
 
   18 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin.eclass:
   removed unneeded path install for /usr/local/share; fix i18n install bug,



1.125                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- qt4-build.eclass	4 Apr 2012 16:37:50 -0000	1.124
+++ qt4-build.eclass	19 Apr 2012 14:52:12 -0000	1.125
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.124 2012/04/04 16:37:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.125 2012/04/19 14:52:12 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -56,6 +56,8 @@
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
 	!>x11-libs/qt-assistant-${PV}-r9999
+	!<x11-libs/qt-bearer-${PV}
+	!>x11-libs/qt-bearer-${PV}-r9999
 	!<x11-libs/qt-core-${PV}
 	!>x11-libs/qt-core-${PV}-r9999
 	!<x11-libs/qt-dbus-${PV}






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-04-25 17:43 Fabian Groffen (grobian)
  0 siblings, 0 replies; 48+ messages in thread
From: Fabian Groffen (grobian) @ 2012-04-25 17:43 UTC (permalink / raw
  To: gentoo-commits

grobian     12/04/25 17:43:51

  Modified:             ChangeLog qt4-build.eclass
  Log:
  fix_includes: create relative symlinks for header directories, such that further additions by ebuilds in src_install don't fail, such as in qt-script

Revision  Changes    Path
1.224                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- ChangeLog	24 Apr 2012 13:07:03 -0000	1.223
+++ ChangeLog	25 Apr 2012 17:43:50 -0000	1.224
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.223 2012/04/24 13:07:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.224 2012/04/25 17:43:50 grobian Exp $
+
+  25 Apr 2012; Fabian Groffen <grobian@gentoo.org> qt4-build.eclass:
+  fix_includes: create relative symlinks for header directories, such that
+  further additions by ebuilds in src_install don't fail
 
   24 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> myspell-r2.eclass:
   Oops didn't commit the dir supporting version. This replaces plain doins with



1.126                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- qt4-build.eclass	19 Apr 2012 14:52:12 -0000	1.125
+++ qt4-build.eclass	25 Apr 2012 17:43:50 -0000	1.126
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.125 2012/04/19 14:52:12 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.126 2012/04/25 17:43:50 grobian Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -504,21 +504,38 @@
 # being used, to avoid complications with some more or less stupid packages.
 fix_includes() {
 	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		local frw dest f h rdir
 		# Some packages tend to include <Qt/...>
 		dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
 
-		# Fake normal headers when frameworks are installed... eases life later on
-		local dest f h
+		# Fake normal headers when frameworks are installed... eases life later
+		# on, make sure we use relative links though, as some ebuilds assume
+		# these dirs exist in src_install to add additional files
+		f=${QTHEADERDIR}
+		h=${QTLIBDIR}
+		while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
+			f=${f#*/}
+			h=${h#*/}
+		done
+		rdir=${h}
+		f="../"
+		while [[ ${h} == */* ]] ; do
+			f="${f}../"
+			h=${h#*/}
+		done
+		rdir="${f}${rdir}"
+
 		for frw in "${D}${QTLIBDIR}"/*.framework; do
 			[[ -e "${frw}"/Headers ]] || continue
 			f=$(basename ${frw})
 			dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
-			dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}"
+			dosym "${rdir}"/${f}/Headers "${dest}"
 
 			# Link normal headers as well.
 			for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
 				h=$(basename ${hdr})
-				dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
+				dosym "../${rdir}"/${f}/Headers/${h} \
+					"${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
 			done
 		done
 	fi






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-05-02 17:09 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-05-02 17:09 UTC (permalink / raw
  To: gentoo-commits

pesa        12/05/02 17:09:17

  Modified:             ChangeLog qt4-build.eclass
  Log:
  dev-util/pkgconfig -> virtual/pkgconfig

Revision  Changes    Path
1.231                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- ChangeLog	30 Apr 2012 09:51:00 -0000	1.230
+++ ChangeLog	2 May 2012 17:09:17 -0000	1.231
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.230 2012/04/30 09:51:00 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.231 2012/05/02 17:09:17 pesa Exp $
+
+  02 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  dev-util/pkgconfig -> virtual/pkgconfig
 
   30 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org>
   python-distutils-ng.eclass:



1.127                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- qt4-build.eclass	25 Apr 2012 17:43:50 -0000	1.126
+++ qt4-build.eclass	2 May 2012 17:09:17 -0000	1.127
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.126 2012/04/25 17:43:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.127 2012/05/02 17:09:17 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -48,7 +48,7 @@
 	IUSE+=" c++0x qpa"
 fi
 
-DEPEND="dev-util/pkgconfig"
+DEPEND="virtual/pkgconfig"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	DEPEND+=" dev-lang/perl"
 fi






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-05-07 21:28 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-05-07 21:28 UTC (permalink / raw
  To: gentoo-commits

pesa        12/05/07 21:28:01

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Stop stripping upstream CFLAGS from g++.conf for Qt 4.8 and later (see bug 352778 comment #6).

Revision  Changes    Path
1.242                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- ChangeLog	6 May 2012 10:41:48 -0000	1.241
+++ ChangeLog	7 May 2012 21:28:01 -0000	1.242
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.241 2012/05/06 10:41:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.242 2012/05/07 21:28:01 pesa Exp $
+
+  07 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Stop stripping upstream CFLAGS from g++.conf for Qt 4.8 and later (see bug
+  352778 comment #6).
 
   06 May 2012; Fabian Groffen <grobian@gentoo.org>
   +ELT-patches/sol2-conf/2.4.2, libtool.eclass:



1.128                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- qt4-build.eclass	2 May 2012 17:09:17 -0000	1.127
+++ qt4-build.eclass	7 May 2012 21:28:01 -0000	1.128
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.127 2012/05/02 17:09:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.128 2012/05/07 21:28:01 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -283,8 +283,10 @@
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"
 
-	# Strip predefined CFLAGS from mkspecs (bug 312689)
-	sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
+	if ! version_is_at_least 4.8; then
+		# Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
+		sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
+	fi
 
 	# Bug 172219
 	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-05-20 17:12 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-05-20 17:12 UTC (permalink / raw
  To: gentoo-commits

pesa        12/05/20 17:12:34

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Try to avoid sandbox violation when running qhelpgenerator, bug 415517.

Revision  Changes    Path
1.255                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- ChangeLog	19 May 2012 16:26:10 -0000	1.254
+++ ChangeLog	20 May 2012 17:12:34 -0000	1.255
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.254 2012/05/19 16:26:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.255 2012/05/20 17:12:34 pesa Exp $
+
+  20 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Try to avoid sandbox violation when running qhelpgenerator, bug 415517.
 
   19 May 2012; Ulrich Müller <ulm@gentoo.org> xemacs-elisp-common.eclass:
   Fix name space collision with elisp-common.eclass, bug 406053.



1.129                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- qt4-build.eclass	7 May 2012 21:28:01 -0000	1.128
+++ qt4-build.eclass	20 May 2012 17:12:34 -0000	1.129
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.128 2012/05/07 21:28:01 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.129 2012/05/20 17:12:34 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -580,8 +580,9 @@
 	QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
 
 	PLATFORM=$(qt_mkspecs_dir)
-
 	unset QMAKESPEC
+
+	export XDG_CONFIG_HOME="${T}"
 }
 
 # @FUNCTION: prepare_directories






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-05-22 13:41 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-05-22 13:41 UTC (permalink / raw
  To: gentoo-commits

pesa        12/05/22 13:41:59

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Update SRC_URI for Qt 4.8.1 and later.

Revision  Changes    Path
1.262                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- ChangeLog	21 May 2012 18:10:33 -0000	1.261
+++ ChangeLog	22 May 2012 13:41:59 -0000	1.262
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.261 2012/05/21 18:10:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.262 2012/05/22 13:41:59 pesa Exp $
+
+  22 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Update SRC_URI for Qt 4.8.1 and later.
 
   21 May 2012; Krzysztof Pawlik <nelchael@gentoo.org>
   python-distutils-ng.eclass:



1.130                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- qt4-build.eclass	20 May 2012 17:12:34 -0000	1.129
+++ qt4-build.eclass	22 May 2012 13:41:59 -0000	1.130
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.129 2012/05/20 17:12:34 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.130 2012/05/22 13:41:59 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -36,7 +36,11 @@
 		EGIT_BRANCH="${PV%.9999}"
 		;;
 	release)
-		SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
+		if version_is_at_least 4.8.1; then
+			SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
+		else
+			SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
+		fi
 		;;
 esac
 






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-05-25 12:06 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-05-25 12:06 UTC (permalink / raw
  To: gentoo-commits

pesa        12/05/25 12:06:05

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Re-enable rpath on prefix wrt bug 417169.

Revision  Changes    Path
1.267                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- ChangeLog	24 May 2012 18:18:11 -0000	1.266
+++ ChangeLog	25 May 2012 12:06:05 -0000	1.267
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.266 2012/05/24 18:18:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.267 2012/05/25 12:06:05 pesa Exp $
+
+  25 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Re-enable rpath on prefix wrt bug 417169.
 
   24 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
   Remove obsolete pkg_pretend function.



1.131                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- qt4-build.eclass	22 May 2012 13:41:59 -0000	1.130
+++ qt4-build.eclass	25 May 2012 12:06:05 -0000	1.131
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.130 2012/05/22 13:41:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.131 2012/05/25 12:06:05 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -417,8 +417,9 @@
 	# exceptions USE flag
 	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
 
-	# disable RPATH on Qt >= 4.8 (bug 380415)
-	version_is_at_least 4.8 && conf+=" -no-rpath"
+	# disable rpath on Qt >= 4.8 (bug 380415)
+	# but leave it enabled on prefix (bug 417169)
+	version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath"
 
 	# precompiled headers don't work on hardened, where the flag is masked
 	conf+=" $(qt_use pch)"






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-06-07 15:36 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-06-07 15:36 UTC (permalink / raw
  To: gentoo-commits

pesa        12/06/07 15:36:49

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Specify SLOT in blocker atoms, to avoid blocking Qt5 packages.

Revision  Changes    Path
1.296                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- ChangeLog	6 Jun 2012 17:17:30 -0000	1.295
+++ ChangeLog	7 Jun 2012 15:36:49 -0000	1.296
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.295 2012/06/06 17:17:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.296 2012/06/07 15:36:49 pesa Exp $
+
+  07 Jun 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Specify SLOT in blocker atoms, to avoid blocking Qt5 packages.
 
   06 Jun 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Reuse eautoreconf, deprecate autotools-utils_autoreconf.



1.132                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- qt4-build.eclass	25 May 2012 12:06:05 -0000	1.131
+++ qt4-build.eclass	7 Jun 2012 15:36:49 -0000	1.132
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.131 2012/05/25 12:06:05 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.132 2012/06/07 15:36:49 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -58,42 +58,42 @@
 fi
 
 RDEPEND="
-	!<x11-libs/qt-assistant-${PV}
-	!>x11-libs/qt-assistant-${PV}-r9999
-	!<x11-libs/qt-bearer-${PV}
-	!>x11-libs/qt-bearer-${PV}-r9999
-	!<x11-libs/qt-core-${PV}
-	!>x11-libs/qt-core-${PV}-r9999
-	!<x11-libs/qt-dbus-${PV}
-	!>x11-libs/qt-dbus-${PV}-r9999
-	!<x11-libs/qt-declarative-${PV}
-	!>x11-libs/qt-declarative-${PV}-r9999
-	!<x11-libs/qt-demo-${PV}
-	!>x11-libs/qt-demo-${PV}-r9999
-	!<x11-libs/qt-gui-${PV}
-	!>x11-libs/qt-gui-${PV}-r9999
-	!<x11-libs/qt-multimedia-${PV}
-	!>x11-libs/qt-multimedia-${PV}-r9999
-	!<x11-libs/qt-opengl-${PV}
-	!>x11-libs/qt-opengl-${PV}-r9999
-	!<x11-libs/qt-openvg-${PV}
-	!>x11-libs/qt-openvg-${PV}-r9999
-	!<x11-libs/qt-phonon-${PV}
-	!>x11-libs/qt-phonon-${PV}-r9999
-	!<x11-libs/qt-qt3support-${PV}
-	!>x11-libs/qt-qt3support-${PV}-r9999
-	!<x11-libs/qt-script-${PV}
-	!>x11-libs/qt-script-${PV}-r9999
-	!<x11-libs/qt-sql-${PV}
-	!>x11-libs/qt-sql-${PV}-r9999
-	!<x11-libs/qt-svg-${PV}
-	!>x11-libs/qt-svg-${PV}-r9999
-	!<x11-libs/qt-test-${PV}
-	!>x11-libs/qt-test-${PV}-r9999
-	!<x11-libs/qt-webkit-${PV}
-	!>x11-libs/qt-webkit-${PV}-r9999
-	!<x11-libs/qt-xmlpatterns-${PV}
-	!>x11-libs/qt-xmlpatterns-${PV}-r9999
+	!<x11-libs/qt-assistant-${PV}:4
+	!>x11-libs/qt-assistant-${PV}-r9999:4
+	!<x11-libs/qt-bearer-${PV}:4
+	!>x11-libs/qt-bearer-${PV}-r9999:4
+	!<x11-libs/qt-core-${PV}:4
+	!>x11-libs/qt-core-${PV}-r9999:4
+	!<x11-libs/qt-dbus-${PV}:4
+	!>x11-libs/qt-dbus-${PV}-r9999:4
+	!<x11-libs/qt-declarative-${PV}:4
+	!>x11-libs/qt-declarative-${PV}-r9999:4
+	!<x11-libs/qt-demo-${PV}:4
+	!>x11-libs/qt-demo-${PV}-r9999:4
+	!<x11-libs/qt-gui-${PV}:4
+	!>x11-libs/qt-gui-${PV}-r9999:4
+	!<x11-libs/qt-multimedia-${PV}:4
+	!>x11-libs/qt-multimedia-${PV}-r9999:4
+	!<x11-libs/qt-opengl-${PV}:4
+	!>x11-libs/qt-opengl-${PV}-r9999:4
+	!<x11-libs/qt-openvg-${PV}:4
+	!>x11-libs/qt-openvg-${PV}-r9999:4
+	!<x11-libs/qt-phonon-${PV}:4
+	!>x11-libs/qt-phonon-${PV}-r9999:4
+	!<x11-libs/qt-qt3support-${PV}:4
+	!>x11-libs/qt-qt3support-${PV}-r9999:4
+	!<x11-libs/qt-script-${PV}:4
+	!>x11-libs/qt-script-${PV}-r9999:4
+	!<x11-libs/qt-sql-${PV}:4
+	!>x11-libs/qt-sql-${PV}-r9999:4
+	!<x11-libs/qt-svg-${PV}:4
+	!>x11-libs/qt-svg-${PV}-r9999:4
+	!<x11-libs/qt-test-${PV}:4
+	!>x11-libs/qt-test-${PV}-r9999:4
+	!<x11-libs/qt-webkit-${PV}:4
+	!>x11-libs/qt-webkit-${PV}-r9999:4
+	!<x11-libs/qt-xmlpatterns-${PV}:4
+	!>x11-libs/qt-xmlpatterns-${PV}-r9999:4
 "
 
 S=${WORKDIR}/${MY_P}
@@ -106,7 +106,7 @@
 
 	# Protect users by not allowing downgrades between releases
 	# Downgrading revisions within the same release should be allowed
-	if has_version '>'${CATEGORY}/${P}-r9999; then
+	if has_version ">${CATEGORY}/${P}-r9999:4"; then
 		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
 			eerror
 			eerror "Sanity check to keep you from breaking your system:"






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-06-18 21:33 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-06-18 21:33 UTC (permalink / raw
  To: gentoo-commits

pesa        12/06/18 21:33:50

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Update from qt overlay.
  Drop USE=c++0x from qt-webkit, stop adding USE=qpa to 4.8.3 and later, dead code removal and other minor cleanups.

Revision  Changes    Path
1.318                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- ChangeLog	18 Jun 2012 16:51:34 -0000	1.317
+++ ChangeLog	18 Jun 2012 21:33:50 -0000	1.318
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.317 2012/06/18 16:51:34 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.318 2012/06/18 21:33:50 pesa Exp $
+
+  18 Jun 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Update from qt overlay: drop USE=c++0x from qt-webkit, stop adding USE=qpa to
+  4.8.3 and later, dead code removal and other minor cleanups.
 
   18 Jun 2012; Ian Stakenvicius <axs@gentoo.org> user.eclass:
   added 'esethome' to user.eclass



1.133                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- qt4-build.eclass	7 Jun 2012 15:36:49 -0000	1.132
+++ qt4-build.eclass	18 Jun 2012 21:33:50 -0000	1.133
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.132 2012/06/07 15:36:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.133 2012/06/18 21:33:50 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -33,7 +33,7 @@
 	live)
 		EGIT_REPO_URI="git://gitorious.org/qt/qt.git
 			https://git.gitorious.org/qt/qt.git"
-		EGIT_BRANCH="${PV%.9999}"
+		EGIT_BRANCH=${PV%.9999}
 		;;
 	release)
 		if version_is_at_least 4.8.1; then
@@ -45,11 +45,10 @@
 esac
 
 IUSE="aqua debug pch"
-if [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]]; then
-	IUSE+=" +exceptions"
-fi
+[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions"
 if version_is_at_least 4.8; then
-	IUSE+=" c++0x qpa"
+	[[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
+	version_is_at_least 4.8.3 || IUSE+=" qpa"
 fi
 
 DEPEND="virtual/pkgconfig"
@@ -104,33 +103,18 @@
 qt4-build_pkg_setup() {
 	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
 
-	# Protect users by not allowing downgrades between releases
-	# Downgrading revisions within the same release should be allowed
+	# Protect users by not allowing downgrades between releases.
+	# Downgrading revisions within the same release should be allowed.
 	if has_version ">${CATEGORY}/${P}-r9999:4"; then
 		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-			eerror
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror "  Downgrading Qt is completely unsupported and will break your system!"
-			eerror
+			eerror "    ***  Sanity check to keep you from breaking your system  ***"
+			eerror "Downgrading Qt is completely unsupported and will break your system!"
 			die "aborting to save your system"
 		else
 			ewarn "Downgrading Qt is completely unsupported and will break your system!"
 		fi
 	fi
 
-	if [[ ${PN} == qt-webkit ]]; then
-		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([1-9])'; then
-			echo
-			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 bug #307861"
-			echo
-		fi
-		eshopts_pop
-	fi
-
 	PATH="${S}/bin${PATH:+:}${PATH}"
 	if [[ ${CHOST} != *-darwin* ]]; then
 		LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
@@ -143,28 +127,43 @@
 			QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
 				${QT4_EXTRACT_DIRECTORIES}"
 	fi
-
-	if ! version_is_at_least 4.1 $(gcc-version); then
-		ewarn "Using a GCC version lower than 4.1 is not supported."
-	fi
 }
 
-# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
-# @DESCRIPTION:
-# Arguments for build_target_directories. Takes the directories in which the
-# code should be compiled. This is a space-separated list.
-
 # @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Space-separated list including the directories that will be extracted from
 # Qt tarball.
 
+# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Arguments for build_target_directories. Takes the directories in which the
+# code should be compiled. This is a space-separated list.
+
 # @FUNCTION: qt4-build_src_unpack
 # @DESCRIPTION:
 # Unpacks the sources.
 qt4-build_src_unpack() {
 	setqtenv
 
+	if ! version_is_at_least 4.1 $(gcc-version); then
+		ewarn "Using a GCC version lower than 4.1 is not supported."
+	fi
+
+	if [[ ${PN} == qt-webkit ]]; then
+		eshopts_push -s extglob
+		if is-flagq '-g?(gdb)?([1-9])'; then
+			echo
+			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"
+			echo
+		fi
+		eshopts_pop
+	fi
+
 	case ${QT4_BUILD_TYPE} in
 		live)
 			git-2_src_unpack
@@ -210,11 +209,9 @@
 	fi
 
 	if version_is_at_least 4.7; then
-		# fix libX11 dependency on non X packages
+		# avoid X11 dependency in non-gui packages
 		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
 		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
-
-		qt_assistant_cleanup
 	fi
 
 	if use aqua; then
@@ -245,14 +242,7 @@
 	fi
 
 	if use_if_iuse c++0x; then
-		echo
-		ewarn "You are about to build Qt4 using the C++11 standard. Even though"
-		ewarn "this is an official standard, some of the reverse dependencies"
-		ewarn "may fail to compile or link againt the Qt4 libraries. Before"
-		ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
-		ewarn "disabled."
-		echo
-		append-flags -std=c++0x
+		append-cxxflags -std=c++0x
 	fi
 
 	# Unsupported old gcc versions - hardened needs this :(
@@ -872,36 +862,6 @@
 	echo "${spec}"
 }
 
-# @FUNCTION: qt_assistant_cleanup
-# @INTERNAL
-# @DESCRIPTION:
-# Tries to clean up tools.pro for qt-assistant ebuilds.
-# Meant to be called in src_prepare().
-# Since Qt 4.7.4 this function is a no-op.
-qt_assistant_cleanup() {
-	# apply patching to qt-assistant ebuilds only
-	[[ ${PN} != qt-assistant ]] && return
-
-	# no longer needed for 4.7.4 and later
-	version_is_at_least 4.7.4 && return
-
-	# different versions (and branches...) may need different handling,
-	# add a case if you need special handling
-	case "${MY_PV_EXTRA}" in
-		*kde-qt*)
-			sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
-				-e "/mac/,/^embedded.*makeqpf$/d" \
-				-i tools/tools.pro || die "patching tools.pro failed"
-		;;
-		*)
-			sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
-				-e "/mac/,/^embedded.*makeqpf$/d" \
-				-e "s/^\([ \t]*pixeltool\) /\1 qdoc3 /" \
-				-i tools/tools.pro || die "patching tools.pro failed"
-		;;
-	esac
-}
-
 # @FUNCTION: qt_nolibx11
 # @INTERNAL
 # @DESCRIPTION:






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-07-10 21:43 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-07-10 21:43 UTC (permalink / raw
  To: gentoo-commits

pesa        12/07/10 21:43:20

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Stop inheriting base.eclass

Revision  Changes    Path
1.340                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- ChangeLog	9 Jul 2012 02:38:05 -0000	1.339
+++ ChangeLog	10 Jul 2012 21:43:19 -0000	1.340
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.339 2012/07/09 02:38:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.340 2012/07/10 21:43:19 pesa Exp $
+
+  10 Jul 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Stop inheriting base.eclass
 
   09 Jul 2012; Mike Gilbert <floppym@gentoo.org> base.eclass:
   Remove false statement from eclass description.



1.134                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- qt4-build.eclass	18 Jun 2012 21:33:50 -0000	1.133
+++ qt4-build.eclass	10 Jul 2012 21:43:19 -0000	1.134
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.133 2012/06/18 21:33:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.134 2012/07/10 21:43:19 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -14,7 +14,7 @@
 	*)	die "qt4-build.eclass requires EAPI 2, 3 or 4." ;;
 esac
 
-inherit base eutils flag-o-matic multilib toolchain-funcs versionator
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
 if [[ ${PV} == *9999* ]]; then
 	QT4_BUILD_TYPE="live"
@@ -352,7 +352,9 @@
 	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
 		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
 
-	base_src_prepare
+	# apply patches
+	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	epatch_user
 }
 
 # @FUNCTION: qt4-build_src_configure






^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-09-06  8:30 Michael Palimaka (kensington)
  0 siblings, 0 replies; 48+ messages in thread
From: Michael Palimaka (kensington) @ 2012-09-06  8:30 UTC (permalink / raw
  To: gentoo-commits

kensington    12/09/06 08:30:00

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Improve respect for *FLAGS. Fixes part of bug #427782.

Revision  Changes    Path
1.388                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- ChangeLog	4 Sep 2012 14:08:24 -0000	1.387
+++ ChangeLog	6 Sep 2012 08:30:00 -0000	1.388
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.387 2012/09/04 14:08:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.388 2012/09/06 08:30:00 kensington Exp $
+
+  06 Sep 2012; Michael Palimaka <kensington@gentoo.org> qt4-build.eclass:
+  Improve respect for *FLAGS. Fixes part of bug #427782.
 
   04 Sep 2012; Johannes Huber <johu@gentoo.org> kde4-meta.eclass:
   Dont try to extract cmake/modules for kdegames > 4.9.0. Its removed from



1.135                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- qt4-build.eclass	10 Jul 2012 21:43:19 -0000	1.134
+++ qt4-build.eclass	6 Sep 2012 08:30:00 -0000	1.135
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.134 2012/07/10 21:43:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.135 2012/09/06 08:30:00 kensington Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -266,7 +266,13 @@
 		CXX='$(tc-getCXX)'\n\
 		CFLAGS='${CFLAGS}'\n\
 		CXXFLAGS='${CXXFLAGS}'\n\
-		LDFLAGS='${LDFLAGS}'\n" \
+		LDFLAGS='${LDFLAGS}'\n\
+		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
 		-i configure \
 		|| die "sed SYSTEM_VARIABLES failed"
 





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-11-01  8:35 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-11-01  8:35 UTC (permalink / raw
  To: gentoo-commits

pesa        12/11/01 08:35:43

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Update homepage.

Revision  Changes    Path
1.492                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- ChangeLog	31 Oct 2012 14:28:02 -0000	1.491
+++ ChangeLog	1 Nov 2012 08:35:43 -0000	1.492
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.491 2012/10/31 14:28:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.492 2012/11/01 08:35:43 pesa Exp $
+
+  01 Nov 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Update homepage.
 
   31 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Enable byte-compilation of Python modules only locally for



1.138                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- qt4-build.eclass	4 Oct 2012 03:52:35 -0000	1.137
+++ qt4-build.eclass	1 Nov 2012 08:35:43 -0000	1.138
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.137 2012/10/04 03:52:35 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.138 2012/11/01 08:35:43 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -23,7 +23,7 @@
 	QT4_BUILD_TYPE="release"
 fi
 
-HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
+HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 
 MY_PV=${PV/_/-}





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-11-12  9:28 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-11-12  9:28 UTC (permalink / raw
  To: gentoo-commits

pesa        12/11/12 09:28:53

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Update from qt overlay: respect AR (bug #440262); drop support for EAPI=2; switch to prune_libtool_files(); various cleanups.

Revision  Changes    Path
1.504                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -r1.503 -r1.504
--- ChangeLog	8 Nov 2012 09:42:51 -0000	1.503
+++ ChangeLog	12 Nov 2012 09:28:53 -0000	1.504
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.503 2012/11/08 09:42:51 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.504 2012/11/12 09:28:53 pesa Exp $
+
+  12 Nov 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Update from qt overlay: respect AR (bug #440262); drop support for EAPI=2;
+  switch to prune_libtool_files(); various cleanups.
 
   08 Nov 2012; Davide Pesavento <pesa@gentoo.org> qt4-r2.eclass:
   Partial sync with qt overlay. Apart from cosmetic changes, we now explicitly



1.139                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- qt4-build.eclass	1 Nov 2012 08:35:43 -0000	1.138
+++ qt4-build.eclass	12 Nov 2012 09:28:53 -0000	1.139
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.138 2012/11/01 08:35:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.139 2012/11/12 09:28:53 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -10,8 +10,8 @@
 # This eclass contains various functions that are used when building Qt4.
 
 case ${EAPI} in
-	2|3|4|5) : ;;
-	*)	 die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+	3|4|5)	: ;;
+	*)	die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
@@ -101,8 +101,6 @@
 # @DESCRIPTION:
 # Sets up PATH and LD_LIBRARY_PATH.
 qt4-build_pkg_setup() {
-	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
-
 	# Protect users by not allowing downgrades between releases.
 	# Downgrading revisions within the same release should be allowed.
 	if has_version ">${CATEGORY}/${P}-r9999:4"; then
@@ -190,7 +188,7 @@
 # PATCHES array variable containing all various patches to be applied.
 # This variable is expected to be defined in global scope of ebuild.
 # Make sure to specify the full path. This variable is utilised in
-# src_unpack/src_prepare phase, based on EAPI.
+# src_prepare() phase.
 #
 # @CODE
 #   PATCHES=( "${FILESDIR}/mypatch.patch"
@@ -208,11 +206,9 @@
 		QTDIR="." ./bin/syncqt || die "syncqt failed"
 	fi
 
-	if version_is_at_least 4.7; then
-		# avoid X11 dependency in non-gui packages
-		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
-		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
-	fi
+	# avoid X11 dependency in non-gui packages
+	local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
+	has ${PN} ${nolibx11_pkgs} && qt_nolibx11
 
 	if use aqua; then
 		# provide a proper macx-g++-64
@@ -376,7 +372,7 @@
 		-docdir ${QTDOCDIR}
 		-headerdir ${QTHEADERDIR}
 		-plugindir ${QTPLUGINDIR}
-		$(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
+		-importdir ${QTIMPORTDIR}
 		-datadir ${QTDATADIR}
 		-translationdir ${QTTRANSDIR}
 		-sysconfdir ${QTSYSCONFDIR}
@@ -550,7 +546,6 @@
 # @DESCRIPTION:
 # Perform the actual installation including some library fixes.
 qt4-build_src_install() {
-	[[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
 	setqtenv
 
 	install_directories ${QT4_TARGET_DIRECTORIES}
@@ -558,8 +553,8 @@
 	fix_library_files
 	fix_includes
 
-	# remove .la files since we are building only shared Qt libraries
-	find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
+	# remove .la files since we are building only shared libraries
+	prune_libtool_files
 }
 
 # @FUNCTION: setqtenv
@@ -567,20 +562,19 @@
 setqtenv() {
 	# Set up installation directories
 	QTPREFIXDIR=${EPREFIX}/usr
-	QTBINDIR=${EPREFIX}/usr/bin
-	QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
-	QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
-	QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
-	QTHEADERDIR=${EPREFIX}/usr/include/qt4
+	QTBINDIR=${QTPREFIXDIR}/bin
+	QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt4
+	QTPCDIR=${QTPREFIXDIR}/$(get_libdir)/pkgconfig
+	QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
+	QTHEADERDIR=${QTPREFIXDIR}/include/qt4
 	QTPLUGINDIR=${QTLIBDIR}/plugins
 	QTIMPORTDIR=${QTLIBDIR}/imports
-	QTDATADIR=${EPREFIX}/usr/share/qt4
+	QTDATADIR=${QTPREFIXDIR}/share/qt4
 	QTTRANSDIR=${QTDATADIR}/translations
 	QTSYSCONFDIR=${EPREFIX}/etc/qt4
 	QTEXAMPLESDIR=${QTDATADIR}/examples
 	QTDEMOSDIR=${QTDATADIR}/demos
 	QMAKE_LIBDIR_QT=${QTLIBDIR}
-	QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
 
 	PLATFORM=$(qt_mkspecs_dir)
 	unset QMAKESPEC
@@ -594,23 +588,26 @@
 # @DESCRIPTION:
 # Generates Makefiles for the given list of directories.
 prepare_directories() {
+	# avoid running over the maximum argument number, bug #299810
+	{
+		echo "${S}"/mkspecs/common/*.conf
+		find "${S}" -name '*.pr[io]'
+	} | xargs sed -i \
+		-e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
+		-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
+		|| die
+
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null || die
 		einfo "Running qmake in: ${x}"
-		# avoid running over the maximum argument number, bug #299810
-		{
-			echo "${S}"/mkspecs/common/*.conf
-			find "${S}" -name '*.pr[io]'
-		} | xargs sed -i \
-			-e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
-			-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
-			|| die
-		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
+		"${S}"/bin/qmake \
+			"LIBS+=-L${QTLIBDIR}" \
+			"CONFIG+=nostrip" \
+			|| die "qmake failed"
 		popd >/dev/null || die
 	done
 }
 
-
 # @FUNCTION: build_directories
 # @USAGE: < directories >
 # @INTERNAL
@@ -619,9 +616,14 @@
 build_directories() {
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null || die
-		emake CC="$(tc-getCC)" \
+		emake \
+			AR="$(tc-getAR) cqs" \
+			CC="$(tc-getCC)" \
 			CXX="$(tc-getCXX)" \
-			LINK="$(tc-getCXX)" || die "emake failed"
+			LINK="$(tc-getCXX)" \
+			RANLIB=":" \
+			STRIP=":" \
+			|| die "emake failed"
 		popd >/dev/null || die
 	done
 }





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-12-22  3:57 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-12-22  3:57 UTC (permalink / raw
  To: gentoo-commits

pesa        12/12/22 03:57:14

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Tweak sed expression to match against Qt 4.8.4 too. Thanks to Tomasz Mloduchowski <q@qdot.me> for spotting the regression.

Revision  Changes    Path
1.574                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- ChangeLog	20 Dec 2012 23:36:15 -0000	1.573
+++ ChangeLog	22 Dec 2012 03:57:14 -0000	1.574
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.573 2012/12/20 23:36:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.574 2012/12/22 03:57:14 pesa Exp $
+
+  22 Dec 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Tweak sed expression to match against Qt 4.8.4 too. Thanks to Tomasz
+  Mloduchowski <q@qdot.me> for spotting the regression.
 
   20 Dec 2012; Michał Górny <mgorny@gentoo.org> python-single-r1.eclass:
   Introduce python_fix_shebang(), to fix shebangs in installed Python scripts



1.140                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- qt4-build.eclass	12 Nov 2012 09:28:53 -0000	1.139
+++ qt4-build.eclass	22 Dec 2012 03:57:14 -0000	1.140
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.139 2012/11/12 09:28:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.140 2012/12/22 03:57:14 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -274,7 +274,7 @@
 
 	# Respect CC, CXX, LINK and *FLAGS in config.tests
 	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
+		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
 			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2012-12-31  6:29 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2012-12-31  6:29 UTC (permalink / raw
  To: gentoo-commits

pesa        12/12/31 06:29:42

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Remove dead code.

Revision  Changes    Path
1.582                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- ChangeLog	30 Dec 2012 14:17:29 -0000	1.581
+++ ChangeLog	31 Dec 2012 06:29:42 -0000	1.582
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.581 2012/12/30 14:17:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.582 2012/12/31 06:29:42 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Remove dead code.
 
   30 Dec 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Fix installing scripts & modules for Prefix, bug #448786.



1.141                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- qt4-build.eclass	22 Dec 2012 03:57:14 -0000	1.140
+++ qt4-build.eclass	31 Dec 2012 06:29:42 -0000	1.141
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.140 2012/12/22 03:57:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.141 2012/12/31 06:29:42 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -36,20 +36,13 @@
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	release)
-		if version_is_at_least 4.8.1; then
-			SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
-		else
-			SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-		fi
+		SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
 		;;
 esac
 
 IUSE="aqua debug pch"
 [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions"
-if version_is_at_least 4.8; then
-	[[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
-	version_is_at_least 4.8.3 || IUSE+=" qpa"
-fi
+[[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
 
 DEPEND="virtual/pkgconfig"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
@@ -279,11 +272,6 @@
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"
 
-	if ! version_is_at_least 4.8; then
-		# Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
-		sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
-	fi
-
 	# Bug 172219
 	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
 
@@ -411,9 +399,8 @@
 	# exceptions USE flag
 	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
 
-	# disable rpath on Qt >= 4.8 (bug 380415)
-	# but leave it enabled on prefix (bug 417169)
-	version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath"
+	# disable rpath (bug 380415), except on prefix (bug 417169)
+	use prefix || conf+=" -no-rpath"
 
 	# precompiled headers don't work on hardened, where the flag is masked
 	conf+=" $(qt_use pch)"





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-01-03  8:39 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-01-03  8:39 UTC (permalink / raw
  To: gentoo-commits

pesa        13/01/03 08:39:49

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Remove more dead code, spotted by Arfrever.

Revision  Changes    Path
1.590                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.589
retrieving revision 1.590
diff -u -r1.589 -r1.590
--- ChangeLog	2 Jan 2013 21:12:44 -0000	1.589
+++ ChangeLog	3 Jan 2013 08:39:49 -0000	1.590
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.589 2013/01/02 21:12:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.590 2013/01/03 08:39:49 pesa Exp $
+
+  03 Jan 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Remove more dead code, spotted by Arfrever.
 
   02 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
   python-any-r1.eclass, python-r1.eclass, python-single-r1.eclass,



1.142                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- qt4-build.eclass	31 Dec 2012 06:29:42 -0000	1.141
+++ qt4-build.eclass	3 Jan 2013 08:39:49 -0000	1.142
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.141 2012/12/31 06:29:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.142 2013/01/03 08:39:49 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -425,15 +425,6 @@
 		unset glibflags
 	fi
 
-	if use_if_iuse qpa; then
-		echo
-		ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
-		ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
-		ewarn "disable it before reporting any bugs related to this useflag."
-		echo
-		conf+=" -qpa"
-	fi
-
 	if use aqua; then
 		# On (snow) leopard use the new (frameworked) cocoa code.
 		if [[ ${CHOST##*-darwin} -ge 9 ]]; then





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-03-02 21:44 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-03-02 21:44 UTC (permalink / raw
  To: gentoo-commits

pesa        13/03/02 21:44:34

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Remove blockers: portage is perfectly capable of handling our deps correctly by itself nowadays.

Revision  Changes    Path
1.701                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.700
retrieving revision 1.701
diff -u -r1.700 -r1.701
--- ChangeLog	2 Mar 2013 18:18:13 -0000	1.700
+++ ChangeLog	2 Mar 2013 21:44:33 -0000	1.701
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.700 2013/03/02 18:18:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.701 2013/03/02 21:44:33 pesa Exp $
+
+  02 Mar 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Remove blockers: portage is perfectly capable of handling our deps correctly
+  by itself nowadays.
 
   02 Mar 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
   Improve the no-multilib fallback to respect ${ABI} set by multilib-portage.



1.143                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- qt4-build.eclass	3 Jan 2013 08:39:49 -0000	1.142
+++ qt4-build.eclass	2 Mar 2013 21:44:33 -0000	1.143
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.142 2013/01/03 08:39:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.143 2013/03/02 21:44:33 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -49,45 +49,6 @@
 	DEPEND+=" dev-lang/perl"
 fi
 
-RDEPEND="
-	!<x11-libs/qt-assistant-${PV}:4
-	!>x11-libs/qt-assistant-${PV}-r9999:4
-	!<x11-libs/qt-bearer-${PV}:4
-	!>x11-libs/qt-bearer-${PV}-r9999:4
-	!<x11-libs/qt-core-${PV}:4
-	!>x11-libs/qt-core-${PV}-r9999:4
-	!<x11-libs/qt-dbus-${PV}:4
-	!>x11-libs/qt-dbus-${PV}-r9999:4
-	!<x11-libs/qt-declarative-${PV}:4
-	!>x11-libs/qt-declarative-${PV}-r9999:4
-	!<x11-libs/qt-demo-${PV}:4
-	!>x11-libs/qt-demo-${PV}-r9999:4
-	!<x11-libs/qt-gui-${PV}:4
-	!>x11-libs/qt-gui-${PV}-r9999:4
-	!<x11-libs/qt-multimedia-${PV}:4
-	!>x11-libs/qt-multimedia-${PV}-r9999:4
-	!<x11-libs/qt-opengl-${PV}:4
-	!>x11-libs/qt-opengl-${PV}-r9999:4
-	!<x11-libs/qt-openvg-${PV}:4
-	!>x11-libs/qt-openvg-${PV}-r9999:4
-	!<x11-libs/qt-phonon-${PV}:4
-	!>x11-libs/qt-phonon-${PV}-r9999:4
-	!<x11-libs/qt-qt3support-${PV}:4
-	!>x11-libs/qt-qt3support-${PV}-r9999:4
-	!<x11-libs/qt-script-${PV}:4
-	!>x11-libs/qt-script-${PV}-r9999:4
-	!<x11-libs/qt-sql-${PV}:4
-	!>x11-libs/qt-sql-${PV}-r9999:4
-	!<x11-libs/qt-svg-${PV}:4
-	!>x11-libs/qt-svg-${PV}-r9999:4
-	!<x11-libs/qt-test-${PV}:4
-	!>x11-libs/qt-test-${PV}-r9999:4
-	!<x11-libs/qt-webkit-${PV}:4
-	!>x11-libs/qt-webkit-${PV}-r9999:4
-	!<x11-libs/qt-xmlpatterns-${PV}:4
-	!>x11-libs/qt-xmlpatterns-${PV}-r9999:4
-"
-
 S=${WORKDIR}/${MY_P}
 
 # @FUNCTION: qt4-build_pkg_setup





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-04-07 21:14 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-04-07 21:14 UTC (permalink / raw
  To: gentoo-commits

pesa        13/04/07 21:14:46

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Remove wrong sed on QT_INSTALL_{LIBS,PLUGINS}. See bug 304971 comments 16-18.

Revision  Changes    Path
1.775                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -r1.774 -r1.775
--- ChangeLog	7 Apr 2013 17:46:23 -0000	1.774
+++ ChangeLog	7 Apr 2013 21:14:46 -0000	1.775
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.774 2013/04/07 17:46:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.775 2013/04/07 21:14:46 pesa Exp $
+
+  07 Apr 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Remove wrong sed on QT_INSTALL_{LIBS,PLUGINS}. See bug 304971 comments 16-18.
 
   07 Apr 2013; Michael Palimaka <kensington@gentoo.org> kde4-meta.eclass:
   Guard against multiple inheritance. Make KMCOMPILEONLY sed case-insensitive



1.145                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- qt4-build.eclass	3 Mar 2013 00:22:56 -0000	1.144
+++ qt4-build.eclass	7 Apr 2013 21:14:46 -0000	1.145
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.144 2013/03/03 00:22:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.145 2013/04/07 21:14:46 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -527,15 +527,6 @@
 # @DESCRIPTION:
 # Generates Makefiles for the given list of directories.
 prepare_directories() {
-	# avoid running over the maximum argument number, bug #299810
-	{
-		echo "${S}"/mkspecs/common/*.conf
-		find "${S}" -name '*.pr[io]'
-	} | xargs sed -i \
-		-e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
-		-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
-		|| die
-
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null || die
 		einfo "Running qmake in: ${x}"





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-07-06  7:57 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-07-06  7:57 UTC (permalink / raw
  To: gentoo-commits

pesa        13/07/06 07:57:14

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Update SRC_URI. Drop support for EAPI 3.

Revision  Changes    Path
1.872                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.871
retrieving revision 1.872
diff -u -r1.871 -r1.872
--- ChangeLog	5 Jul 2013 10:44:47 -0000	1.871
+++ ChangeLog	6 Jul 2013 07:57:14 -0000	1.872
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.871 2013/07/05 10:44:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.872 2013/07/06 07:57:14 pesa Exp $
+
+  06 Jul 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Update SRC_URI. Drop support for EAPI 3.
 
   05 Jul 2013; Tom Wijsman <TomWij@gentoo.org> ant-tasks.eclass:
   Update ant-tasks for 1.9.1 version bump, needs 1.5 as minimal JDK / JRE version.



1.147                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- qt4-build.eclass	28 Apr 2013 16:15:33 -0000	1.146
+++ qt4-build.eclass	6 Jul 2013 07:57:14 -0000	1.147
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.146 2013/04/28 16:15:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.147 2013/07/06 07:57:14 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -10,7 +10,7 @@
 # This eclass contains various functions that are used when building Qt4.
 
 case ${EAPI} in
-	3|4|5)	: ;;
+	4|5)	: ;;
 	*)	die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
@@ -36,7 +36,7 @@
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	release)
-		SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
+		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
 		;;
 esac
 
@@ -552,8 +552,7 @@
 			CXX="$(tc-getCXX)" \
 			LINK="$(tc-getCXX)" \
 			RANLIB=":" \
-			STRIP=":" \
-			|| die "emake failed"
+			STRIP=":"
 		popd >/dev/null || die
 	done
 }
@@ -566,7 +565,7 @@
 install_directories() {
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null || die
-		emake INSTALL_ROOT="${D}" install || die "emake install failed"
+		emake INSTALL_ROOT="${D}" install
 		popd >/dev/null || die
 	done
 }
@@ -597,7 +596,7 @@
 			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
 		done
 		insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
-		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
+		doins "${T}"/${PN}-qconfig.pri
 	fi
 
 	if [[ -n ${QCONFIG_DEFINE} ]]; then
@@ -605,7 +604,7 @@
 			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
 		done
 		insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
-		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
+		doins "${T}"/gentoo-${PN}-qconfig.h
 	fi
 }
 





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-07-27 23:47 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-07-27 23:47 UTC (permalink / raw
  To: gentoo-commits

pesa        13/07/27 23:47:20

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Rewrite sed expression in qt_nolibx11() to work on both 4.8.4 and 4.8.5. Fixes bug 478018.

Revision  Changes    Path
1.900                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.899
retrieving revision 1.900
diff -u -r1.899 -r1.900
--- ChangeLog	27 Jul 2013 16:18:00 -0000	1.899
+++ ChangeLog	27 Jul 2013 23:47:20 -0000	1.900
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.899 2013/07/27 16:18:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.900 2013/07/27 23:47:20 pesa Exp $
+
+  27 Jul 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Rewrite sed expression in qt_nolibx11() to work on both 4.8.4 and 4.8.5.
+  Fixes bug 478018.
 
   27 Jul 2013; Pacho Ramos <pacho@gentoo.org> go-mono.eclass:
   Don't block mono-3



1.148                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- qt4-build.eclass	6 Jul 2013 07:57:14 -0000	1.147
+++ qt4-build.eclass	27 Jul 2013 23:47:20 -0000	1.148
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.147 2013/07/06 07:57:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.148 2013/07/27 23:47:20 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -804,10 +804,9 @@
 # @FUNCTION: qt_nolibx11
 # @INTERNAL
 # @DESCRIPTION:
-# Ignore X11 tests for packages that don't need X libraries installed.
+# Skip X11 tests for packages that don't need X libraries installed.
 qt_nolibx11() {
-	sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
-		die "x11 check sed failed"
+	sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' "${S}"/configure || die
 }
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-08-13 10:05 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-08-13 10:05 UTC (permalink / raw
  To: gentoo-commits

pesa        13/08/13 10:05:37

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Remove workarounds for very old and unsupported gcc-3 versions. Warn if trying to use gcc < 4.4 and USE=c++0x.

Revision  Changes    Path
1.923                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -r1.922 -r1.923
--- ChangeLog	11 Aug 2013 16:20:23 -0000	1.922
+++ ChangeLog	13 Aug 2013 10:05:37 -0000	1.923
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.922 2013/08/11 16:20:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.923 2013/08/13 10:05:37 pesa Exp $
+
+  13 Aug 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Remove workarounds for very old and unsupported gcc-3 versions. Warn if
+  trying to use gcc < 4.4 and USE=c++0x.
 
   11 Aug 2013; Justin Lecher <jlec@gentoo.org> cuda.eclass:
   Add compatibility to latest cuda compiler; respect LDFLAGS



1.149                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- qt4-build.eclass	27 Jul 2013 23:47:20 -0000	1.148
+++ qt4-build.eclass	13 Aug 2013 10:05:37 -0000	1.149
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.148 2013/07/27 23:47:20 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.149 2013/08/13 10:05:37 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -101,6 +101,8 @@
 
 	if ! version_is_at_least 4.1 $(gcc-version); then
 		ewarn "Using a GCC version lower than 4.1 is not supported."
+	elif use_if_iuse c++0x && ! version_is_at_least 4.4 $(gcc-version); then
+		ewarn "USE=c++0x requires GCC 4.4 or later."
 	fi
 
 	if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
@@ -185,25 +187,10 @@
 		replace-flags -O[23] -O1
 	fi
 
-	# Bug 178652
-	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
-		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
-		append-flags -fno-gcse
-	fi
-
 	if use_if_iuse c++0x; then
 		append-cxxflags -std=c++0x
 	fi
 
-	# Unsupported old gcc versions - hardened needs this :(
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		ewarn "Appending -fno-stack-protector to CXXFLAGS"
-		append-cxxflags -fno-stack-protector
-		# Bug 253127
-		sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
-			-i mkspecs/common/g++.conf || die
-	fi
-
 	# Bug 261632
 	if use ppc64; then
 		ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-08-13 10:17 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-08-13 10:17 UTC (permalink / raw
  To: gentoo-commits

pesa        13/08/13 10:17:54

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Filter -fgraphite-identity on gcc 4.7 (bug 417105).

Revision  Changes    Path
1.924                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -r1.923 -r1.924
--- ChangeLog	13 Aug 2013 10:05:37 -0000	1.923
+++ ChangeLog	13 Aug 2013 10:17:54 -0000	1.924
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.923 2013/08/13 10:05:37 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.924 2013/08/13 10:17:54 pesa Exp $
+
+  13 Aug 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Filter -fgraphite-identity on gcc 4.7 (bug 417105).
 
   13 Aug 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Remove workarounds for very old and unsupported gcc-3 versions. Warn if



1.150                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- qt4-build.eclass	13 Aug 2013 10:05:37 -0000	1.149
+++ qt4-build.eclass	13 Aug 2013 10:17:54 -0000	1.150
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.149 2013/08/13 10:05:37 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.150 2013/08/13 10:17:54 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -181,22 +181,27 @@
 		symlink_binaries_to_buildtree
 	fi
 
-	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
-		# qmake bus errors with -O2 or -O3 but -O1 works
-		# Bug 373061
-		replace-flags -O[23] -O1
-	fi
-
 	if use_if_iuse c++0x; then
 		append-cxxflags -std=c++0x
 	fi
 
 	# Bug 261632
 	if use ppc64; then
-		ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
 		append-flags -mminimal-toc
 	fi
 
+	# Bug 373061
+	# qmake bus errors with -O2 or -O3 but -O1 works
+	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
+		replace-flags -O[23] -O1
+	fi
+
+	# Bug 417105
+	# graphite on gcc 4.7 causes miscompilations
+	if [[ $(gcc-version) == "4.7" ]]; then
+		filter-flags -fgraphite-identity
+	fi
+
 	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
 	sed -e "/^SYSTEM_VARIABLES=/i \
 		CC='$(tc-getCC)'\n\





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-10-14 17:24 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-10-14 17:24 UTC (permalink / raw
  To: gentoo-commits

pesa        13/10/14 17:24:36

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Switch to git-r3.eclass

Revision  Changes    Path
1.1023               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1022
retrieving revision 1.1023
diff -u -r1.1022 -r1.1023
--- ChangeLog	14 Oct 2013 13:32:33 -0000	1.1022
+++ ChangeLog	14 Oct 2013 17:24:36 -0000	1.1023
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1022 2013/10/14 13:32:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1023 2013/10/14 17:24:36 pesa Exp $
+
+  14 Oct 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Switch to git-r3.eclass
 
   14 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Add missing "die" calls as reported by Nikoli.



1.151                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- qt4-build.eclass	13 Aug 2013 10:17:54 -0000	1.150
+++ qt4-build.eclass	14 Oct 2013 17:24:36 -0000	1.151
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.150 2013/08/13 10:17:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.151 2013/10/14 17:24:36 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -18,7 +18,7 @@
 
 if [[ ${PV} == *9999* ]]; then
 	QT4_BUILD_TYPE="live"
-	inherit git-2
+	inherit git-r3
 else
 	QT4_BUILD_TYPE="release"
 fi
@@ -31,8 +31,10 @@
 
 case ${QT4_BUILD_TYPE} in
 	live)
-		EGIT_REPO_URI="git://gitorious.org/qt/qt.git
-			https://git.gitorious.org/qt/qt.git"
+		EGIT_REPO_URI=(
+			"git://gitorious.org/qt/qt.git"
+			"https://git.gitorious.org/qt/qt.git"
+		)
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	release)
@@ -120,7 +122,7 @@
 
 	case ${QT4_BUILD_TYPE} in
 		live)
-			git-2_src_unpack
+			git-r3_src_unpack
 			;;
 		release)
 			local tarball="${MY_P}.tar.gz" target= targets=





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-10-14 17:29 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-10-14 17:29 UTC (permalink / raw
  To: gentoo-commits

pesa        13/10/14 17:29:55

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Add qtbearer to nolibx11_pkgs

Revision  Changes    Path
1.1024               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1023
retrieving revision 1.1024
diff -u -r1.1023 -r1.1024
--- ChangeLog	14 Oct 2013 17:24:36 -0000	1.1023
+++ ChangeLog	14 Oct 2013 17:29:55 -0000	1.1024
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1023 2013/10/14 17:24:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1024 2013/10/14 17:29:55 pesa Exp $
+
+  14 Oct 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Add qtbearer to nolibx11_pkgs
 
   14 Oct 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Switch to git-r3.eclass



1.152                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- qt4-build.eclass	14 Oct 2013 17:24:36 -0000	1.151
+++ qt4-build.eclass	14 Oct 2013 17:29:55 -0000	1.152
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.151 2013/10/14 17:24:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.152 2013/10/14 17:29:55 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -165,7 +165,7 @@
 	fi
 
 	# avoid X11 dependency in non-gui packages
-	local nolibx11_pkgs="qtcore qtdbus qtscript qtsql qttest qtxmlpatterns"
+	local nolibx11_pkgs="qtbearer qtcore qtdbus qtscript qtsql qttest qtxmlpatterns"
 	has ${PN} ${nolibx11_pkgs} && qt_nolibx11
 
 	if use aqua; then





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-10-20 21:45 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-10-20 21:45 UTC (permalink / raw
  To: gentoo-commits

pesa        13/10/20 21:45:31

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Updates from qt overlay: drop USE="c++0x" from 4.8.5 and later versions; warn on downgrades instead of dying.

Revision  Changes    Path
1.1029               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1028
retrieving revision 1.1029
diff -u -r1.1028 -r1.1029
--- ChangeLog	20 Oct 2013 16:27:24 -0000	1.1028
+++ ChangeLog	20 Oct 2013 21:45:31 -0000	1.1029
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1028 2013/10/20 16:27:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1029 2013/10/20 21:45:31 pesa Exp $
+
+  20 Oct 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Updates from qt overlay: drop USE="c++0x" from 4.8.5 and later versions; warn
+  on downgrade instead of dying.
 
   20 Oct 2013; Julian Ospald <hasufell@gentoo.org> multilib-minimal.eclass:
   make doc installation part of default multilib_src_install_all() wrt #483304



1.153                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- qt4-build.eclass	14 Oct 2013 17:29:55 -0000	1.152
+++ qt4-build.eclass	20 Oct 2013 21:45:31 -0000	1.153
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.152 2013/10/14 17:29:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.153 2013/10/20 21:45:31 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -43,7 +43,9 @@
 esac
 
 IUSE="aqua debug pch"
-[[ ${CATEGORY}/${PN} != dev-qt/qtwebkit ]] && IUSE+=" c++0x"
+if ! version_is_at_least 4.8.5; then
+	[[ ${CATEGORY}/${PN} != dev-qt/qtwebkit ]] && IUSE+=" c++0x"
+fi
 [[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]] && IUSE+=" +exceptions"
 
 DEPEND="virtual/pkgconfig"
@@ -57,16 +59,12 @@
 # @DESCRIPTION:
 # Sets up PATH and LD_LIBRARY_PATH.
 qt4-build_pkg_setup() {
-	# Protect users by not allowing downgrades between releases.
-	# Downgrading revisions within the same release should be allowed.
+	# 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:4"; then
-		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-			eerror "    ***  Sanity check to keep you from breaking your system  ***"
-			eerror "Downgrading Qt is completely unsupported and will break your system!"
-			die "aborting to save your system"
-		else
-			ewarn "Downgrading Qt is completely unsupported and will break your system!"
-		fi
+		ewarn
+		ewarn "Downgrading Qt is completely unsupported and can break your system!"
+		ewarn
 	fi
 
 	PATH="${S}/bin${PATH:+:}${PATH}"
@@ -101,21 +99,21 @@
 qt4-build_src_unpack() {
 	setqtenv
 
-	if ! version_is_at_least 4.1 $(gcc-version); then
-		ewarn "Using a GCC version lower than 4.1 is not supported."
-	elif use_if_iuse c++0x && ! version_is_at_least 4.4 $(gcc-version); then
-		ewarn "USE=c++0x requires GCC 4.4 or later."
+	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 [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
-			echo
+			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"
-			echo
+			ewarn
 		fi
 		eshopts_pop
 	fi





^ permalink raw reply	[flat|nested] 48+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
@ 2013-11-11 19:47 Davide Pesavento (pesa)
  0 siblings, 0 replies; 48+ messages in thread
From: Davide Pesavento (pesa) @ 2013-11-11 19:47 UTC (permalink / raw
  To: gentoo-commits

pesa        13/11/11 19:47:39

  Modified:             ChangeLog qt4-build.eclass
  Log:
  Sync with qt overlay. Changes should affect only live ebuilds.

Revision  Changes    Path
1.1055               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1054
retrieving revision 1.1055
diff -u -r1.1054 -r1.1055
--- ChangeLog	11 Nov 2013 15:58:40 -0000	1.1054
+++ ChangeLog	11 Nov 2013 19:47:39 -0000	1.1055
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1054 2013/11/11 15:58:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1055 2013/11/11 19:47:39 pesa Exp $
+
+  11 Nov 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Sync with qt overlay. Changes should affect only live ebuilds.
 
   11 Nov 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Read all shebangs before moving files to avoid breaking symlinks that are



1.154                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- qt4-build.eclass	20 Oct 2013 21:45:31 -0000	1.153
+++ qt4-build.eclass	11 Nov 2013 19:47:39 -0000	1.154
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.153 2013/10/20 21:45:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.154 2013/11/11 19:47:39 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -26,9 +26,6 @@
 HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 
-MY_PV=${PV/_/-}
-MY_P=qt-everywhere-opensource-src-${MY_PV}
-
 case ${QT4_BUILD_TYPE} in
 	live)
 		EGIT_REPO_URI=(
@@ -38,7 +35,9 @@
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	release)
+		MY_P=qt-everywhere-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
+		S=${WORKDIR}/${MY_P}
 		;;
 esac
 
@@ -53,8 +52,6 @@
 	DEPEND+=" dev-lang/perl"
 fi
 
-S=${WORKDIR}/${MY_P}
-
 # @FUNCTION: qt4-build_pkg_setup
 # @DESCRIPTION:
 # Sets up PATH and LD_LIBRARY_PATH.





^ permalink raw reply	[flat|nested] 48+ messages in thread

end of thread, other threads:[~2013-11-11 19:47 UTC | newest]

Thread overview: 48+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-22 13:41 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass Davide Pesavento (pesa)
  -- strict thread matches above, loose matches on Subject: below --
2013-11-11 19:47 Davide Pesavento (pesa)
2013-10-20 21:45 Davide Pesavento (pesa)
2013-10-14 17:29 Davide Pesavento (pesa)
2013-10-14 17:24 Davide Pesavento (pesa)
2013-08-13 10:17 Davide Pesavento (pesa)
2013-08-13 10:05 Davide Pesavento (pesa)
2013-07-27 23:47 Davide Pesavento (pesa)
2013-07-06  7:57 Davide Pesavento (pesa)
2013-04-07 21:14 Davide Pesavento (pesa)
2013-03-02 21:44 Davide Pesavento (pesa)
2013-01-03  8:39 Davide Pesavento (pesa)
2012-12-31  6:29 Davide Pesavento (pesa)
2012-12-22  3:57 Davide Pesavento (pesa)
2012-11-12  9:28 Davide Pesavento (pesa)
2012-11-01  8:35 Davide Pesavento (pesa)
2012-09-06  8:30 Michael Palimaka (kensington)
2012-07-10 21:43 Davide Pesavento (pesa)
2012-06-18 21:33 Davide Pesavento (pesa)
2012-06-07 15:36 Davide Pesavento (pesa)
2012-05-25 12:06 Davide Pesavento (pesa)
2012-05-20 17:12 Davide Pesavento (pesa)
2012-05-07 21:28 Davide Pesavento (pesa)
2012-05-02 17:09 Davide Pesavento (pesa)
2012-04-25 17:43 Fabian Groffen (grobian)
2012-04-19 14:52 Davide Pesavento (pesa)
2012-04-04 16:37 Davide Pesavento (pesa)
2012-03-08 14:24 Davide Pesavento (pesa)
2012-03-01 15:19 Davide Pesavento (pesa)
2012-03-01 15:06 Davide Pesavento (pesa)
2012-02-28 18:19 Davide Pesavento (pesa)
2012-02-09 22:58 Davide Pesavento (pesa)
2012-02-09 22:07 Markos Chandras (hwoarang)
2012-01-31 23:02 Markos Chandras (hwoarang)
2012-01-01 19:01 Davide Pesavento (pesa)
2011-12-31  0:46 Davide Pesavento (pesa)
2011-12-30 14:39 Davide Pesavento (pesa)
2011-12-26  0:11 Davide Pesavento (pesa)
2011-12-25 18:49 Davide Pesavento (pesa)
2011-12-21 22:47 Davide Pesavento (pesa)
2011-12-21 22:36 Davide Pesavento (pesa)
2011-12-16 20:02 Jonathan Callen (abcd)
2011-12-10 17:28 Davide Pesavento (pesa)
2011-12-08 17:21 Davide Pesavento (pesa)
2011-11-19 20:52 Davide Pesavento (pesa)
2011-11-19 20:31 Davide Pesavento (pesa)
2011-11-19 20:00 Davide Pesavento (pesa)
2011-11-12 19:01 Davide Pesavento (pesa)

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