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

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

[Caleb Tennis (caleb)]

caleb       07/12/21 16:11:18

  Added:                qt4-build.eclass
  Log:
  Add new eclass

Revision  Changes    Path
1.1                  eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.1&content-type=text/plain

Index: qt4-build.eclass
===================================================================
# Copyright 2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.1 2007/12/21 16:11:18 caleb Exp $

# @ECLASS: qt4-build.eclass
# @MAINTAINER:
# Caleb Tennis <caleb@gentoo.org>
# @BLURB:
# Eclass for Qt4 
# @DESCRIPTION:
# This eclass contains various functions that are used when building Qt4

inherit eutils multilib toolchain-funcs flag-o-matic

IUSE="${IUSE} debug"

qt4-build_pkg_setup() {
	# Set up installation directories

        QTBASEDIR=/usr/$(get_libdir)/qt4
        QTPREFIXDIR=/usr
        QTBINDIR=/usr/bin
        QTLIBDIR=/usr/$(get_libdir)/qt4
        QTPCDIR=/usr/$(get_libdir)/pkgconfig
        QTDATADIR=/usr/share/qt4
        QTDOCDIR=/usr/share/doc/${PF}
        QTHEADERDIR=/usr/include/qt4
        QTPLUGINDIR=${QTLIBDIR}/plugins
        QTSYSCONFDIR=/etc/qt4
        QTTRANSDIR=${QTDATADIR}/translations
        QTEXAMPLESDIR=${QTDATADIR}/examples
        QTDEMOSDIR=${QTDATADIR}/demos

        PLATFORM=$(qt_mkspecs_dir)

	PATH="${S}/bin:${PATH}"
	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
}

qt4-build_src_unpack() {
	unpack ${A}
	cd "${S}"

	# Don't let the user go too overboard with flags.  If you really want to, uncomment
	# out the line below and give 'er a whirl.
	strip-flags
	replace-flags -O3 -O2

	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
		append-flags -fno-stack-protector
	fi
}

standard_configure_options() {
	local myconf=""

	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"

	# Disable visibility explicitly if gcc version isn't 4
	if [[ "$(gcc-major-version)" != "4" ]]; then
		myconf="${myconf} -no-reduce-exports"
	fi

	use debug && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"

	myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath\
	-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
	-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
	-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
	-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}"

	myconf="${myconf} -fast -reduce-relocations -nomake examples -nomake demos"

	echo "${myconf}"
}

build_directories() {
	local dirs="$@"
	for x in ${dirs}; do
		cd "${S}"/${x}
		qmake "LIBS+=-L${QTLIBDIR}" && emake || die
	done
}

install_directories() {
	local dirs="$@"
	for x in ${dirs}; do
		cd "${S}"/${x}
		emake INSTALL_ROOT="${D}" install || die
	done
}

qconfig_add_option() {
	local option=$1
	qconfig_remove_option $1
	sed -i -e "s:QT_CONFIG +=:QT_CONFIG += ${option}:g" /usr/share/qt4/mkspecs/qconfig.pri
}

qconfig_remove_option() {
	local option=$1
	sed -i -e "s: ${option}::g" /usr/share/qt4/mkspecs/qconfig.pri
}

skip_qmake_build_patch() {
	# Don't need to build qmake, as it's already installed from qmake-core
	sed -i -e "s:if true:if false:g" "${S}"/configure
}

skip_project_generation_patch() {
	# Exit the script early by throwing in an exit before all of the .pro files are scanned
	sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure
}

install_binaries_to_buildtree()
{
	cp ${QTBINDIR}/qmake ${S}/bin
	cp ${QTBINDIR}/moc ${S}/bin
	cp ${QTBINDIR}/uic ${S}/bin
	cp ${QTBINDIR}/rcc ${S}/bin
}

fix_library_files() {
	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la
	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl
	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc

	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
	sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc

	# Move .pc files into the pkgconfig directory
	dodir ${QTPCDIR}
	mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
}

qt_use() {
        local flag="$1"
        local feature="$1"
        local enableval=

        [[ -n $2 ]] && feature=$2
        [[ -n $3 ]] && enableval="-$3"

        useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
        return 0
}

qt_mkspecs_dir() {
         # Allows us to define which mkspecs dir we want to use.
        local spec

        case ${CHOST} in
                *-freebsd*|*-dragonfly*)
                        spec="freebsd" ;;
                *-openbsd*)
                        spec="openbsd" ;;
                *-netbsd*)
                        spec="netbsd" ;;
                *-darwin*)
                        spec="darwin" ;;
                *-linux-*|*-linux)
                        spec="linux" ;;
                *)
                        die "Unknown CHOST, no platform choosed."
        esac

        CXX=$(tc-getCXX)
        if [[ ${CXX/g++/} != ${CXX} ]]; then
                spec="${spec}-g++"
        elif [[ ${CXX/icpc/} != ${CXX} ]]; then
                spec="${spec}-icc"
        else
                die "Unknown compiler ${CXX}."
        fi

        echo "${spec}"
}

EXPORT_FUNCTIONS pkg_setup src-unpack



-- 
gentoo-commits@gentoo.org mailing list

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

[Caleb Tennis (caleb)]

caleb       07/12/21 21:10:35

  Modified:             qt4-build.eclass
  Log:
  Use the local qmake and not the one on the file system, because if we're building qt-core there may not be one on the filesystem yet

Revision  Changes    Path
1.2                  eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.1&r2=1.2

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt4-build.eclass	21 Dec 2007 16:11:18 -0000	1.1
+++ qt4-build.eclass	21 Dec 2007 21:10:34 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.1 2007/12/21 16:11:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.2 2007/12/21 21:10:34 caleb Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -79,7 +79,7 @@
 	local dirs="$@"
 	for x in ${dirs}; do
 		cd "${S}"/${x}
-		qmake "LIBS+=-L${QTLIBDIR}" && emake || die
+		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" && emake || die
 	done
 }
 



-- 
gentoo-commits@gentoo.org mailing list

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

[Caleb Tennis (caleb)]

caleb       07/12/21 21:44:03

  Modified:             qt4-build.eclass
  Log:
  Don't prestrip files, and use -silent to make the build look nicer

Revision  Changes    Path
1.3                  eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt4-build.eclass	21 Dec 2007 21:10:34 -0000	1.2
+++ qt4-build.eclass	21 Dec 2007 21:44:03 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.2 2007/12/21 21:10:34 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.3 2007/12/21 21:44:03 caleb Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -70,7 +70,7 @@
 	-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
 	-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}"
 
-	myconf="${myconf} -fast -reduce-relocations -nomake examples -nomake demos"
+	myconf="${myconf} -silent -fast -reduce-relocations -nomake examples -nomake demos"
 
 	echo "${myconf}"
 }
@@ -79,7 +79,7 @@
 	local dirs="$@"
 	for x in ${dirs}; do
 		cd "${S}"/${x}
-		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" && emake || die
+		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" && emake || die
 	done
 }
 



-- 
gentoo-commits@gentoo.org mailing list

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

[Caleb Tennis (caleb)]

caleb       07/12/22 16:29:00

  Modified:             qt4-build.eclass
  Log:
  Some new functions

Revision  Changes    Path
1.4                  eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.3&r2=1.4

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt4-build.eclass	21 Dec 2007 21:44:03 -0000	1.3
+++ qt4-build.eclass	22 Dec 2007 16:28:59 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.3 2007/12/21 21:44:03 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.4 2007/12/22 16:28:59 caleb Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -52,6 +52,11 @@
 	fi
 }
 
+qt4-build_src_install() {
+	install_directories "${QT4_TARGET_DIRECTORIES}"
+	fix_library_files
+}
+
 standard_configure_options() {
 	local myconf=""
 
@@ -75,6 +80,10 @@
 	echo "${myconf}"
 }
 
+build_target_directories() {
+	build_directories "${QT4_TARGET_DIRECTORIES}"
+}
+
 build_directories() {
 	local dirs="$@"
 	for x in ${dirs}; do
@@ -176,4 +185,4 @@
         echo "${spec}"
 }
 
-EXPORT_FUNCTIONS pkg_setup src-unpack
+EXPORT_FUNCTIONS pkg_setup src_unpack src_install



-- 
gentoo-commits@gentoo.org mailing list

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

[Caleb Tennis (caleb)]

caleb       07/12/22 17:32:55

  Modified:             qt4-build.eclass
  Log:
  spaces to tabs

Revision  Changes    Path
1.5                  eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt4-build.eclass	22 Dec 2007 16:28:59 -0000	1.4
+++ qt4-build.eclass	22 Dec 2007 17:32:55 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.4 2007/12/22 16:28:59 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.5 2007/12/22 17:32:55 caleb Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -17,21 +17,21 @@
 qt4-build_pkg_setup() {
 	# Set up installation directories
 
-        QTBASEDIR=/usr/$(get_libdir)/qt4
-        QTPREFIXDIR=/usr
-        QTBINDIR=/usr/bin
-        QTLIBDIR=/usr/$(get_libdir)/qt4
-        QTPCDIR=/usr/$(get_libdir)/pkgconfig
-        QTDATADIR=/usr/share/qt4
-        QTDOCDIR=/usr/share/doc/${PF}
-        QTHEADERDIR=/usr/include/qt4
-        QTPLUGINDIR=${QTLIBDIR}/plugins
-        QTSYSCONFDIR=/etc/qt4
-        QTTRANSDIR=${QTDATADIR}/translations
-        QTEXAMPLESDIR=${QTDATADIR}/examples
-        QTDEMOSDIR=${QTDATADIR}/demos
+	QTBASEDIR=/usr/$(get_libdir)/qt4
+	QTPREFIXDIR=/usr
+	QTBINDIR=/usr/bin
+	QTLIBDIR=/usr/$(get_libdir)/qt4
+	QTPCDIR=/usr/$(get_libdir)/pkgconfig
+	QTDATADIR=/usr/share/qt4
+	QTDOCDIR=/usr/share/doc/${PF}
+	QTHEADERDIR=/usr/include/qt4
+	QTPLUGINDIR=${QTLIBDIR}/plugins
+	QTSYSCONFDIR=/etc/qt4
+	QTTRANSDIR=${QTDATADIR}/translations
+	QTEXAMPLESDIR=${QTDATADIR}/examples
+	QTDEMOSDIR=${QTDATADIR}/demos
 
-        PLATFORM=$(qt_mkspecs_dir)
+	PLATFORM=$(qt_mkspecs_dir)
 
 	PATH="${S}/bin:${PATH}"
 	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
@@ -143,46 +143,46 @@
 }
 
 qt_use() {
-        local flag="$1"
-        local feature="$1"
-        local enableval=
+	local flag="$1"
+	local feature="$1"
+	local enableval=
 
-        [[ -n $2 ]] && feature=$2
-        [[ -n $3 ]] && enableval="-$3"
+	[[ -n $2 ]] && feature=$2
+	[[ -n $3 ]] && enableval="-$3"
 
-        useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
-        return 0
+	useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
+	return 0
 }
 
 qt_mkspecs_dir() {
-         # Allows us to define which mkspecs dir we want to use.
-        local spec
+	# Allows us to define which mkspecs dir we want to use.
+	local spec
 
-        case ${CHOST} in
-                *-freebsd*|*-dragonfly*)
-                        spec="freebsd" ;;
-                *-openbsd*)
-                        spec="openbsd" ;;
-                *-netbsd*)
-                        spec="netbsd" ;;
-                *-darwin*)
-                        spec="darwin" ;;
-                *-linux-*|*-linux)
-                        spec="linux" ;;
-                *)
-                        die "Unknown CHOST, no platform choosed."
-        esac
-
-        CXX=$(tc-getCXX)
-        if [[ ${CXX/g++/} != ${CXX} ]]; then
-                spec="${spec}-g++"
-        elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-                spec="${spec}-icc"
-        else
-                die "Unknown compiler ${CXX}."
-        fi
+	case ${CHOST} in
+		*-freebsd*|*-dragonfly*)
+			spec="freebsd" ;;
+		*-openbsd*)
+			spec="openbsd" ;;
+		*-netbsd*)
+			spec="netbsd" ;;
+ 		*-darwin*)
+			spec="darwin" ;;
+		*-linux-*|*-linux)
+			spec="linux" ;;
+		*)
+			die "Unknown CHOST, no platform choosed."
+	esac
+
+	CXX=$(tc-getCXX)
+	if [[ ${CXX/g++/} != ${CXX} ]]; then
+		spec="${spec}-g++"
+	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
+		spec="${spec}-icc"
+	else
+		die "Unknown compiler ${CXX}."
+	fi
 
-        echo "${spec}"
+	echo "${spec}"
 }
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_install



-- 
gentoo-commits@gentoo.org mailing list

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

[Caleb Tennis (caleb)]

caleb       07/12/23 20:48:30

  Modified:             qt4-build.eclass
  Log:
  Slightly change to doc dir

Revision  Changes    Path
1.6                  eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt4-build.eclass	22 Dec 2007 17:32:55 -0000	1.5
+++ qt4-build.eclass	23 Dec 2007 20:48:30 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.5 2007/12/22 17:32:55 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.6 2007/12/23 20:48:30 caleb Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -23,7 +23,7 @@
 	QTLIBDIR=/usr/$(get_libdir)/qt4
 	QTPCDIR=/usr/$(get_libdir)/pkgconfig
 	QTDATADIR=/usr/share/qt4
-	QTDOCDIR=/usr/share/doc/${PF}
+	QTDOCDIR=/usr/share/doc/qt-${PV}
 	QTHEADERDIR=/usr/include/qt4
 	QTPLUGINDIR=${QTLIBDIR}/plugins
 	QTSYSCONFDIR=/etc/qt4



-- 
gentoo-commits@gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/03/05 23:06:27

  Modified:             qt4-build.eclass
  Log:
  qt4-build.eclass: Rework eclass for Qt-4.4.0_beta1, thanks to David Leverton & Bo Andresen.

Revision  Changes    Path
1.7                  eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.6&r2=1.7

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qt4-build.eclass	23 Dec 2007 20:48:30 -0000	1.6
+++ qt4-build.eclass	5 Mar 2008 23:06:26 -0000	1.7
@@ -1,12 +1,12 @@
-# Copyright 2005 Gentoo Foundation
+# Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.6 2007/12/23 20:48:30 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.7 2008/03/05 23:06:26 ingmar Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
 # Caleb Tennis <caleb@gentoo.org>
 # @BLURB:
-# Eclass for Qt4 
+# Eclass for Qt4
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt4
 
@@ -14,9 +14,25 @@
 
 IUSE="${IUSE} debug"
 
+case "${PV}" in
+	4.4.0_beta*)
+		SRCTYPE="${SRCTYPE:-opensource-src}"
+		MY_PV="${PV/_beta/-beta}"
+		;;
+	*)
+		SRCTYPE="${SRCTYPE:-opensource-src}"
+		MY_PV="${PV}"
+		;;
+esac
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.bz2"
+
 qt4-build_pkg_setup() {
-	# Set up installation directories
+	# Check USE requirements
+	qt4-build_check_use
 
+	# Set up installation directories
 	QTBASEDIR=/usr/$(get_libdir)/qt4
 	QTPREFIXDIR=/usr
 	QTBINDIR=/usr/bin
@@ -38,44 +54,76 @@
 }
 
 qt4-build_src_unpack() {
+	# TODO: partial unpacks, cfr split KDE ebuilds.
 	unpack ${A}
 	cd "${S}"
 
+	if [[ ${PN} != qt-core ]]; then
+		skip_qmake_build_patch
+		skip_project_generation_patch
+		symlink_binaries_to_buildtree
+	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=${LDFLAGS}:" \
+		-e "s:X11R6/::" \
+		-i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
+
+	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=${LDFLAGS}:" \
+		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
+}
+
+qt4-build_src_compile() {
 	# Don't let the user go too overboard with flags.  If you really want to, uncomment
 	# out the line below and give 'er a whirl.
 	strip-flags
 	replace-flags -O3 -O2
 
-	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
+	if [[ $(gcc-fullversion) == "3.4.6" && gcc-specs-ssp ]] ; then
 		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
 		append-flags -fno-stack-protector
 	fi
+
+	myconf="$(standard_configure_options) ${myconf}"
+
+	echo ./configure ${myconf}
+	./configure ${myconf} || die "./configure failed"
+
+	build_target_directories
 }
 
 qt4-build_src_install() {
 	install_directories "${QT4_TARGET_DIRECTORIES}"
+	install_qconfigs
 	fix_library_files
 }
 
 standard_configure_options() {
 	local myconf=""
 
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+	[[ $(get_libdir) != "lib" ]] && myconf="${myconf} -L/usr/$(get_libdir)"
 
 	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" != "4" ]]; then
+	if [[ "$(gcc-major-version)" -lt "4" ]]; then
 		myconf="${myconf} -no-reduce-exports"
 	fi
 
-	use debug && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-
-	myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath\
-	-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
-	-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
-	-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
-	-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}"
+	if use debug; then
+		myconf="${myconf} -debug -no-separate-debug-info"
+	else
+		myconf="${myconf} -release -no-separate-debug-info"
+	fi
 
-	myconf="${myconf} -silent -fast -reduce-relocations -nomake examples -nomake demos"
+	myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath
+		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
+		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
+		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
+		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
+		-demosdir ${QTDEMOSDIR} -silent -fast -reduce-relocations
+		-nomake examples -nomake demos"
 
 	echo "${myconf}"
 }
@@ -88,70 +136,243 @@
 	local dirs="$@"
 	for x in ${dirs}; do
 		cd "${S}"/${x}
-		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" && emake || die
+		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
+		emake || die "emake failed"
 	done
 }
 
 install_directories() {
 	local dirs="$@"
 	for x in ${dirs}; do
-		cd "${S}"/${x}
-		emake INSTALL_ROOT="${D}" install || die
+		pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}"
+		emake INSTALL_ROOT="${D}" install || die "emake install failed"
+		popd >/dev/null || die "Can't popd from ${S}/${x}"
 	done
 }
 
-qconfig_add_option() {
-	local option=$1
-	qconfig_remove_option $1
-	sed -i -e "s:QT_CONFIG +=:QT_CONFIG += ${option}:g" /usr/share/qt4/mkspecs/qconfig.pri
+# @ECLASS-VARIABLE: QCONFIG_ADD
+# @DESCRIPTION:
+# List options that need to be added to QT_CONFIG in qconfig.pri
+QCONFIG_ADD="${QCONFIG_ADD:-}"
+
+# @ECLASS-VARIABLE: QCONFIG_REMOVE
+# @DESCRIPTION:
+# List options that need to be removed from QT_CONFIG in qconfig.pri
+QCONFIG_REMOVE="${QCONFIG_REMOVE:-}"
+
+# @ECLASS-VARIABLE: QCONFIG_DEFINE
+# @DESCRIPTION:
+# List variables that should be defined at the top of QtCore/qconfig.h
+QCONFIG_DEFINE="${QCONFIG_DEFINE:-}"
+
+install_qconfigs() {
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} ]]; then
+		local x
+		for x in QCONFIG_ADD QCONFIG_REMOVE; do
+			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
+		done
+		insinto ${QTDATADIR}/mkspecs/gentoo
+		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
+
+		for x in ${QCONFIG_DEFINE}; do
+			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
+		done
+		insinto ${QTHEADERDIR}/Gentoo
+		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
+	fi
+}
+
+# Stubs for functions used by the Qt 4.4.0_technical_preview_1.
+qconfig_add_option() { : ; }
+qconfig_remove_option() { : ; }
+
+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
+		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
+			[[ -f ${x} ]] || continue
+			qconfig_add="${qconfig_add} $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
+			qconfig_remove="${qconfig_remove} $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
+		done
+
+		# these error checks do not use die because dying in pkg_post{inst,rm}
+		# just makes things worse.
+		if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
+			# start with the qconfig.pri that qt-core installed
+			if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
+				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
+				eerror "cp qconfig failed."
+				return 1
+			fi
+
+			# generate list of QT_CONFIG entries from the existing list
+			# including qconfig_add and excluding qconfig_remove
+			for x in $(sed -n 's/^QT_CONFIG +=//p' \
+				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
+					hasq ${x} ${qconfig_remove} || qconfig_new="${qconfig_new} ${x}"
+			done
+
+			# replace the existing QT_CONFIG list with qconfig_new
+			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
+				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
+				eerror "Sed for QT_CONFIG failed"
+				return 1
+			fi
+
+			# create Gentoo/qconfig.h
+			if [[ ! -e ${ROOT}${QTHEADERDIR}/Gentoo ]]; then
+				if ! mkdir -p "${ROOT}${QTHEADERDIR}"/Gentoo; then
+					eerror "mkdir ${QTHEADERDIR}/Gentoo failed"
+					return 1
+				fi
+			fi
+			: > "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+			for x in "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
+				[[ -f ${x} ]] || continue
+				cat "${x}" >> "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+			done
+		else
+			rm -f "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri
+			rm -f "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+			rmdir "${ROOT}${QTDATADIR}"/mkspecs \
+				"${ROOT}${QTDATADIR}" \
+				"${ROOT}${QTHEADERDIR}"/Gentoo \
+				"${ROOT}${QTHEADERDIR}" 2>/dev/null
+		fi
+	fi
+}
+
+qt4-build_pkg_postrm() {
+	generate_qconfigs
 }
 
-qconfig_remove_option() {
-	local option=$1
-	sed -i -e "s: ${option}::g" /usr/share/qt4/mkspecs/qconfig.pri
+qt4-build_pkg_postinst() {
+	generate_qconfigs
 }
 
 skip_qmake_build_patch() {
-	# Don't need to build qmake, as it's already installed from qmake-core
-	sed -i -e "s:if true:if false:g" "${S}"/configure
+	# 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"
 }
 
 skip_project_generation_patch() {
 	# Exit the script early by throwing in an exit before all of the .pro files are scanned
-	sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure
+	sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
+		-i "${S}"/configure || die "Sed failed"
 }
 
-install_binaries_to_buildtree()
-{
-	cp ${QTBINDIR}/qmake ${S}/bin
-	cp ${QTBINDIR}/moc ${S}/bin
-	cp ${QTBINDIR}/uic ${S}/bin
-	cp ${QTBINDIR}/rcc ${S}/bin
+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."
+	done
 }
 
 fix_library_files() {
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
+	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:
-	sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
+	for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
+		if [[ -e ${libfile} ]]; then
+			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
 
 	# Move .pc files into the pkgconfig directory
-	dodir ${QTPCDIR}
-	mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
+
+		dodir ${QTPCDIR}
+		mv ${libfile} "${D}"/${QTPCDIR}/ \
+			|| die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
+		fi
+	done
+
+	# Don't install an empty directory
+	rmdir "${D}"/${QTLIBDIR}/pkgconfig
 }
 
 qt_use() {
-	local flag="$1"
-	local feature="$1"
+	local flag="${1}"
+	local feature="${1}"
 	local enableval=
 
-	[[ -n $2 ]] && feature=$2
-	[[ -n $3 ]] && enableval="-$3"
+	[[ -n ${2} ]] && feature=${2}
+	[[ -n ${3} ]] && enableval="-${3}"
+
+	if use ${flag}; then
+		echo "${enableval}-${feature}"
+	else
+		echo "-no-${feature}"
+	fi
+}
+
+# @ECLASS-VARIABLE: QT4_BUILT_WITH_USE_CHECK
+# @DESCRIPTION:
+# The contents of $QT4_BUILT_WITH_USE_CHECK gets fed to built_with_use
+# (eutils.eclass), line per line.
+#
+# Example:
+# @CODE
+# pkg_setup() {
+# 	use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
+# 		~x11-libs/qt-gui-${PV} qt3support"
+# 	qt4-build_check_use
+# }
+# @CODE
+
+# Run built_with_use on each flag and print appropriate error messages if any
+# flags are missing
+_qt_built_with_use() {
+	local missing opt pkg flag flags
 
-	useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
-	return 0
+	if [[ ${1} = "--missing" ]]; then
+		missing="${1} ${2}" && shift 2
+	fi
+	if [[ ${1:0:1} = "-" ]]; then
+		opt=${1} && shift
+	fi
+
+	pkg=${1} && shift
+
+	for flag in "${@}"; do
+		flags="${flags} ${flag}"
+		if ! built_with_use ${missing} ${opt} ${pkg} ${flag}; then
+			flags="${flags}*"
+		else
+			[[ ${opt} = "-o" ]] && return 0
+		fi
+	done
+	if [[ "${flags# }" = "${@}" ]]; then
+		return 0
+	fi
+	if [[ ${opt} = "-o" ]]; then
+		eerror "This package requires '${pkg}' to be built with any of the following USE flags: '$*'."
+	else
+		eerror "This package requires '${pkg}' to be built with the following USE flags: '${flags# }'."
+	fi
+	return 1
+}
+
+# @FUNCTION: qt4-build_check_use
+# @DESCRIPTION:
+# Check if the listed packages in $QT4_BUILT_WITH_USE_CHECK are built with the
+# USE flags listed.
+#
+# If any of the required USE flags are missing, an eerror will be printed for
+# each package with missing USE flags.
+qt4-build_check_use() {
+	local line missing
+	while read line; do
+		[[ -z ${line} ]] && continue
+		if ! _qt_built_with_use ${line}; then
+			missing=true
+		fi
+	done <<< "${QT4_BUILT_WITH_USE_CHECK}"
+	if [[ -n ${missing} ]]; then
+		echo
+		eerror "Flags marked with an * are missing."
+		die "Missing USE flags found"
+	fi
 }
 
 qt_mkspecs_dir() {
@@ -165,12 +386,12 @@
 			spec="openbsd" ;;
 		*-netbsd*)
 			spec="netbsd" ;;
- 		*-darwin*)
+		*-darwin*)
 			spec="darwin" ;;
 		*-linux-*|*-linux)
 			spec="linux" ;;
 		*)
-			die "Unknown CHOST, no platform choosed."
+			die "Unknown CHOST, no platform choosen."
 	esac
 
 	CXX=$(tc-getCXX)
@@ -185,4 +406,4 @@
 	echo "${spec}"
 }
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_install
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postrm pkg_postinst



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/03/06 01:23:52

  Modified:             qt4-build.eclass
  Log:
  @BLURB needs to be one line

Revision  Changes    Path
1.8                  eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt4-build.eclass	5 Mar 2008 23:06:26 -0000	1.7
+++ qt4-build.eclass	6 Mar 2008 01:23:51 -0000	1.8
@@ -1,12 +1,11 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.7 2008/03/05 23:06:26 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.8 2008/03/06 01:23:51 ingmar Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
 # Caleb Tennis <caleb@gentoo.org>
-# @BLURB:
-# Eclass for Qt4
+# @BLURB: Eclass for Qt4 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt4
 



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Bo Oersted Andresen (zlin)]

zlin        08/03/06 14:44:14

  Modified:             qt4-build.eclass
  Log:
  Only install qconfig.pri if one of QCONFIG_{ADD,REMOVE} is non-empty (bug #212491).

Revision  Changes    Path
1.9                  eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt4-build.eclass	6 Mar 2008 01:23:51 -0000	1.8
+++ qt4-build.eclass	6 Mar 2008 14:44:13 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.8 2008/03/06 01:23:51 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.9 2008/03/06 14:44:13 zlin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -165,14 +165,16 @@
 QCONFIG_DEFINE="${QCONFIG_DEFINE:-}"
 
 install_qconfigs() {
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} ]]; then
-		local x
+	local x
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
 		for x in QCONFIG_ADD QCONFIG_REMOVE; do
 			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
 		done
 		insinto ${QTDATADIR}/mkspecs/gentoo
 		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
+	fi
 
+	if [[ -n ${QCONFIG_DEFINE} ]]; then
 		for x in ${QCONFIG_DEFINE}; do
 			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
 		done



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/03/11 16:39:44

  Modified:             qt4-build.eclass
  Log:
  append-flags -fno-gcse for on amd64 with gcc 3, bug 178652.

Revision  Changes    Path
1.10                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt4-build.eclass	6 Mar 2008 14:44:13 -0000	1.9
+++ qt4-build.eclass	11 Mar 2008 16:39:43 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.9 2008/03/06 14:44:13 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.10 2008/03/11 16:39:43 ingmar Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -86,6 +86,12 @@
 		append-flags -fno-stack-protector
 	fi
 
+	# Bug 178652
+	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
+		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
+		append-flags -fno-gcse
+	fi
+
 	myconf="$(standard_configure_options) ${myconf}"
 
 	echo ./configure ${myconf}



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/04/10 14:23:45

  Modified:             qt4-build.eclass
  Log:
  Updates for Qt-4.4.0_rc1.

Revision  Changes    Path
1.11                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt4-build.eclass	11 Mar 2008 16:39:43 -0000	1.10
+++ qt4-build.eclass	10 Apr 2008 14:23:45 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.10 2008/03/11 16:39:43 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.11 2008/04/10 14:23:45 ingmar Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -18,14 +18,27 @@
 		SRCTYPE="${SRCTYPE:-opensource-src}"
 		MY_PV="${PV/_beta/-beta}"
 		;;
+	4.4.0_rc*)
+		SRCTYPE="${SRCTYPE:-opensource-src}"
+		MY_PV="${PV/_rc/-rc}"
+		;;
 	*)
 		SRCTYPE="${SRCTYPE:-opensource-src}"
 		MY_PV="${PV}"
 		;;
 esac
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
+MY_P=qt-x11-${SRCTYPE}-${MY_PV}
+S=${WORKDIR}/${MY_P}
 
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.bz2"
+SRC_URI="ftp://ftp.trolltech.com/qt/source/${MY_P}.tar.bz2"
+
+case "${PV}" in
+	4.4.0_rc*)
+		SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2"
+		;;
+	*)
+		;;
+esac
 
 qt4-build_pkg_setup() {
 	# Check USE requirements
@@ -52,12 +65,29 @@
 	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 }
 
-qt4-build_src_unpack() {
-	# TODO: partial unpacks, cfr split KDE ebuilds.
-	unpack ${A}
-	cd "${S}"
+qt4_unpack() {
+	local target targets
+	for target in configure LICENSE.{GPL2,GPL3,QPL} projects.pro \
+		src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
+		${QT4_EXTRACT_DIRECTORIES} ${QT4_TARGET_DIRECTORIES}; do
+			targets="${targets} ${MY_P}/${target}"
+	done
+
+	echo tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
+	tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
+
+	case "${PV}" in
+		4.4.0_rc*)
+			echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
+			tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
+			;;
+	esac
+}
 
+qt4-build_src_unpack() {
+	qt4_unpack
 	if [[ ${PN} != qt-core ]]; then
+		cd "${S}"
 		skip_qmake_build_patch
 		skip_project_generation_patch
 		symlink_binaries_to_buildtree
@@ -122,6 +152,17 @@
 		myconf="${myconf} -release -no-separate-debug-info"
 	fi
 
+	# ARCH is set on Gentoo. QT now falls back to generic on an unsupported
+	# ${ARCH}. Therefore we convert it to supported values.
+	case "${ARCH}" in
+		amd64) myconf="${myconf} -arch x86_64" ;;
+		ppc|ppc64) myconf="${myconf} -arch powerpc" ;;
+		x86) myconf="${myconf} -arch i386" ;;
+		alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch ${ARCH}" ;;
+		hppa|sh) myconf="${myconf} -arch generic" ;;
+		*) die "${ARCH} is unsupported by this eclass. Please file a bug." ;;
+	esac
+
 	myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath
 		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
 		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/04/14 21:51:16

  Modified:             qt4-build.eclass
  Log:
  Add a pch USE flag to Qt:4 split ebuilds, bug 217712.

Revision  Changes    Path
1.12                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qt4-build.eclass	10 Apr 2008 14:23:45 -0000	1.11
+++ qt4-build.eclass	14 Apr 2008 21:51:15 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.11 2008/04/10 14:23:45 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.12 2008/04/14 21:51:15 ingmar Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -11,7 +11,7 @@
 
 inherit eutils multilib toolchain-funcs flag-o-matic
 
-IUSE="${IUSE} debug"
+IUSE="${IUSE} debug pch"
 
 case "${PV}" in
 	4.4.0_beta*)
@@ -146,6 +146,13 @@
 		myconf="${myconf} -no-reduce-exports"
 	fi
 
+	# precompiled headers doesn't work on hardened, where the flag is masked.
+	if use pch; then
+		myconf="${myconf} -pch"
+	else
+		myconf="${myconf} -no-pch"
+	fi
+
 	if use debug; then
 		myconf="${myconf} -debug -no-separate-debug-info"
 	else



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/05/15 12:33:53

  Modified:             qt4-build.eclass
  Log:
  qt4-build.eclass: Eclass changes for Qt 4.4.0.

Revision  Changes    Path
1.13                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.12&r2=1.13

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qt4-build.eclass	14 Apr 2008 21:51:15 -0000	1.12
+++ qt4-build.eclass	15 May 2008 12:33:53 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.12 2008/04/14 21:51:15 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.13 2008/05/15 12:33:53 ingmar Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -33,7 +33,7 @@
 SRC_URI="ftp://ftp.trolltech.com/qt/source/${MY_P}.tar.bz2"
 
 case "${PV}" in
-	4.4.0_rc*)
+	4.4.0|4.4.0_rc*)
 		SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2"
 		;;
 	*)
@@ -69,7 +69,7 @@
 	local target targets
 	for target in configure LICENSE.{GPL2,GPL3,QPL} projects.pro \
 		src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
-		${QT4_EXTRACT_DIRECTORIES} ${QT4_TARGET_DIRECTORIES}; do
+		${QT4_EXTRACT_DIRECTORIES}; do
 			targets="${targets} ${MY_P}/${target}"
 	done
 
@@ -77,7 +77,7 @@
 	tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
 
 	case "${PV}" in
-		4.4.0_rc*)
+		4.4.0|4.4.0_rc*)
 			echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
 			tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
 			;;



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/05/26 14:30:45

  Modified:             qt4-build.eclass
  Log:
  Don't die on ~x86-fbsd, as noted by Alexis Ballier in bug 223557.

Revision  Changes    Path
1.14                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qt4-build.eclass	15 May 2008 12:33:53 -0000	1.13
+++ qt4-build.eclass	26 May 2008 14:30:44 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.13 2008/05/15 12:33:53 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.14 2008/05/26 14:30:44 ingmar Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -164,7 +164,7 @@
 	case "${ARCH}" in
 		amd64) myconf="${myconf} -arch x86_64" ;;
 		ppc|ppc64) myconf="${myconf} -arch powerpc" ;;
-		x86) myconf="${myconf} -arch i386" ;;
+		x86|x86-*) myconf="${myconf} -arch i386" ;;
 		alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch ${ARCH}" ;;
 		hppa|sh) myconf="${myconf} -arch generic" ;;
 		*) die "${ARCH} is unsupported by this eclass. Please file a bug." ;;



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ben de Groot (yngwin)]

yngwin      08/08/11 12:52:11

  Modified:             qt4-build.eclass
  Log:
  Adding 4.4.1 to qt4-build.eclass

Revision  Changes    Path
1.15                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.14&r2=1.15

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qt4-build.eclass	26 May 2008 14:30:44 -0000	1.14
+++ qt4-build.eclass	11 Aug 2008 12:52:10 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.14 2008/05/26 14:30:44 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.15 2008/08/11 12:52:10 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -33,7 +33,7 @@
 SRC_URI="ftp://ftp.trolltech.com/qt/source/${MY_P}.tar.bz2"
 
 case "${PV}" in
-	4.4.0|4.4.0_rc*)
+	4.4.1|4.4.0|4.4.0_rc*)
 		SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2"
 		;;
 	*)
@@ -67,7 +67,7 @@
 
 qt4_unpack() {
 	local target targets
-	for target in configure LICENSE.{GPL2,GPL3,QPL} projects.pro \
+	for target in configure LICENSE.{GPL2,GPL3} projects.pro \
 		src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
 		${QT4_EXTRACT_DIRECTORIES}; do
 			targets="${targets} ${MY_P}/${target}"
@@ -77,7 +77,7 @@
 	tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
 
 	case "${PV}" in
-		4.4.0|4.4.0_rc*)
+		4.4.1|4.4.0|4.4.0_rc*)
 			echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
 			tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
 			;;

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

[Ben de Groot (yngwin)]

yngwin      08/09/18 22:07:50

  Modified:             qt4-build.eclass
  Log:
  Preparing qt4-build.eclass for qt-4.4.2

Revision  Changes    Path
1.16                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt4-build.eclass	11 Aug 2008 12:52:10 -0000	1.15
+++ qt4-build.eclass	18 Sep 2008 22:07:50 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.15 2008/08/11 12:52:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.16 2008/09/18 22:07:50 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -33,7 +33,7 @@
 SRC_URI="ftp://ftp.trolltech.com/qt/source/${MY_P}.tar.bz2"
 
 case "${PV}" in
-	4.4.1|4.4.0|4.4.0_rc*)
+	4.4.2|4.4.1|4.4.0|4.4.0_rc*)
 		SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2"
 		;;
 	*)
@@ -77,7 +77,7 @@
 	tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
 
 	case "${PV}" in
-		4.4.1|4.4.0|4.4.0_rc*)
+		4.4.2|4.4.1|4.4.0|4.4.0_rc*)
 			echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
 			tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
 			;;

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

[Ben de Groot (yngwin)]

yngwin      09/01/12 23:47:16

  Modified:             qt4-build.eclass
  Log:
  Adding post-install warning about Qt4 plugins needing rebuilding

Revision  Changes    Path
1.17                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.16&r2=1.17

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qt4-build.eclass	18 Sep 2008 22:07:50 -0000	1.16
+++ qt4-build.eclass	12 Jan 2009 23:47:16 -0000	1.17
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.16 2008/09/18 22:07:50 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.17 2009/01/12 23:47:16 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -303,6 +303,20 @@
 
 qt4-build_pkg_postinst() {
 	generate_qconfigs
+	echo
+	ewarn "After a rebuild or upgrade of Qt, it can happen that Qt plugins (such as Qt"
+	ewarn "and KDE styles and widgets) can no longer be loaded. In this situation you"
+	ewarn "should recompile the packages providing these plugins. Also, make sure you"
+	ewarn "compile the Qt packages, and the packages that depend on it, with the same"
+	ewarn "GCC version and the same USE flag settings (especially the debug flag)."
+	ewarn
+	ewarn "Packages that typically need to be recompiled are kdelibs from KDE4, any"
+	ewarn "additional KDE4/Qt4 styles, qscintilla and PyQt4. Before filing a bug report,"
+	ewarn "make sure all your Qt4 packages are up-to-date and built with the same"
+	ewarn "configuration."
+	ewarn
+	ewarn "For more information, see http://doc.trolltech.com/4.4/plugins-howto.html"
+	echo
 }
 
 skip_qmake_build_patch() {

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

[Gordon Malm (gengor)]

gengor      09/01/21 08:55:28

  Modified:             qt4-build.eclass
  Log:
  Append -fno-stack-protector-all to creation of internal qmake, bug 253127

Revision  Changes    Path
1.18                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qt4-build.eclass	12 Jan 2009 23:47:16 -0000	1.17
+++ qt4-build.eclass	21 Jan 2009 08:55:28 -0000	1.18
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.17 2009/01/12 23:47:16 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.18 2009/01/21 08:55:28 gengor Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -93,6 +93,12 @@
 		symlink_binaries_to_buildtree
 	fi
 
+	# Bug 253127
+	if [[ $(gcc-major-version) -lt "4" ]] ; then
+		sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
+		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
+	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=${LDFLAGS}:" \
@@ -111,9 +117,9 @@
 	strip-flags
 	replace-flags -O3 -O2
 
-	if [[ $(gcc-fullversion) == "3.4.6" && gcc-specs-ssp ]] ; then
-		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
-		append-flags -fno-stack-protector
+	if [[ $(gcc-major-version) -lt "4" ]] ; then
+		ewarn "Appending -fno-stack-protector to CXXFLAGS"
+		append-cxxflags -fno-stack-protector
 	fi
 
 	# Bug 178652

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

[Alexis Ballier (aballier)]

aballier    09/01/29 18:45:29

  Modified:             qt4-build.eclass
  Log:
  Disable reduce-relocations on bsd as the qmake spec files aren't ready for this and it causes build failures; we'll have to enable it back once upstream will have fixed the spec files.

Revision  Changes    Path
1.19                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.18&r2=1.19

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qt4-build.eclass	21 Jan 2009 08:55:28 -0000	1.18
+++ qt4-build.eclass	29 Jan 2009 18:45:29 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.18 2009/01/21 08:55:28 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.19 2009/01/29 18:45:29 aballier Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -181,7 +181,7 @@
 		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
 		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
 		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
-		-demosdir ${QTDEMOSDIR} -silent -fast -reduce-relocations
+		-demosdir ${QTDEMOSDIR} -silent -fast $(use x86-fbsd || echo -reduce-relocations)
 		-nomake examples -nomake demos"
 
 	echo "${myconf}"

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

[Ben de Groot (yngwin)]

yngwin      09/02/11 21:14:59

  Modified:             qt4-build.eclass
  Log:
  Make qt4-build.eclass use EAPI-2 aware

Revision  Changes    Path
1.20                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt4-build.eclass	29 Jan 2009 18:45:29 -0000	1.19
+++ qt4-build.eclass	11 Feb 2009 21:14:59 -0000	1.20
@@ -1,24 +1,22 @@
-# Copyright 2007-2008 Gentoo Foundation
+# Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.19 2009/01/29 18:45:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.20 2009/02/11 21:14:59 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
+# Ben de Groot <yngwin@gentoo.org>
+# Markos Chandras <hwoarang@gentoo.org>
 # Caleb Tennis <caleb@gentoo.org>
 # @BLURB: Eclass for Qt4 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt4
 
-inherit eutils multilib toolchain-funcs flag-o-matic
+inherit eutils multilib toolchain-funcs flag-o-matic versionator
 
-IUSE="${IUSE} debug pch"
+IUSE="${IUSE} custom-cxxflags debug pch"
 
 case "${PV}" in
-	4.4.0_beta*)
-		SRCTYPE="${SRCTYPE:-opensource-src}"
-		MY_PV="${PV/_beta/-beta}"
-		;;
-	4.4.0_rc*)
+	4.?.?_rc*)
 		SRCTYPE="${SRCTYPE:-opensource-src}"
 		MY_PV="${PV/_rc/-rc}"
 		;;
@@ -30,19 +28,26 @@
 MY_P=qt-x11-${SRCTYPE}-${MY_PV}
 S=${WORKDIR}/${MY_P}
 
+HOMEPAGE="http://www.qtsoftware.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/${MY_P}.tar.bz2"
 
 case "${PV}" in
-	4.4.2|4.4.1|4.4.0|4.4.0_rc*)
-		SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2"
-		;;
-	*)
-		;;
+	4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;;
+	*)     ;;
 esac
 
 qt4-build_pkg_setup() {
-	# Check USE requirements
-	qt4-build_check_use
+	# EAPI=2 ebuilds set use-deps, others need this:
+	if [[ $EAPI != 2 ]]; then
+		# Make sure debug setting corresponds with qt-core (bug 258512)
+		if [[ $PN != "qt-core" ]]; then
+			use debug && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
+				~x11-libs/qt-core-${PV} debug"
+		fi
+
+		# Check USE requirements
+		qt4-build_check_use
+	fi
 
 	# Set up installation directories
 	QTBASEDIR=/usr/$(get_libdir)/qt4
@@ -63,9 +68,15 @@
 
 	PATH="${S}/bin:${PATH}"
 	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	if ! version_is_at_least 4.1 $(gcc-version) ; then
+		ewarn "Using a GCC version lower than 4.1 is not supported!"
+		echo
+		ebeep 5
+	fi
 }
 
-qt4_unpack() {
+qt4-build_src_unpack() {
 	local target targets
 	for target in configure LICENSE.{GPL2,GPL3} projects.pro \
 		src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
@@ -77,17 +88,22 @@
 	tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
 
 	case "${PV}" in
-		4.4.2|4.4.1|4.4.0|4.4.0_rc*)
+		4.4.?)
 			echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
 			tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
 			;;
 	esac
+
+	# Be backwards compatible for now
+	if [[ $EAPI != 2 ]]; then
+		qt4-build_src_prepare
+	fi
 }
 
-qt4-build_src_unpack() {
-	qt4_unpack
+qt4-build_src_prepare() {
+	cd "${S}"
+
 	if [[ ${PN} != qt-core ]]; then
-		cd "${S}"
 		skip_qmake_build_patch
 		skip_project_generation_patch
 		symlink_binaries_to_buildtree
@@ -111,12 +127,22 @@
 		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
 }
 
-qt4-build_src_compile() {
-	# Don't let the user go too overboard with flags.  If you really want to, uncomment
-	# out the line below and give 'er a whirl.
-	strip-flags
-	replace-flags -O3 -O2
+qt4-build_src_configure() {
+	if use custom-cxxflags; then
+		echo
+		ewarn "You have set USE=custom-cxxflags, which means Qt will be built with the"
+		ewarn "CXXFLAGS you have set in /etc/make.conf. This is not supported, and we"
+		ewarn "recommend to unset this useflag. But you are free to experiment with it."
+		ewarn "Just do not start crying if it breaks your system, or eats your kitten"
+		ewarn "for breakfast. ;-) "
+		echo
+	else
+		# Don't let the user go too overboard with flags.
+		strip-flags
+		replace-flags -O3 -O2
+	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
@@ -132,8 +158,15 @@
 
 	echo ./configure ${myconf}
 	./configure ${myconf} || die "./configure failed"
+}
 
-	build_target_directories
+qt4-build_src_compile() {
+	# Be backwards compatible for now
+	if [[ $EAPI != 2 ]]; then
+		qt4-build_src_configure
+	fi
+
+	build_directories "${QT4_TARGET_DIRECTORIES}"
 }
 
 qt4-build_src_install() {
@@ -165,7 +198,7 @@
 		myconf="${myconf} -release -no-separate-debug-info"
 	fi
 
-	# ARCH is set on Gentoo. QT now falls back to generic on an unsupported
+	# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
 	# ${ARCH}. Therefore we convert it to supported values.
 	case "${ARCH}" in
 		amd64) myconf="${myconf} -arch x86_64" ;;
@@ -181,16 +214,14 @@
 		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
 		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
 		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
-		-demosdir ${QTDEMOSDIR} -silent -fast $(use x86-fbsd || echo -reduce-relocations)
+		-demosdir ${QTDEMOSDIR} -silent -fast
+		$([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions)
+		$(use x86-fbsd || echo -reduce-relocations)
 		-nomake examples -nomake demos"
 
 	echo "${myconf}"
 }
 
-build_target_directories() {
-	build_directories "${QT4_TARGET_DIRECTORIES}"
-}
-
 build_directories() {
 	local dirs="$@"
 	for x in ${dirs}; do
@@ -243,10 +274,6 @@
 	fi
 }
 
-# Stubs for functions used by the Qt 4.4.0_technical_preview_1.
-qconfig_add_option() { : ; }
-qconfig_remove_option() { : ; }
-
 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
@@ -481,4 +508,7 @@
 	echo "${spec}"
 }
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postrm pkg_postinst
+case ${EAPI:-0} in
+	0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postrm pkg_postinst ;;
+	2) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_postrm pkg_postinst ;;
+esac

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

[Markos Chandras (hwoarang)]

hwoarang    09/02/14 22:25:10

  Modified:             qt4-build.eclass
  Log:
  Updating eclass. Partially fixes bug #172219

Revision  Changes    Path
1.21                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qt4-build.eclass	11 Feb 2009 21:14:59 -0000	1.20
+++ qt4-build.eclass	14 Feb 2009 22:25:10 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.20 2009/02/11 21:14:59 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.21 2009/02/14 22:25:10 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -74,6 +74,17 @@
 		echo
 		ebeep 5
 	fi
+
+	if use custom-cxxflags; then
+		echo
+		ewarn "You have set USE=custom-cxxflags, which means Qt will be built with the"
+		ewarn "CXXFLAGS you have set in /etc/make.conf. This is not supported, and we"
+		ewarn "recommend to unset this useflag. But you are free to experiment with it."
+		ewarn "Just do not start crying if it breaks your system, or eats your kitten"
+		ewarn "for breakfast. ;-) "
+		echo
+	fi
+
 }
 
 qt4-build_src_unpack() {
@@ -108,13 +119,28 @@
 		skip_project_generation_patch
 		symlink_binaries_to_buildtree
 	fi
+	
+	# Bug 172219	
+	if !use custom-cxxflags;then
+		# Don't let the user go too overboard with flags.
+		strip-flags
+		replace-flags -O3 -O2
+	fi
 
 	# Bug 253127
+	# Unsupported old gcc versions - hardened needs this :(
 	if [[ $(gcc-major-version) -lt "4" ]] ; then
-		sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
-		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
+		ewarn "Appending -fno-stack-protector to CXXFLAGS"
+		append-cxxflags -fno-stack-protector
 	fi
 
+	# Bug 178652
+	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
+		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
+		append-flags -fno-gcse
+	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=${LDFLAGS}:" \
@@ -125,34 +151,10 @@
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
+
 }
 
 qt4-build_src_configure() {
-	if use custom-cxxflags; then
-		echo
-		ewarn "You have set USE=custom-cxxflags, which means Qt will be built with the"
-		ewarn "CXXFLAGS you have set in /etc/make.conf. This is not supported, and we"
-		ewarn "recommend to unset this useflag. But you are free to experiment with it."
-		ewarn "Just do not start crying if it breaks your system, or eats your kitten"
-		ewarn "for breakfast. ;-) "
-		echo
-	else
-		# Don't let the user go too overboard with flags.
-		strip-flags
-		replace-flags -O3 -O2
-	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
-	fi
-
-	# Bug 178652
-	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
-		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
-		append-flags -fno-gcse
-	fi
 
 	myconf="$(standard_configure_options) ${myconf}"
 

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

[Markos Chandras (hwoarang)]

hwoarang    09/02/14 22:48:26

  Modified:             qt4-build.eclass
  Log:
  fixing typo

Revision  Changes    Path
1.22                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qt4-build.eclass	14 Feb 2009 22:25:10 -0000	1.21
+++ qt4-build.eclass	14 Feb 2009 22:48:26 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.21 2009/02/14 22:25:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.22 2009/02/14 22:48:26 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -121,7 +121,7 @@
 	fi
 	
 	# Bug 172219	
-	if !use custom-cxxflags;then
+	if ! use custom-cxxflags;then
 		# Don't let the user go too overboard with flags.
 		strip-flags
 		replace-flags -O3 -O2

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

[Markos Chandras (hwoarang)]

hwoarang    09/02/14 23:47:44

  Modified:             qt4-build.eclass
  Log:
  Remove trailing spaces, fixing typo

Revision  Changes    Path
1.23                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qt4-build.eclass	14 Feb 2009 22:48:26 -0000	1.22
+++ qt4-build.eclass	14 Feb 2009 23:47:44 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.22 2009/02/14 22:48:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.23 2009/02/14 23:47:44 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -120,7 +120,6 @@
 		symlink_binaries_to_buildtree
 	fi
 	
-	# Bug 172219	
 	if ! use custom-cxxflags;then
 		# Don't let the user go too overboard with flags.
 		strip-flags
@@ -140,7 +139,7 @@
 		append-flags -fno-gcse
 	fi
 
-	
+	# Bug 172219	
 	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=${LDFLAGS}:" \

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

[Markos Chandras (hwoarang)]

hwoarang    09/02/15 00:11:50

  Modified:             qt4-build.eclass
  Log:
  More whitespaces clean up

Revision  Changes    Path
1.24                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.23&r2=1.24

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- qt4-build.eclass	14 Feb 2009 23:47:44 -0000	1.23
+++ qt4-build.eclass	15 Feb 2009 00:11:50 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.23 2009/02/14 23:47:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.24 2009/02/15 00:11:50 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -119,7 +119,7 @@
 		skip_project_generation_patch
 		symlink_binaries_to_buildtree
 	fi
-	
+
 	if ! use custom-cxxflags;then
 		# Don't let the user go too overboard with flags.
 		strip-flags
@@ -139,7 +139,7 @@
 		append-flags -fno-gcse
 	fi
 
-	# Bug 172219	
+	# Bug 172219
 	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=${LDFLAGS}:" \

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

[Ben de Groot (yngwin)]

yngwin      09/03/04 20:37:11

  Modified:             qt4-build.eclass
  Log:
  Updating qt4-build.eclass for 4.5.0 release

Revision  Changes    Path
1.25                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.24&r2=1.25

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- qt4-build.eclass	15 Feb 2009 00:11:50 -0000	1.24
+++ qt4-build.eclass	4 Mar 2009 20:37:08 -0000	1.25
@@ -1,11 +1,11 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.24 2009/02/15 00:11:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.25 2009/03/04 20:37:08 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
-# Ben de Groot <yngwin@gentoo.org>
-# Markos Chandras <hwoarang@gentoo.org>
+# Ben de Groot <yngwin@gentoo.org>,
+# Markos Chandras <hwoarang@gentoo.org>,
 # Caleb Tennis <caleb@gentoo.org>
 # @BLURB: Eclass for Qt4 split ebuilds.
 # @DESCRIPTION:
@@ -29,13 +29,17 @@
 S=${WORKDIR}/${MY_P}
 
 HOMEPAGE="http://www.qtsoftware.com/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/${MY_P}.tar.bz2"
+SRC_URI="http://download.qtsoftware.com/qt/source/${MY_P}.tar.bz2"
 
 case "${PV}" in
 	4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;;
 	*)     ;;
 esac
 
+if version_is_at_least 4.5 ${PV} ; then
+	LICENSE="|| ( LGPL-2.1 GPL-3 )"
+fi
+
 qt4-build_pkg_setup() {
 	# EAPI=2 ebuilds set use-deps, others need this:
 	if [[ $EAPI != 2 ]]; then

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

[Markos Chandras (hwoarang)]

hwoarang    09/03/05 09:25:01

  Modified:             qt4-build.eclass
  Log:
  Correct license extraction in case of 4.5 packages

Revision  Changes    Path
1.26                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.25&r2=1.26

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qt4-build.eclass	4 Mar 2009 20:37:08 -0000	1.25
+++ qt4-build.eclass	5 Mar 2009 09:25:01 -0000	1.26
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.25 2009/03/04 20:37:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.26 2009/03/05 09:25:01 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -92,8 +92,13 @@
 }
 
 qt4-build_src_unpack() {
-	local target targets
-	for target in configure LICENSE.{GPL2,GPL3} projects.pro \
+	local target targets licenses
+	if version_is_at_least 4.5 ${PV} ; then
+		licenses="LICENSE.GPL3 LICENSE.LGPL"
+	else
+		licenses="LICENSE.GPL2 LICENSE.GPL3"
+	fi
+	for target in configure ${licenses} projects.pro \
 		src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
 		${QT4_EXTRACT_DIRECTORIES}; do
 			targets="${targets} ${MY_P}/${target}"

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

[Diego Petteno (flameeyes)]

flameeyes    09/03/11 23:58:31

  Modified:             qt4-build.eclass
  Log:
  Use $(tc-arch) rather than ${ARCH}.
  
  With this change, the 32-bit userland version of amd64 profiles will
  build qt properly; without this, Qt will enable 64-bit instructions
  when the compiler is set to produce 32-bit code, causing an assembler
  failure.
  
  This is needed to be able to build Qt4 for the emul-linux-x86
  packages.

Revision  Changes    Path
1.27                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.26&r2=1.27

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4-build.eclass	5 Mar 2009 09:25:01 -0000	1.26
+++ qt4-build.eclass	11 Mar 2009 23:58:31 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.26 2009/03/05 09:25:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.27 2009/03/11 23:58:31 flameeyes Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -209,14 +209,14 @@
 	fi
 
 	# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
-	# ${ARCH}. Therefore we convert it to supported values.
-	case "${ARCH}" in
+	# $(tc-arch). Therefore we convert it to supported values.
+	case "$(tc-arch)" in
 		amd64) myconf="${myconf} -arch x86_64" ;;
 		ppc|ppc64) myconf="${myconf} -arch powerpc" ;;
 		x86|x86-*) myconf="${myconf} -arch i386" ;;
-		alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch ${ARCH}" ;;
+		alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch $(tc-arch)" ;;
 		hppa|sh) myconf="${myconf} -arch generic" ;;
-		*) die "${ARCH} is unsupported by this eclass. Please file a bug." ;;
+		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 
 	myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath

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

[Alexis Ballier (aballier)]

aballier    09/03/16 08:21:18

  Modified:             qt4-build.eclass
  Log:
  remove the fbsd special case for reduce-relocations now that the spec fix has reached qt 4.5.0

Revision  Changes    Path
1.28                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.27&r2=1.28

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- qt4-build.eclass	11 Mar 2009 23:58:31 -0000	1.27
+++ qt4-build.eclass	16 Mar 2009 08:21:18 -0000	1.28
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.27 2009/03/11 23:58:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.28 2009/03/16 08:21:18 aballier Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -226,8 +226,7 @@
 		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
 		-demosdir ${QTDEMOSDIR} -silent -fast
 		$([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions)
-		$(use x86-fbsd || echo -reduce-relocations)
-		-nomake examples -nomake demos"
+		-reduce-relocations -nomake examples -nomake demos"
 
 	echo "${myconf}"
 }

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

[Gordon Malm (gengor)]

gengor      09/03/28 00:21:13

  Modified:             qt4-build.eclass
  Log:
  Add fix for bug 253127 dropped in qt4-build.eclass revision 1.21

Revision  Changes    Path
1.29                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.28&r2=1.29

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- qt4-build.eclass	16 Mar 2009 08:21:18 -0000	1.28
+++ qt4-build.eclass	28 Mar 2009 00:21:13 -0000	1.29
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.28 2009/03/16 08:21:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.29 2009/03/28 00:21:13 gengor Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -135,7 +135,6 @@
 		replace-flags -O3 -O2
 	fi
 
-	# Bug 253127
 	# Unsupported old gcc versions - hardened needs this :(
 	if [[ $(gcc-major-version) -lt "4" ]] ; then
 		ewarn "Appending -fno-stack-protector to CXXFLAGS"
@@ -148,6 +147,12 @@
 		append-flags -fno-gcse
 	fi
 
+	# Bug 253127
+	if [[ $(gcc-major-version) -lt "4" ]] ; then
+		sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
+		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
+	fi
+
 	# Bug 172219
 	sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \

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

[Gordon Malm (gengor)]

gengor      09/03/28 00:33:33

  Modified:             qt4-build.eclass
  Log:
  Refactor gcc-3 stack-protector filtering a bit more

Revision  Changes    Path
1.30                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.29&r2=1.30

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- qt4-build.eclass	28 Mar 2009 00:21:13 -0000	1.29
+++ qt4-build.eclass	28 Mar 2009 00:33:33 -0000	1.30
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.29 2009/03/28 00:21:13 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.30 2009/03/28 00:33:33 gengor Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -135,20 +135,17 @@
 		replace-flags -O3 -O2
 	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
-	fi
-
 	# Bug 178652
 	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
 		append-flags -fno-gcse
 	fi
 
-	# Bug 253127
+	# 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 "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
 	fi

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

[Gordon Malm (gengor)]

gengor      09/03/28 02:29:25

  Modified:             qt4-build.eclass
  Log:
  Five beeps is excessively annoying and slow

Revision  Changes    Path
1.31                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.30&r2=1.31

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- qt4-build.eclass	28 Mar 2009 00:33:33 -0000	1.30
+++ qt4-build.eclass	28 Mar 2009 02:29:24 -0000	1.31
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.30 2009/03/28 00:33:33 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.31 2009/03/28 02:29:24 gengor Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -76,7 +76,7 @@
 	if ! version_is_at_least 4.1 $(gcc-version) ; then
 		ewarn "Using a GCC version lower than 4.1 is not supported!"
 		echo
-		ebeep 5
+		ebeep 3
 	fi
 
 	if use custom-cxxflags; then

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

[Markos Chandras (hwoarang)]

hwoarang    09/04/23 11:45:39

  Modified:             qt4-build.eclass
  Log:
  Make eclass 4.5.{1,2} ready

Revision  Changes    Path
1.32                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.31&r2=1.32

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- qt4-build.eclass	28 Mar 2009 02:29:24 -0000	1.31
+++ qt4-build.eclass	23 Apr 2009 11:45:38 -0000	1.32
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.31 2009/03/28 02:29:24 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.32 2009/04/23 11:45:38 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -52,7 +52,6 @@
 		# Check USE requirements
 		qt4-build_check_use
 	fi
-
 	# Set up installation directories
 	QTBASEDIR=/usr/$(get_libdir)/qt4
 	QTPREFIXDIR=/usr
@@ -229,6 +228,13 @@
 		-demosdir ${QTDEMOSDIR} -silent -fast
 		$([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions)
 		-reduce-relocations -nomake examples -nomake demos"
+	
+	# Make eclass 4.5.{1,2} ready
+	case "${MY_PV}" in
+		4.5.1 | 4.5.2)
+			myconf="${myconf} -opensource"
+			;;
+	esac
 
 	echo "${myconf}"
 }

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

[Markos Chandras (hwoarang)]

hwoarang    09/05/12 14:21:22

  Modified:             qt4-build.eclass
  Log:
  Might fix bug 261412

Revision  Changes    Path
1.33                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.32&r2=1.33

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- qt4-build.eclass	23 Apr 2009 11:45:38 -0000	1.32
+++ qt4-build.eclass	12 May 2009 14:21:22 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.32 2009/04/23 11:45:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.33 2009/05/12 14:21:22 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -220,6 +220,11 @@
 		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 
+	# Bug 261412 Qt configure detects archs by uname
+	case "$(tc-arch)" in
+		ppc) myconf="${myconf} -platform linux-g++-32";;
+	esac
+
 	myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath
 		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
 		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}

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

[Markos Chandras (hwoarang)]

hwoarang    09/05/23 01:08:26

  Modified:             qt4-build.eclass
  Log:
  I forgot to remove a temporary workaround

Revision  Changes    Path
1.35                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.34&r2=1.35

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- qt4-build.eclass	22 May 2009 22:21:38 -0000	1.34
+++ qt4-build.eclass	23 May 2009 01:08:26 -0000	1.35
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.34 2009/05/22 22:21:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.35 2009/05/23 01:08:26 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -274,13 +274,6 @@
 			;;
 	esac
 
-	# bug 270475
-	case "${MY_PV}" in
-		4.5.1 | 4.5.2)
-		myconf="${myconf} -platform $(qt_mkspecs_dir)"
-		;;
-	esac
-
 	echo "${myconf}"
 }
 

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

[Markos Chandras (hwoarang)]

hwoarang    09/05/29 14:48:00

  Modified:             qt4-build.eclass
  Log:
  Make qt-modules be on the same version. Thanks to Alex 'wired' Alexander

Revision  Changes    Path
1.36                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.35&r2=1.36

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- qt4-build.eclass	23 May 2009 01:08:26 -0000	1.35
+++ qt4-build.eclass	29 May 2009 14:48:00 -0000	1.36
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.35 2009/05/23 01:08:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.36 2009/05/29 14:48:00 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -14,7 +14,36 @@
 inherit eutils multilib toolchain-funcs flag-o-matic versionator
 
 IUSE="${IUSE} custom-cxxflags debug pch"
-
+RDEPEND="
+	!<x11-libs/qt-assistant-${PV}
+	!>x11-libs/qt-assistant-${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-demo-${PV}
+	!>x11-libs/qt-demo-${PV}-r9999
+	!<x11-libs/qt-gui-${PV}
+	!>x11-libs/qt-gui-${PV}-r9999
+	!<x11-libs/qt-opengl-${PV}
+	!>x11-libs/qt-opengl-${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
+"
 case "${PV}" in
 	4.?.?_rc*)
 		SRCTYPE="${SRCTYPE:-opensource-src}"

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

[Markos Chandras (hwoarang)]

hwoarang    09/05/29 20:58:54

  Modified:             qt4-build.eclass
  Log:
  Use autopatcher from base eclass

Revision  Changes    Path
1.37                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.36&r2=1.37

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- qt4-build.eclass	29 May 2009 14:48:00 -0000	1.36
+++ qt4-build.eclass	29 May 2009 20:58:54 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.36 2009/05/29 14:48:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.37 2009/05/29 20:58:54 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -11,7 +11,7 @@
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt4
 
-inherit eutils multilib toolchain-funcs flag-o-matic versionator
+inherit base eutils multilib toolchain-funcs flag-o-matic versionator
 
 IUSE="${IUSE} custom-cxxflags debug pch"
 RDEPEND="
@@ -164,6 +164,14 @@
 	fi
 }
 
+# @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:
+# PATCHES="${FILESDIR}"/mypatch.patch
+#   ${FILESDIR}"/mypatch2.patch"
+#
 
 # @FUNCTION: qt4-build_src_prepare
 # @DESCRIPTION:
@@ -210,7 +218,8 @@
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
-
+	
+	base_src_prepare
 }
 
 # @FUNCTION: qt4-build_src_configure

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

[Markos Chandras (hwoarang)]

hwoarang    09/06/06 22:43:28

  Modified:             qt4-build.eclass
  Log:
  Added -platform parameter on configure. Fixes bug 270475

Revision  Changes    Path
1.38                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.37&r2=1.38

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- qt4-build.eclass	29 May 2009 20:58:54 -0000	1.37
+++ qt4-build.eclass	6 Jun 2009 22:43:27 -0000	1.38
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.37 2009/05/29 20:58:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.38 2009/06/06 22:43:27 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -291,12 +291,7 @@
 		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 
-	# Bug 261412 Qt configure detects archs by uname
-	case "$(tc-arch)" in
-		ppc) myconf="${myconf} -platform linux-g++-32";;
-	esac
-
-	myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath
+	myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license -no-rpath
 		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
 		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
 		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}

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

[Ben de Groot (yngwin)]

yngwin      09/06/27 12:37:32

  Modified:             qt4-build.eclass
  Log:
  Slight adjustment in SRC_URI for qtsoftware.com

Revision  Changes    Path
1.39                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.38&r2=1.39

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- qt4-build.eclass	6 Jun 2009 22:43:27 -0000	1.38
+++ qt4-build.eclass	27 Jun 2009 12:37:32 -0000	1.39
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.38 2009/06/06 22:43:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.39 2009/06/27 12:37:32 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -58,7 +58,7 @@
 S=${WORKDIR}/${MY_P}
 
 HOMEPAGE="http://www.qtsoftware.com/"
-SRC_URI="http://download.qtsoftware.com/qt/source/${MY_P}.tar.bz2"
+SRC_URI="http://get.qtsoftware.com/qt/source/${MY_P}.tar.bz2"
 
 case "${PV}" in
 	4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;;
@@ -218,7 +218,7 @@
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
-	
+
 	base_src_prepare
 }
 
@@ -299,7 +299,7 @@
 		-demosdir ${QTDEMOSDIR} -silent -fast
 		$([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions)
 		-reduce-relocations -nomake examples -nomake demos"
-	
+
 	# Make eclass 4.5.{1,2} ready
 	case "${MY_PV}" in
 		4.5.1 | 4.5.2)
@@ -513,7 +513,7 @@
 
 # @FUNCTION: qt_use
 # @USAGE: < flag > [ feature ] [ enableval ]
-# @DESCRIPTION:	
+# @DESCRIPTION:
 # 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
@@ -605,7 +605,7 @@
 
 # @FUNCTION: qt_mkspecs_dir
 # @RETURN: the specs-directory w/o path
-# @DESCRIPTION:	
+# @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.

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

[Ben de Groot (yngwin)]

yngwin      09/06/27 18:55:02

  Modified:             qt4-build.eclass
  Log:
  Remove custom-cxxflags from qt4-build.eclass

Revision  Changes    Path
1.40                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.39&r2=1.40

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- qt4-build.eclass	27 Jun 2009 12:37:32 -0000	1.39
+++ qt4-build.eclass	27 Jun 2009 18:55:02 -0000	1.40
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.39 2009/06/27 12:37:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.40 2009/06/27 18:55:02 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -13,7 +13,7 @@
 
 inherit base eutils multilib toolchain-funcs flag-o-matic versionator
 
-IUSE="${IUSE} custom-cxxflags debug pch"
+IUSE="${IUSE} debug pch"
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
 	!>x11-libs/qt-assistant-${PV}-r9999
@@ -109,17 +109,6 @@
 		echo
 		ebeep 3
 	fi
-
-	if use custom-cxxflags; then
-		echo
-		ewarn "You have set USE=custom-cxxflags, which means Qt will be built with the"
-		ewarn "CXXFLAGS you have set in /etc/make.conf. This is not supported, and we"
-		ewarn "recommend to unset this useflag. But you are free to experiment with it."
-		ewarn "Just do not start crying if it breaks your system, or eats your kitten"
-		ewarn "for breakfast. ;-) "
-		echo
-	fi
-
 }
 
 # @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
@@ -186,12 +175,6 @@
 		symlink_binaries_to_buildtree
 	fi
 
-	if ! use custom-cxxflags;then
-		# Don't let the user go too overboard with flags.
-		strip-flags
-		replace-flags -O3 -O2
-	fi
-
 	# Bug 178652
 	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"

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

[Markos Chandras (hwoarang)]

hwoarang    09/06/28 15:24:42

  Modified:             qt4-build.eclass
  Log:
  Do not hardcode Qt version on display message

Revision  Changes    Path
1.41                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.40&r2=1.41

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- qt4-build.eclass	27 Jun 2009 18:55:02 -0000	1.40
+++ qt4-build.eclass	28 Jun 2009 15:24:42 -0000	1.41
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.40 2009/06/27 18:55:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.41 2009/06/28 15:24:42 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -436,7 +436,7 @@
 	ewarn "make sure all your Qt4 packages are up-to-date and built with the same"
 	ewarn "configuration."
 	ewarn
-	ewarn "For more information, see http://doc.trolltech.com/4.4/plugins-howto.html"
+	ewarn "For more information, see http://doc.trolltech.com/${PV%.*}/plugins-howto.html"
 	echo
 }
 

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

[Markos Chandras (hwoarang)]

hwoarang    09/07/13 19:55:30

  Modified:             qt4-build.eclass
  Log:
  Apply patch to support multilib portage.Thanks to Tommy[D]

Revision  Changes    Path
1.42                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.41&r2=1.42

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- qt4-build.eclass	28 Jun 2009 15:24:42 -0000	1.41
+++ qt4-build.eclass	13 Jul 2009 19:55:30 -0000	1.42
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.41 2009/06/28 15:24:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.42 2009/07/13 19:55:30 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -84,22 +84,6 @@
 		# Check USE requirements
 		qt4-build_check_use
 	fi
-	# Set up installation directories
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=/usr
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTPCDIR=/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=/usr/share/qt4
-	QTDOCDIR=/usr/share/doc/qt-${PV}
-	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTDEMOSDIR=${QTDATADIR}/demos
-
-	PLATFORM=$(qt_mkspecs_dir)
 
 	PATH="${S}/bin:${PATH}"
 	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
@@ -125,6 +109,7 @@
 # @DESCRIPTION:
 # Unpacks the sources
 qt4-build_src_unpack() {
+	setqtenv
 	local target targets licenses
 	if version_is_at_least 4.5 ${PV} ; then
 		licenses="LICENSE.GPL3 LICENSE.LGPL"
@@ -167,6 +152,7 @@
 # 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.
 qt4-build_src_prepare() {
+	setqtenv
 	cd "${S}"
 
 	if [[ ${PN} != qt-core ]]; then
@@ -209,7 +195,7 @@
 # @DESCRIPTION:
 # Default configure phase
 qt4-build_src_configure() {
-
+	setqtenv
 	myconf="$(standard_configure_options) ${myconf}"
 
 	echo ./configure ${myconf}
@@ -219,6 +205,7 @@
 # @FUNCTION: qt4-build_src_compile
 # @DESCRIPTION: Actual compile phase
 qt4-build_src_compile() {
+	setqtenv
 	# Be backwards compatible for now
 	if [[ $EAPI != 2 ]]; then
 		qt4-build_src_configure
@@ -231,11 +218,35 @@
 # @DESCRIPTION:
 # Perform the actual installation including some library fixes.
 qt4-build_src_install() {
+	setqtenv
 	install_directories "${QT4_TARGET_DIRECTORIES}"
 	install_qconfigs
 	fix_library_files
 }
 
+# @FUNCTION: setqtenv
+setqtenv() {
+	# Set up installation directories
+	QTBASEDIR=/usr/$(get_libdir)/qt4
+	QTPREFIXDIR=/usr
+	QTBINDIR=/usr/bin
+	QTLIBDIR=/usr/$(get_libdir)/qt4
+	QMAKE_LIBDIR_QT=${QTLIBDIR}
+	QTPCDIR=/usr/$(get_libdir)/pkgconfig
+	QTDATADIR=/usr/share/qt4
+	QTDOCDIR=/usr/share/doc/qt-${PV}
+	QTHEADERDIR=/usr/include/qt4
+	QTPLUGINDIR=${QTLIBDIR}/plugins
+	QTSYSCONFDIR=/etc/qt4
+	QTTRANSDIR=${QTDATADIR}/translations
+	QTEXAMPLESDIR=${QTDATADIR}/examples
+	QTDEMOSDIR=${QTDATADIR}/demos
+	QT_INSTALL_PREFIX=/usr/$(get_libdir)/qt4
+	PLATFORM=$(qt_mkspecs_dir)
+
+	unset QMAKESPEC
+}
+
 # @FUNCTION: standard_configure_options
 # @DESCRIPTION:
 # Sets up some standard configure options, like libdir (if necessary), whether
@@ -301,6 +312,7 @@
 	local dirs="$@"
 	for x in ${dirs}; do
 		cd "${S}"/${x}
+		sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
 		emake || die "emake failed"
 	done
@@ -617,6 +629,9 @@
 	else
 		die "Unknown compiler ${CXX}."
 	fi
+	if [[ -n "${LIBDIR/lib}" ]]; then
+		spec="${spec}-${LIBDIR/lib}"
+	fi
 
 	echo "${spec}"
 }

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

[Thomas Sachau (tommy)]

tommy       09/07/31 22:18:31

  Modified:             qt4-build.eclass
  Log:
  Fix building with multilib environment in qt4-build.eclass with ok from yngwin for the qt herd

Revision  Changes    Path
1.43                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.42&r2=1.43

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- qt4-build.eclass	13 Jul 2009 19:55:30 -0000	1.42
+++ qt4-build.eclass	31 Jul 2009 22:18:31 -0000	1.43
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.42 2009/07/13 19:55:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.43 2009/07/31 22:18:31 tommy Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -200,6 +200,7 @@
 
 	echo ./configure ${myconf}
 	./configure ${myconf} || die "./configure failed"
+	myconf=""
 }
 
 # @FUNCTION: qt4-build_src_compile

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

[Markos Chandras (hwoarang)]

hwoarang    09/08/11 14:44:16

  Modified:             qt4-build.eclass
  Log:
  Update Homepage and SRC_URI links

Revision  Changes    Path
1.44                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.43&r2=1.44

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- qt4-build.eclass	31 Jul 2009 22:18:31 -0000	1.43
+++ qt4-build.eclass	11 Aug 2009 14:44:16 -0000	1.44
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.43 2009/07/31 22:18:31 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.44 2009/08/11 14:44:16 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -57,8 +57,8 @@
 MY_P=qt-x11-${SRCTYPE}-${MY_PV}
 S=${WORKDIR}/${MY_P}
 
-HOMEPAGE="http://www.qtsoftware.com/"
-SRC_URI="http://get.qtsoftware.com/qt/source/${MY_P}.tar.bz2"
+HOMEPAGE="http://qt.nokia.com/"
+SRC_URI="http://download.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
 
 case "${PV}" in
 	4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;;

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

[Dominik Kapusta (ayoy)]

ayoy        09/10/02 15:04:23

  Modified:             qt4-build.eclass
  Log:
  Switching to gzip packages like Nokia does starting from 4.5.3

Revision  Changes    Path
1.45                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.44&r2=1.45

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qt4-build.eclass	11 Aug 2009 14:44:16 -0000	1.44
+++ qt4-build.eclass	2 Oct 2009 15:04:23 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.44 2009/08/11 14:44:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.45 2009/10/02 15:04:23 ayoy Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -58,7 +58,10 @@
 S=${WORKDIR}/${MY_P}
 
 HOMEPAGE="http://qt.nokia.com/"
-SRC_URI="http://download.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
+SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
+if version_is_at_least 4.5.3 ${PV} ; then
+	SRC_URI="${SRC_URI/bz2/gz}"
+fi
 
 case "${PV}" in
 	4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;;
@@ -110,7 +113,7 @@
 # Unpacks the sources
 qt4-build_src_unpack() {
 	setqtenv
-	local target targets licenses
+	local target targets licenses tar_pkg tar_args
 	if version_is_at_least 4.5 ${PV} ; then
 		licenses="LICENSE.GPL3 LICENSE.LGPL"
 	else
@@ -122,8 +125,15 @@
 			targets="${targets} ${MY_P}/${target}"
 	done
 
-	echo tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
-	tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
+	tar_pkg=${MY_P}.tar.bz2
+	tar_args="xjpf"
+	if version_is_at_least 4.5.3 ${PV} ; then
+		tar_pkg=${tar_pkg/bz2/gz}
+		tar_args="xzpf"
+	fi
+
+	echo tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
+	tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
 
 	case "${PV}" in
 		4.4.?)

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

[Alex Alexander (wired)]

wired       09/10/02 16:39:41

  Modified:             qt4-build.eclass
  Log:
  qt4-build.eclass 4.5.3 support

Revision  Changes    Path
1.46                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.45&r2=1.46

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- qt4-build.eclass	2 Oct 2009 15:04:23 -0000	1.45
+++ qt4-build.eclass	2 Oct 2009 16:39:41 -0000	1.46
@@ -1,12 +1,13 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.45 2009/10/02 15:04:23 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.46 2009/10/02 16:39:41 wired 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>
 # @BLURB: Eclass for Qt4 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt4
@@ -305,9 +306,9 @@
 		$([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions)
 		-reduce-relocations -nomake examples -nomake demos"
 
-	# Make eclass 4.5.{1,2} ready
+	# Make eclass 4.5.x ready
 	case "${MY_PV}" in
-		4.5.1 | 4.5.2)
+		4.5.?)
 			myconf="${myconf} -opensource"
 			;;
 	esac

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

[Dominik Kapusta (ayoy)]

ayoy        09/10/03 19:29:04

  Modified:             qt4-build.eclass
  Log:
  Trying to fix bug #282984 in a clean way. Passing system compilers to emake in build_directories()

Revision  Changes    Path
1.47                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.46&r2=1.47

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- qt4-build.eclass	2 Oct 2009 16:39:41 -0000	1.46
+++ qt4-build.eclass	3 Oct 2009 19:29:04 -0000	1.47
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.46 2009/10/02 16:39:41 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.47 2009/10/03 19:29:04 ayoy Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -326,7 +326,9 @@
 		cd "${S}"/${x}
 		sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
-		emake || die "emake failed"
+		emake CC="@echo compiling \$< && $(tc-getCC)" \
+			CXX="@echo compiling \$< && $(tc-getCXX)" \
+			LINK="@echo linking \$@ && $(tc-getCXX)" || die "emake failed"
 	done
 }
 

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

[Alex Alexander (wired)]

wired       09/10/16 15:02:16

  Modified:             qt4-build.eclass
  Log:
  getting ready for Qt 4.6

Revision  Changes    Path
1.48                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.47&r2=1.48

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- qt4-build.eclass	3 Oct 2009 19:29:04 -0000	1.47
+++ qt4-build.eclass	16 Oct 2009 15:02:15 -0000	1.48
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.47 2009/10/03 19:29:04 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.48 2009/10/16 15:02:15 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -46,22 +46,28 @@
 	!>x11-libs/qt-xmlpatterns-${PV}-r9999
 "
 case "${PV}" in
-	4.?.?_rc*)
+	4.?.?_rc* | 4.?.?_beta* )
 		SRCTYPE="${SRCTYPE:-opensource-src}"
-		MY_PV="${PV/_rc/-rc}"
+		MY_PV="${PV/_/-}"
 		;;
 	*)
 		SRCTYPE="${SRCTYPE:-opensource-src}"
 		MY_PV="${PV}"
 		;;
 esac
-MY_P=qt-x11-${SRCTYPE}-${MY_PV}
+
+if version_is_at_least 4.5.99999999 ${PV} ; then
+	MY_P="qt-everywhere-${SRCTYPE}-${MY_PV}"
+else
+	MY_P="qt-x11-${SRCTYPE}-${MY_PV}"
+fi
 S=${WORKDIR}/${MY_P}
 
 HOMEPAGE="http://qt.nokia.com/"
-SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
 if version_is_at_least 4.5.3 ${PV} ; then
-	SRC_URI="${SRC_URI/bz2/gz}"
+	SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
+else
+	SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
 fi
 
 case "${PV}" in
@@ -297,18 +303,31 @@
 		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 
+	# 4.6: build qt-core with exceptions or qt-xmlpatterns won't build
+	local exceptions=
+	case "${PV}" in
+		4.6.*)
+			if [[ ${PN} != "qt-core" ]] && [[ ${PN} != "qt-xmlpatterns" ]]; then
+				exceptions="-no-exceptions"
+			fi
+		;;
+		*)
+			[[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
+		;;
+	esac
+
 	myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license -no-rpath
 		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
 		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
 		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
 		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
 		-demosdir ${QTDEMOSDIR} -silent -fast
-		$([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions)
+		${exceptions}
 		-reduce-relocations -nomake examples -nomake demos"
 
-	# Make eclass 4.5.x ready
+	# Make eclass >= 4.5.x ready
 	case "${MY_PV}" in
-		4.5.?)
+		4.5.* | 4.6.* )
 			myconf="${myconf} -opensource"
 			;;
 	esac

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

[Dominik Kapusta (ayoy)]

ayoy        09/11/09 19:30:41

  Modified:             qt4-build.eclass
  Log:
  Append -mminimal-toc for qt ebuilds on ppc64 - bug #261632

Revision  Changes    Path
1.49                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.48&r2=1.49

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- qt4-build.eclass	16 Oct 2009 15:02:15 -0000	1.48
+++ qt4-build.eclass	9 Nov 2009 19:30:40 -0000	1.49
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.48 2009/10/16 15:02:15 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.49 2009/11/09 19:30:40 ayoy Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -193,6 +193,12 @@
 		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
 	fi
 
+	# Bug 261632
+	if use ppc64; then
+		ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
+		append-flags -mminimal-toc
+	fi
+
 	# Bug 172219
 	sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \

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

[Dominik Kapusta (ayoy)]

ayoy        09/11/09 19:35:44

  Modified:             qt4-build.eclass
  Log:
  Fix cross-compilation with distcc for qt ebuilds - bug #282984

Revision  Changes    Path
1.50                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.49&r2=1.50

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- qt4-build.eclass	9 Nov 2009 19:30:40 -0000	1.49
+++ qt4-build.eclass	9 Nov 2009 19:35:44 -0000	1.50
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.49 2009/11/09 19:30:40 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.50 2009/11/09 19:35:44 ayoy Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -178,6 +178,12 @@
 		symlink_binaries_to_buildtree
 	fi
 
+	# Bug 282984
+	sed -e "s/\(^SYSTEM_VARIABLES\)/CC=$(tc-getCC)\nCXX=$(tc-getCXX)\n\1/" \
+		-i configure || die "sed qmake compilers failed"
+	sed -e "s/\(\$MAKE\)/\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX)/" \
+		-i config.tests/unix/compile.test || die "sed test compilers failed"
+
 	# Bug 178652
 	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"

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

[Alex Alexander (wired)]

wired       09/11/18 22:12:47

  Modified:             qt4-build.eclass
  Log:
  added ewarn about 4.6 beta->rc binary compatibility breakage

Revision  Changes    Path
1.52                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.51&r2=1.52

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- qt4-build.eclass	10 Nov 2009 00:56:29 -0000	1.51
+++ qt4-build.eclass	18 Nov 2009 22:12:47 -0000	1.52
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.51 2009/11/10 00:56:29 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.52 2009/11/18 22:12:47 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -103,6 +103,23 @@
 		echo
 		ebeep 3
 	fi
+
+	if [[ "${P}" == "qt-core-4.6.0_rc1" ]]; then
+		ewarn
+		ewarn "Binary compatibility broke between 4.6.0_beta1 and 4.6.0_rc1."
+		ewarn "If you are upgrading from 4.6.0_beta1, you'll have to"
+		ewarn "re-emerge everything that depends on Qt."
+		ewarn "Use the following command:"
+		ewarn
+		ewarn "   emerge -av1 \$(for pkg in \$(equery -q d \\"
+		ewarn "   \$(qlist -IC x11-libs/qt-) | grep -v \"x11-libs/qt-\" |"
+		ewarn "   sort -u); do echo \"=\$pkg\"; done)"
+		ewarn 
+		ewarn "YOU'VE BEEN WARNED"
+		ewarn
+		ebeep 3
+	fi
+		
 }
 
 # @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
@@ -481,20 +498,23 @@
 # breakages and proposed solutions.
 qt4-build_pkg_postinst() {
 	generate_qconfigs
-	echo
-	ewarn "After a rebuild or upgrade of Qt, it can happen that Qt plugins (such as Qt"
-	ewarn "and KDE styles and widgets) can no longer be loaded. In this situation you"
-	ewarn "should recompile the packages providing these plugins. Also, make sure you"
-	ewarn "compile the Qt packages, and the packages that depend on it, with the same"
-	ewarn "GCC version and the same USE flag settings (especially the debug flag)."
-	ewarn
-	ewarn "Packages that typically need to be recompiled are kdelibs from KDE4, any"
-	ewarn "additional KDE4/Qt4 styles, qscintilla and PyQt4. Before filing a bug report,"
-	ewarn "make sure all your Qt4 packages are up-to-date and built with the same"
-	ewarn "configuration."
-	ewarn
-	ewarn "For more information, see http://doc.trolltech.com/${PV%.*}/plugins-howto.html"
-	echo
+
+	if [[ "${PN}" == "qt-core" ]]; then
+		echo
+		ewarn "After a rebuild or upgrade of Qt, it can happen that Qt plugins (such as Qt"
+		ewarn "and KDE styles and widgets) can no longer be loaded. In this situation you"
+		ewarn "should recompile the packages providing these plugins. Also, make sure you"
+		ewarn "compile the Qt packages, and the packages that depend on it, with the same"
+		ewarn "GCC version and the same USE flag settings (especially the debug flag)."
+		ewarn
+		ewarn "Packages that typically need to be recompiled are kdelibs from KDE4, any"
+		ewarn "additional KDE4/Qt4 styles, qscintilla and PyQt4. Before filing a bug report,"
+		ewarn "make sure all your Qt4 packages are up-to-date and built with the same"
+		ewarn "configuration."
+		ewarn
+		ewarn "For more information, see http://doc.trolltech.com/${PV%.*}/plugins-howto.html"
+		echo
+	fi
 }
 
 # @FUNCTION: skip_qmake_build_patch

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

[Ioannis Aslanidis (deathwing00)]

deathwing00    09/11/19 12:01:35

  Modified:             qt4-build.eclass
  Log:
  Added patch by Alex Alexander aka. 'Wired'.

Revision  Changes    Path
1.53                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.52&r2=1.53

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- qt4-build.eclass	18 Nov 2009 22:12:47 -0000	1.52
+++ qt4-build.eclass	19 Nov 2009 12:01:35 -0000	1.53
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.52 2009/11/18 22:12:47 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.53 2009/11/19 12:01:35 deathwing00 Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -111,9 +111,9 @@
 		ewarn "re-emerge everything that depends on Qt."
 		ewarn "Use the following command:"
 		ewarn
-		ewarn "   emerge -av1 \$(for pkg in \$(equery -q d \\"
-		ewarn "   \$(qlist -IC x11-libs/qt-) | grep -v \"x11-libs/qt-\" |"
-		ewarn "   sort -u); do echo \"=\$pkg\"; done)"
+		ewarn "   emerge -av1 \$(for i in \$(qlist -IC x11-libs/qt-);"
+		ewarn "   do equery -q d \$i | grep -v 'x11-libs/qt-' |"
+		ewarn "   sed \"s/^/=/\"; done)"
 		ewarn 
 		ewarn "YOU'VE BEEN WARNED"
 		ewarn

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

[Markos Chandras (hwoarang)]

hwoarang    09/12/06 09:34:36

  Modified:             qt4-build.eclass
  Log:
  Use ':' as delimiter. Fixes bug 295530

Revision  Changes    Path
1.54                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.53&r2=1.54

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- qt4-build.eclass	19 Nov 2009 12:01:35 -0000	1.53
+++ qt4-build.eclass	6 Dec 2009 09:34:36 -0000	1.54
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.53 2009/11/19 12:01:35 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.54 2009/12/06 09:34:36 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -195,10 +195,10 @@
 		symlink_binaries_to_buildtree
 	fi
 
-	# Bug 282984
-	sed -e "s/\(^SYSTEM_VARIABLES\)/CC=$(tc-getCC)\nCXX=$(tc-getCXX)\n\1/" \
+	# Bug 282984 && Bug 295530
+	sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\n\1:" \
 		-i configure || die "sed qmake compilers failed"
-	sed -e "s/\(\$MAKE\)/\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX)/" \
+	sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX):" \
 		-i config.tests/unix/compile.test || die "sed test compilers failed"
 
 	# Bug 178652

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

[Jonathan Callen (abcd)]

abcd        09/12/22 16:04:14

  Modified:             qt4-build.eclass
  Log:
  Remove cruft from qt4-build.eclass, in preparation for merging of prefix changes

Revision  Changes    Path
1.55                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.54&r2=1.55

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- qt4-build.eclass	6 Dec 2009 09:34:36 -0000	1.54
+++ qt4-build.eclass	22 Dec 2009 16:04:13 -0000	1.55
@@ -1,6 +1,6 @@
-# Copyright 2007-2009 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.54 2009/12/06 09:34:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.55 2009/12/22 16:04:13 abcd Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -14,7 +14,7 @@
 
 inherit base eutils multilib toolchain-funcs flag-o-matic versionator
 
-IUSE="${IUSE} debug pch"
+IUSE="debug pch"
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
 	!>x11-libs/qt-assistant-${PV}-r9999
@@ -45,66 +45,44 @@
 	!<x11-libs/qt-xmlpatterns-${PV}
 	!>x11-libs/qt-xmlpatterns-${PV}-r9999
 "
-case "${PV}" in
-	4.?.?_rc* | 4.?.?_beta* )
-		SRCTYPE="${SRCTYPE:-opensource-src}"
-		MY_PV="${PV/_/-}"
-		;;
-	*)
-		SRCTYPE="${SRCTYPE:-opensource-src}"
-		MY_PV="${PV}"
-		;;
-esac
+
+MY_PV=${PV/_/-}
 
 if version_is_at_least 4.5.99999999 ${PV} ; then
-	MY_P="qt-everywhere-${SRCTYPE}-${MY_PV}"
+	MY_P=qt-everywhere-opensource-src-${MY_PV}
 else
-	MY_P="qt-x11-${SRCTYPE}-${MY_PV}"
+	MY_P=qt-x11-opensource-src-${MY_PV}
 fi
+
 S=${WORKDIR}/${MY_P}
 
 HOMEPAGE="http://qt.nokia.com/"
-if version_is_at_least 4.5.3 ${PV} ; then
-	SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-else
-	SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
-fi
+SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
 
-case "${PV}" in
-	4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;;
-	*)     ;;
-esac
-
-if version_is_at_least 4.5 ${PV} ; then
-	LICENSE="|| ( LGPL-2.1 GPL-3 )"
-fi
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
 
 # @FUNCTION: qt4-build_pkg_setup
 # @DESCRIPTION:
-# Sets up installation directories, PLATFORM, PATH, and LD_LIBRARY_PATH
+# Sets up PATH and LD_LIBRARY_PATH
 qt4-build_pkg_setup() {
-	# EAPI=2 ebuilds set use-deps, others need this:
-	if [[ $EAPI != 2 ]]; then
-		# Make sure debug setting corresponds with qt-core (bug 258512)
-		if [[ $PN != "qt-core" ]]; then
-			use debug && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
-				~x11-libs/qt-core-${PV} debug"
-		fi
+	PATH="${S}/bin${PATH:+:}${PATH}"
+	LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
 
-		# Check USE requirements
-		qt4-build_check_use
+	# Make sure ebuilds use the required EAPI
+	if [[ ${EAPI} != 2 ]]; then
+		eerror "The qt4-build eclass requires EAPI=2, but this ebuild does not"
+		eerror "have EAPI=2 set. The ebuild author or editor failed. This ebuild needs"
+		eerror "to be fixed. Using qt4-build-edge eclass without EAPI=2 will fail."
+		die "qt4-build-edge eclass requires EAPI=2"
 	fi
 
-	PATH="${S}/bin:${PATH}"
-	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	if ! version_is_at_least 4.1 $(gcc-version) ; then
+	if ! version_is_at_least 4.1 $(gcc-version); then
 		ewarn "Using a GCC version lower than 4.1 is not supported!"
 		echo
 		ebeep 3
 	fi
 
-	if [[ "${P}" == "qt-core-4.6.0_rc1" ]]; then
+	if [[ ${P} == qt-core-4.6.0_rc1 ]]; then
 		ewarn
 		ewarn "Binary compatibility broke between 4.6.0_beta1 and 4.6.0_rc1."
 		ewarn "If you are upgrading from 4.6.0_beta1, you'll have to"
@@ -114,12 +92,12 @@
 		ewarn "   emerge -av1 \$(for i in \$(qlist -IC x11-libs/qt-);"
 		ewarn "   do equery -q d \$i | grep -v 'x11-libs/qt-' |"
 		ewarn "   sed \"s/^/=/\"; done)"
-		ewarn 
+		ewarn
 		ewarn "YOU'VE BEEN WARNED"
 		ewarn
 		ebeep 3
 	fi
-		
+
 }
 
 # @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
@@ -137,39 +115,15 @@
 # Unpacks the sources
 qt4-build_src_unpack() {
 	setqtenv
-	local target targets licenses tar_pkg tar_args
-	if version_is_at_least 4.5 ${PV} ; then
-		licenses="LICENSE.GPL3 LICENSE.LGPL"
-	else
-		licenses="LICENSE.GPL2 LICENSE.GPL3"
-	fi
-	for target in configure ${licenses} projects.pro \
+	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="${targets} ${MY_P}/${target}"
+			targets+=" ${MY_P}/${target}"
 	done
 
-	tar_pkg=${MY_P}.tar.bz2
-	tar_args="xjpf"
-	if version_is_at_least 4.5.3 ${PV} ; then
-		tar_pkg=${tar_pkg/bz2/gz}
-		tar_args="xzpf"
-	fi
-
-	echo tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
-	tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
-
-	case "${PV}" in
-		4.4.?)
-			echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
-			tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
-			;;
-	esac
-
-	# Be backwards compatible for now
-	if [[ $EAPI != 2 ]]; then
-		qt4-build_src_prepare
-	fi
+	echo tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
+	tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
 }
 
 # @ECLASS-VARIABLE: PATCHES
@@ -202,13 +156,13 @@
 		-i config.tests/unix/compile.test || die "sed test compilers failed"
 
 	# Bug 178652
-	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
+	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
 		append-flags -fno-gcse
 	fi
 
 	# Unsupported old gcc versions - hardened needs this :(
-	if [[ $(gcc-major-version) -lt "4" ]] ; then
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
 		ewarn "Appending -fno-stack-protector to CXXFLAGS"
 		append-cxxflags -fno-stack-protector
 		# Bug 253127
@@ -253,12 +207,8 @@
 # @DESCRIPTION: Actual compile phase
 qt4-build_src_compile() {
 	setqtenv
-	# Be backwards compatible for now
-	if [[ $EAPI != 2 ]]; then
-		qt4-build_src_configure
-	fi
 
-	build_directories "${QT4_TARGET_DIRECTORIES}"
+	build_directories ${QT4_TARGET_DIRECTORIES}
 }
 
 # @FUNCTION: qt4-build_src_install
@@ -266,7 +216,7 @@
 # Perform the actual installation including some library fixes.
 qt4-build_src_install() {
 	setqtenv
-	install_directories "${QT4_TARGET_DIRECTORIES}"
+	install_directories ${QT4_TARGET_DIRECTORIES}
 	install_qconfigs
 	fix_library_files
 }
@@ -299,36 +249,33 @@
 # Sets up some standard configure options, like libdir (if necessary), whether
 # debug info is wanted or not.
 standard_configure_options() {
-	local myconf=""
+	local myconf=
 
-	[[ $(get_libdir) != "lib" ]] && myconf="${myconf} -L/usr/$(get_libdir)"
+	[[ $(get_libdir) != lib ]] && myconf+=" -L/usr/$(get_libdir)"
 
 	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" -lt "4" ]]; then
-		myconf="${myconf} -no-reduce-exports"
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		myconf+=" -no-reduce-exports"
 	fi
 
 	# precompiled headers doesn't work on hardened, where the flag is masked.
-	if use pch; then
-		myconf="${myconf} -pch"
-	else
-		myconf="${myconf} -no-pch"
-	fi
+	myconf+=" $(qt_use pch)"
 
 	if use debug; then
-		myconf="${myconf} -debug -no-separate-debug-info"
+		myconf+=" -debug"
 	else
-		myconf="${myconf} -release -no-separate-debug-info"
+		myconf+=" -release"
 	fi
+	myconf+=" -no-separate-debug-info"
 
 	# 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) myconf="${myconf} -arch x86_64" ;;
-		ppc|ppc64) myconf="${myconf} -arch powerpc" ;;
-		x86|x86-*) myconf="${myconf} -arch i386" ;;
-		alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch $(tc-arch)" ;;
-		hppa|sh) myconf="${myconf} -arch generic" ;;
+		amd64) myconf+=" -arch x86_64" ;;
+		ppc|ppc64) myconf+=" -arch powerpc" ;;
+		x86|x86-*) myconf+=" -arch i386" ;;
+		alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
+		hppa|sh) myconf+=" -arch generic" ;;
 		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 
@@ -345,22 +292,15 @@
 		;;
 	esac
 
-	myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
+	myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
 		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
 		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
 		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
 		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
-		-demosdir ${QTDEMOSDIR} -silent -fast
+		-demosdir ${QTDEMOSDIR} -silent -fast -opensource
 		${exceptions}
 		-reduce-relocations -nomake examples -nomake demos"
 
-	# Make eclass >= 4.5.x ready
-	case "${MY_PV}" in
-		4.5.* | 4.6.* )
-			myconf="${myconf} -opensource"
-			;;
-	esac
-
 	echo "${myconf}"
 }
 
@@ -369,8 +309,7 @@
 # @DESCRIPTION:
 # Compiles the code in $QT4_TARGET_DIRECTORIES
 build_directories() {
-	local dirs="$@"
-	for x in ${dirs}; do
+	for x in "$@"; do
 		cd "${S}"/${x}
 		sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
@@ -385,8 +324,7 @@
 # @DESCRIPTION:
 # run emake install in the given directories, which are separated by spaces
 install_directories() {
-	local dirs="$@"
-	for x in ${dirs}; do
+	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}"
 		emake INSTALL_ROOT="${D}" install || die "emake install failed"
 		popd >/dev/null || die "Can't popd from ${S}/${x}"
@@ -396,17 +334,17 @@
 # @ECLASS-VARIABLE: QCONFIG_ADD
 # @DESCRIPTION:
 # List options that need to be added to QT_CONFIG in qconfig.pri
-QCONFIG_ADD="${QCONFIG_ADD:-}"
+: ${QCONFIG_ADD:=}
 
 # @ECLASS-VARIABLE: QCONFIG_REMOVE
 # @DESCRIPTION:
 # List options that need to be removed from QT_CONFIG in qconfig.pri
-QCONFIG_REMOVE="${QCONFIG_REMOVE:-}"
+: ${QCONFIG_REMOVE:=}
 
 # @ECLASS-VARIABLE: QCONFIG_DEFINE
 # @DESCRIPTION:
 # List variables that should be defined at the top of QtCore/qconfig.h
-QCONFIG_DEFINE="${QCONFIG_DEFINE:-}"
+: ${QCONFIG_DEFINE:=}
 
 # @FUNCTION: install_qconfigs
 # @DESCRIPTION: Install gentoo-specific mkspecs configurations
@@ -436,8 +374,8 @@
 		local x qconfig_add qconfig_remove qconfig_new
 		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
 			[[ -f ${x} ]] || continue
-			qconfig_add="${qconfig_add} $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
-			qconfig_remove="${qconfig_remove} $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
+			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
+			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
 		done
 
 		# these error checks do not use die because dying in pkg_post{inst,rm}
@@ -454,7 +392,7 @@
 			# including qconfig_add and excluding qconfig_remove
 			for x in $(sed -n 's/^QT_CONFIG +=//p' \
 				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
-					hasq ${x} ${qconfig_remove} || qconfig_new="${qconfig_new} ${x}"
+					hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
 			done
 
 			# replace the existing QT_CONFIG list with qconfig_new
@@ -560,7 +498,7 @@
 		if [[ -e ${libfile} ]]; then
 			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
 
-	# Move .pc files into the pkgconfig directory
+		# Move .pc files into the pkgconfig directory
 		dodir ${QTPCDIR}
 		mv ${libfile} "${D}"/${QTPCDIR}/ \
 			|| die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
@@ -579,12 +517,12 @@
 # will be used for that. If [enableval] is not specified, it omits the
 # assignment-part
 qt_use() {
-	local flag="${1}"
-	local feature="${1}"
+	local flag=$1
+	local feature=$1
 	local enableval=
 
-	[[ -n ${2} ]] && feature=${2}
-	[[ -n ${3} ]] && enableval="-${3}"
+	[[ -n $2 ]] && feature=$2
+	[[ -n $3 ]] && enableval=-$3
 
 	if use ${flag}; then
 		echo "${enableval}-${feature}"
@@ -593,76 +531,6 @@
 	fi
 }
 
-# @ECLASS-VARIABLE: QT4_BUILT_WITH_USE_CHECK
-# @DESCRIPTION:
-# The contents of $QT4_BUILT_WITH_USE_CHECK gets fed to built_with_use
-# (eutils.eclass), line per line.
-#
-# Example:
-# @CODE
-# pkg_setup() {
-# 	use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
-# 		~x11-libs/qt-gui-${PV} qt3support"
-# 	qt4-build_check_use
-# }
-# @CODE
-
-# Run built_with_use on each flag and print appropriate error messages if any
-# flags are missing
-
-_qt_built_with_use() {
-	local missing opt pkg flag flags
-
-	if [[ ${1} = "--missing" ]]; then
-		missing="${1} ${2}" && shift 2
-	fi
-	if [[ ${1:0:1} = "-" ]]; then
-		opt=${1} && shift
-	fi
-
-	pkg=${1} && shift
-
-	for flag in "${@}"; do
-		flags="${flags} ${flag}"
-		if ! built_with_use ${missing} ${opt} ${pkg} ${flag}; then
-			flags="${flags}*"
-		else
-			[[ ${opt} = "-o" ]] && return 0
-		fi
-	done
-	if [[ "${flags# }" = "${@}" ]]; then
-		return 0
-	fi
-	if [[ ${opt} = "-o" ]]; then
-		eerror "This package requires '${pkg}' to be built with any of the following USE flags: '$*'."
-	else
-		eerror "This package requires '${pkg}' to be built with the following USE flags: '${flags# }'."
-	fi
-	return 1
-}
-
-# @FUNCTION: qt4-build_check_use
-# @DESCRIPTION:
-# Check if the listed packages in $QT4_BUILT_WITH_USE_CHECK are built with the
-# USE flags listed.
-#
-# If any of the required USE flags are missing, an eerror will be printed for
-# each package with missing USE flags.
-qt4-build_check_use() {
-	local line missing
-	while read line; do
-		[[ -z ${line} ]] && continue
-		if ! _qt_built_with_use ${line}; then
-			missing=true
-		fi
-	done <<< "${QT4_BUILT_WITH_USE_CHECK}"
-	if [[ -n ${missing} ]]; then
-		echo
-		eerror "Flags marked with an * are missing."
-		die "Missing USE flags found"
-	fi
-}
-
 # @FUNCTION: qt_mkspecs_dir
 # @RETURN: the specs-directory w/o path
 # @DESCRIPTION:
@@ -673,35 +541,32 @@
 
 	case ${CHOST} in
 		*-freebsd*|*-dragonfly*)
-			spec="freebsd" ;;
+			spec=freebsd ;;
 		*-openbsd*)
-			spec="openbsd" ;;
+			spec=openbsd ;;
 		*-netbsd*)
-			spec="netbsd" ;;
+			spec=netbsd ;;
 		*-darwin*)
-			spec="darwin" ;;
+			spec=darwin ;;
 		*-linux-*|*-linux)
-			spec="linux" ;;
+			spec=linux ;;
 		*)
 			die "Unknown CHOST, no platform choosen."
 	esac
 
 	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		spec="${spec}-g++"
-	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-		spec="${spec}-icc"
+	if [[ ${CXX} == *g++* ]]; then
+		spec+=-g++
+	elif [[ ${CXX} == *icpc* ]]; then
+		spec+=-icc
 	else
 		die "Unknown compiler ${CXX}."
 	fi
-	if [[ -n "${LIBDIR/lib}" ]]; then
-		spec="${spec}-${LIBDIR/lib}"
+	if [[ -n ${LIBDIR/lib} ]]; then
+		spec+=-${LIBDIR/lib}
 	fi
 
 	echo "${spec}"
 }
 
-case ${EAPI:-0} in
-	0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postrm pkg_postinst ;;
-	2) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_postrm pkg_postinst ;;
-esac
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_postrm pkg_postinst

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

[Jonathan Callen (abcd)]

abcd        09/12/22 17:04:08

  Modified:             qt4-build.eclass
  Log:
  Fix typo (qt4-build-edge -> qt4-build)

Revision  Changes    Path
1.56                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.55&r2=1.56

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- qt4-build.eclass	22 Dec 2009 16:04:13 -0000	1.55
+++ qt4-build.eclass	22 Dec 2009 17:04:07 -0000	1.56
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.55 2009/12/22 16:04:13 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.56 2009/12/22 17:04:07 abcd Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -72,8 +72,8 @@
 	if [[ ${EAPI} != 2 ]]; then
 		eerror "The qt4-build eclass requires EAPI=2, but this ebuild does not"
 		eerror "have EAPI=2 set. The ebuild author or editor failed. This ebuild needs"
-		eerror "to be fixed. Using qt4-build-edge eclass without EAPI=2 will fail."
-		die "qt4-build-edge eclass requires EAPI=2"
+		eerror "to be fixed. Using qt4-build eclass without EAPI=2 will fail."
+		die "qt4-build eclass requires EAPI=2"
 	fi
 
 	if ! version_is_at_least 4.1 $(gcc-version); then

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

[Jonathan Callen (abcd)]

abcd        09/12/24 21:40:24

  Modified:             qt4-build.eclass
  Log:
  Apply changes for prefix to qt4-build.eclass

Revision  Changes    Path
1.57                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.56&r2=1.57

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- qt4-build.eclass	22 Dec 2009 17:04:07 -0000	1.56
+++ qt4-build.eclass	24 Dec 2009 21:40:23 -0000	1.57
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.56 2009/12/22 17:04:07 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.57 2009/12/24 21:40:23 abcd Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -14,7 +14,7 @@
 
 inherit base eutils multilib toolchain-funcs flag-o-matic versionator
 
-IUSE="debug pch"
+IUSE="debug pch aqua"
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
 	!>x11-libs/qt-assistant-${PV}-r9999
@@ -48,32 +48,55 @@
 
 MY_PV=${PV/_/-}
 
+HOMEPAGE="http://qt.nokia.com/"
 if version_is_at_least 4.5.99999999 ${PV} ; then
-	MY_P=qt-everywhere-opensource-src-${MY_PV}
+	SRC_URI="http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${MY_PV}.tar.gz"
 else
-	MY_P=qt-x11-opensource-src-${MY_PV}
+	SRC_URI="aqua? ( http://get.qt.nokia.com/qt/source/qt-mac-opensource-src-${MY_PV}.tar.gz )
+		!aqua? ( http://get.qt.nokia.com/qt/source/qt-x11-opensource-src-${MY_PV}.tar.gz )"
 fi
 
-S=${WORKDIR}/${MY_P}
-
-HOMEPAGE="http://qt.nokia.com/"
-SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 
 # @FUNCTION: qt4-build_pkg_setup
 # @DESCRIPTION:
-# Sets up PATH and LD_LIBRARY_PATH
+# Sets up S, MY_P, PATH, and LD_LIBRARY_PATH
 qt4-build_pkg_setup() {
+	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
+
+	local MY_GE
+	if version_is_at_least 4.5.99999999 ${PV} ; then
+		MY_P=qt-everywhere-opensource-src-${MY_PV}
+	else
+		use aqua \
+			&& MY_GE=mac \
+			|| MY_GE=x11
+		MY_P=qt-${MY_GE}-opensource-src-${MY_PV}
+	fi
+	S=${WORKDIR}/${MY_P}
+
 	PATH="${S}/bin${PATH:+:}${PATH}"
-	LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+	if [[ ${CHOST} != *-darwin* ]]; then
+		LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+	else
+		DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"
+		# on mac we *need* src/gui/kernel/qapplication_mac.cpp for platfrom
+		# detection since the x11-headers package b0rkens the header
+		# installation, we have to extract src/ and include/ completely on mac
+		# tools is needed for qt-demo and some others
+		QT4_EXTRACT_DIRECTORIES+=" src include"
+
+		if [[ ${PN} == qt-demo || ${PN} == qt-qt3support || ${PN} == qt-webkit ]]; then
+			QT4_EXTRACT_DIRECTORIES+=" tools"
+		fi
+	fi
 
 	# Make sure ebuilds use the required EAPI
-	if [[ ${EAPI} != 2 ]]; then
-		eerror "The qt4-build eclass requires EAPI=2, but this ebuild does not"
-		eerror "have EAPI=2 set. The ebuild author or editor failed. This ebuild needs"
-		eerror "to be fixed. Using qt4-build eclass without EAPI=2 will fail."
-		die "qt4-build eclass requires EAPI=2"
+	if [[ ${EAPI} != [23] ]]; then
+		eerror "The qt4-build eclass requires EAPI=2 or EAPI=3, 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"
 	fi
 
 	if ! version_is_at_least 4.1 $(gcc-version); then
@@ -143,12 +166,26 @@
 	setqtenv
 	cd "${S}"
 
+	if use aqua; then
+		# provide a proper macx-g++-64
+		use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
+
+		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"
+	fi
+
 	if [[ ${PN} != qt-core ]]; then
 		skip_qmake_build_patch
 		skip_project_generation_patch
 		symlink_binaries_to_buildtree
 	fi
 
+	if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
+		# qmake bus errors with -O2 but -O3 works
+		replace-flags -O2 -O3
+	fi
+
 	# Bug 282984 && Bug 295530
 	sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\n\1:" \
 		-i configure || die "sed qmake compilers failed"
@@ -183,10 +220,61 @@
 		-e "s:X11R6/::" \
 		-i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
 
-	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=${LDFLAGS}:" \
-		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
+	if [[ ${CHOST} != *-darwin* ]]; then
+		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=${LDFLAGS}:" \
+			-i mkspecs/common/g++.conf || die "sed mkspecs/common/g++.conf failed"
+	else
+		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
+		# crippled (by design) :/
+		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"
+
+		# 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.
+		sed \
+			-e "s:-arch i386::" \
+			-e "s:-arch ppc::" \
+			-e "s:-arch x86_64::" \
+			-e "s:-arch ppc64::" \
+			-e "s:-arch \$i::" \
+			-e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
+			-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"
+
+		# 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"
+		fi
+	fi
+
+	# 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
+		sed \
+			-e "s|mac:LIBS += -liconv|LIBS += -liconv|g" \
+			-i config.tests/unix/iconv/iconv.pro \
+			|| die "sed on iconv.pro failed"
+	fi
+
+	# we need some patches for Solaris
+	sed -i \
+		-e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
+		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+	# use GCC over SunStudio
+	sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
+	# 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
 
 	base_src_prepare
 }
@@ -198,6 +286,42 @@
 	setqtenv
 	myconf="$(standard_configure_options) ${myconf}"
 
+	# this one is needed for all systems with a separate -liconv, apart from
+	# Darwin, for which the sources already cater for -liconv
+	use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
+		myconf+=" -liconv"
+
+	if has glib ${IUSE//+} && use 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
+		myconf+=" ${glibflags//-pthread}"
+		unset glibflags
+	fi
+
+	if use aqua ; then
+		# On (snow) leopard use the new (frameworked) cocoa code.
+		if [[ $(uname -r | cut -d . -f 1) -ge 9 ]] ; then
+			myconf+=" -cocoa -framework"
+
+			# We are crazy and build cocoa + qt3support :-)
+			if use qt3support; then
+				sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
+					-i configure
+			fi
+
+			# We need the source's headers, not the installed ones.
+			myconf+=" -I${S}/include"
+
+			# Add hint for the framework location.
+			myconf+=" -F${QTLIBDIR}"
+		fi
+	else
+		# freetype2 include dir is non-standard, thus include it on configure
+		# use -I from configure
+		myconf+=" $(pkg-config --cflags freetype2)"
+	fi
+
 	echo ./configure ${myconf}
 	./configure ${myconf} || die "./configure failed"
 	myconf=""
@@ -211,34 +335,62 @@
 	build_directories ${QT4_TARGET_DIRECTORIES}
 }
 
+# @FUNCTION: fix_includes
+# @DESCRIPTION:
+# For MacOSX 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 && [[ $(uname -r | cut -d . -f 1) -ge 9 ]] ; then
+		# Some packages tend to include <Qt/...>
+		dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
+
+		# Fake normal headers when frameworks are installed... eases life later on
+		local dest f
+		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}"
+
+			# 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}
+			done
+		done
+	fi
+}
+
 # @FUNCTION: qt4-build_src_install
 # @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}
 	install_qconfigs
 	fix_library_files
+	fix_includes
 }
 
 # @FUNCTION: setqtenv
 setqtenv() {
 	# Set up installation directories
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=/usr
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
+	QTBASEDIR=${EPREFIX}/usr/$(get_libdir)/qt4
+	QTPREFIXDIR=${EPREFIX}/usr
+	QTBINDIR=${EPREFIX}/usr/bin
+	QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
 	QMAKE_LIBDIR_QT=${QTLIBDIR}
-	QTPCDIR=/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=/usr/share/qt4
-	QTDOCDIR=/usr/share/doc/qt-${PV}
-	QTHEADERDIR=/usr/include/qt4
+	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
-	QTSYSCONFDIR=/etc/qt4
+	QTSYSCONFDIR=${EPREFIX}/etc/qt4
 	QTTRANSDIR=${QTDATADIR}/translations
 	QTEXAMPLESDIR=${QTDATADIR}/examples
 	QTDEMOSDIR=${QTDATADIR}/demos
-	QT_INSTALL_PREFIX=/usr/$(get_libdir)/qt4
+	QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
 	PLATFORM=$(qt_mkspecs_dir)
 
 	unset QMAKESPEC
@@ -251,6 +403,7 @@
 standard_configure_options() {
 	local myconf=
 
+	# Doesn't need ${EPREFIX} because get_libdir() is *always* lib on prefix
 	[[ $(get_libdir) != lib ]] && myconf+=" -L/usr/$(get_libdir)"
 
 	# Disable visibility explicitly if gcc version isn't 4
@@ -268,11 +421,16 @@
 	fi
 	myconf+=" -no-separate-debug-info"
 
+	use aqua && myconf+=" -no-framework"
+
 	# 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) myconf+=" -arch x86_64" ;;
-		ppc|ppc64) myconf+=" -arch powerpc" ;;
+		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" ;;
@@ -284,7 +442,15 @@
 	case "${PV}" in
 		4.6.*)
 			if [[ ${PN} != "qt-core" ]] && [[ ${PN} != "qt-xmlpatterns" ]]; then
-				exceptions="-no-exceptions"
+				case "${PV}:${CHOST}" in
+					4.6.0*:*-darwin*)
+					: # http://bugreports.qt.nokia.com/browse/QTBUG-5909
+					  # workaround for compilation error on OSX (qt-gui)
+					;;
+					*)
+						exceptions="-no-exceptions"
+					;;
+				esac
 			fi
 		;;
 		*)
@@ -292,6 +458,13 @@
 		;;
 	esac
 
+	# 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
+	# construct a QApplication before a QPaintDevice" on Solaris
+	#   -- Daniel Vergien
+	[[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
+
 	myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
 		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
 		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
@@ -299,7 +472,7 @@
 		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
 		-demosdir ${QTDEMOSDIR} -silent -fast -opensource
 		${exceptions}
-		-reduce-relocations -nomake examples -nomake demos"
+		-nomake examples -nomake demos"
 
 	echo "${myconf}"
 }
@@ -310,12 +483,13 @@
 # Compiles the code in $QT4_TARGET_DIRECTORIES
 build_directories() {
 	for x in "$@"; do
-		cd "${S}"/${x}
-		sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die
+		pushd "${S}"/${x} >/dev/null
+		sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/*.conf || die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
 		emake CC="@echo compiling \$< && $(tc-getCC)" \
 			CXX="@echo compiling \$< && $(tc-getCXX)" \
 			LINK="@echo linking \$@ && $(tc-getCXX)" || die "emake failed"
+		popd >/dev/null
 	done
 }
 
@@ -354,7 +528,7 @@
 		for x in QCONFIG_ADD QCONFIG_REMOVE; do
 			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
 		done
-		insinto ${QTDATADIR}/mkspecs/gentoo
+		insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
 		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
 	fi
 
@@ -362,7 +536,7 @@
 		for x in ${QCONFIG_DEFINE}; do
 			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
 		done
-		insinto ${QTHEADERDIR}/Gentoo
+		insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
 		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
 	fi
 }
@@ -499,7 +673,7 @@
 			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
 
 		# Move .pc files into the pkgconfig directory
-		dodir ${QTPCDIR}
+		dodir ${QTPCDIR#${EPREFIX}}
 		mv ${libfile} "${D}"/${QTPCDIR}/ \
 			|| die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
 		fi
@@ -547,7 +721,16 @@
 		*-netbsd*)
 			spec=netbsd ;;
 		*-darwin*)
-			spec=darwin ;;
+			if use aqua; then
+				# mac with carbon/cocoa
+				spec=macx
+			else
+				# darwin/mac with x11
+				spec=darwin
+			fi
+			;;
+		*-solaris*)
+			spec=solaris ;;
 		*-linux-*|*-linux)
 			spec=linux ;;
 		*)
@@ -566,6 +749,16 @@
 		spec+=-${LIBDIR/lib}
 	fi
 
+	# Add -64 for 64bit profiles
+	if use x64-freebsd ||
+		use amd64-linux ||
+		use x64-macos ||
+		use x64-solaris ||
+		use sparc64-solaris
+	then
+		spec+=-64
+	fi
+
 	echo "${spec}"
 }
 

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

[Fabian Groffen (grobian)]

grobian     09/12/25 08:19:38

  Modified:             qt4-build.eclass
  Log:
  you never know what the future will bring (an IRIX port?) so don't rely on get_libdir always returning lib

Revision  Changes    Path
1.58                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.57&r2=1.58

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- qt4-build.eclass	24 Dec 2009 21:40:23 -0000	1.57
+++ qt4-build.eclass	25 Dec 2009 08:19:38 -0000	1.58
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.57 2009/12/24 21:40:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.58 2009/12/25 08:19:38 grobian Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -403,8 +403,7 @@
 standard_configure_options() {
 	local myconf=
 
-	# Doesn't need ${EPREFIX} because get_libdir() is *always* lib on prefix
-	[[ $(get_libdir) != lib ]] && myconf+=" -L/usr/$(get_libdir)"
+	[[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
 
 	# Disable visibility explicitly if gcc version isn't 4
 	if [[ $(gcc-major-version) -lt 4 ]]; then

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

[Jonathan Callen (abcd)]

abcd        09/12/25 15:27:22

  Modified:             qt4-build.eclass
  Log:
  Remove code for Qt 4.5.3 on Prefix, as only >=4.6.0 will be ported

Revision  Changes    Path
1.59                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.58&r2=1.59

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- qt4-build.eclass	25 Dec 2009 08:19:38 -0000	1.58
+++ qt4-build.eclass	25 Dec 2009 15:27:22 -0000	1.59
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.58 2009/12/25 08:19:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.59 2009/12/25 15:27:22 abcd Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -14,7 +14,19 @@
 
 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}
+else
+	MY_P=qt-x11-opensource-src-${MY_PV}
+fi
+
+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"
+
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
 	!>x11-libs/qt-assistant-${PV}-r9999
@@ -46,17 +58,7 @@
 	!>x11-libs/qt-xmlpatterns-${PV}-r9999
 "
 
-MY_PV=${PV/_/-}
-
-HOMEPAGE="http://qt.nokia.com/"
-if version_is_at_least 4.5.99999999 ${PV} ; then
-	SRC_URI="http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${MY_PV}.tar.gz"
-else
-	SRC_URI="aqua? ( http://get.qt.nokia.com/qt/source/qt-mac-opensource-src-${MY_PV}.tar.gz )
-		!aqua? ( http://get.qt.nokia.com/qt/source/qt-x11-opensource-src-${MY_PV}.tar.gz )"
-fi
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
+S=${WORKDIR}/${MY_P}
 
 # @FUNCTION: qt4-build_pkg_setup
 # @DESCRIPTION:
@@ -64,16 +66,6 @@
 qt4-build_pkg_setup() {
 	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
 
-	local MY_GE
-	if version_is_at_least 4.5.99999999 ${PV} ; then
-		MY_P=qt-everywhere-opensource-src-${MY_PV}
-	else
-		use aqua \
-			&& MY_GE=mac \
-			|| MY_GE=x11
-		MY_P=qt-${MY_GE}-opensource-src-${MY_PV}
-	fi
-	S=${WORKDIR}/${MY_P}
 
 	PATH="${S}/bin${PATH:+:}${PATH}"
 	if [[ ${CHOST} != *-darwin* ]]; then
@@ -104,23 +96,6 @@
 		echo
 		ebeep 3
 	fi
-
-	if [[ ${P} == qt-core-4.6.0_rc1 ]]; then
-		ewarn
-		ewarn "Binary compatibility broke between 4.6.0_beta1 and 4.6.0_rc1."
-		ewarn "If you are upgrading from 4.6.0_beta1, you'll have to"
-		ewarn "re-emerge everything that depends on Qt."
-		ewarn "Use the following command:"
-		ewarn
-		ewarn "   emerge -av1 \$(for i in \$(qlist -IC x11-libs/qt-);"
-		ewarn "   do equery -q d \$i | grep -v 'x11-libs/qt-' |"
-		ewarn "   sed \"s/^/=/\"; done)"
-		ewarn
-		ewarn "YOU'VE BEEN WARNED"
-		ewarn
-		ebeep 3
-	fi
-
 }
 
 # @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES

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

[Jonathan Callen (abcd)]

abcd        10/01/13 19:35:01

  Modified:             qt4-build.eclass
  Log:
  Add last couple of changes from prefix overlay

Revision  Changes    Path
1.60                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.59&r2=1.60

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qt4-build.eclass	25 Dec 2009 15:27:22 -0000	1.59
+++ qt4-build.eclass	13 Jan 2010 19:35:01 -0000	1.60
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.59 2009/12/25 15:27:22 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.60 2010/01/13 19:35:01 abcd Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -315,7 +315,7 @@
 # For MacOSX 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 && [[ $(uname -r | cut -d . -f 1) -ge 9 ]] ; then
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
 		# Some packages tend to include <Qt/...>
 		dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
 
@@ -458,7 +458,11 @@
 build_directories() {
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null
-		sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/*.conf || die
+		# 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\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
 		emake CC="@echo compiling \$< && $(tc-getCC)" \
 			CXX="@echo compiling \$< && $(tc-getCXX)" \

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

[Jonathan Callen (abcd)]

abcd        10/01/17 20:28:17

  Modified:             qt4-build.eclass
  Log:
  Don't use uname - CHOST has the needed information

Revision  Changes    Path
1.61                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.60&r2=1.61

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- qt4-build.eclass	13 Jan 2010 19:35:01 -0000	1.60
+++ qt4-build.eclass	17 Jan 2010 20:28:17 -0000	1.61
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.60 2010/01/13 19:35:01 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.61 2010/01/17 20:28:17 abcd Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -276,7 +276,7 @@
 
 	if use aqua ; then
 		# On (snow) leopard use the new (frameworked) cocoa code.
-		if [[ $(uname -r | cut -d . -f 1) -ge 9 ]] ; then
+		if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
 			myconf+=" -cocoa -framework"
 
 			# We are crazy and build cocoa + qt3support :-)

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

[Mike Frysinger (vapier)]

vapier      10/01/21 05:57:09

  Modified:             qt4-build.eclass
  Log:
  add a die check to the tar unpacking step

Revision  Changes    Path
1.62                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.61&r2=1.62

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- qt4-build.eclass	17 Jan 2010 20:28:17 -0000	1.61
+++ qt4-build.eclass	21 Jan 2010 05:57:09 -0000	1.62
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.61 2010/01/17 20:28:17 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.62 2010/01/21 05:57:09 vapier Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -121,7 +121,7 @@
 	done
 
 	echo tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
-	tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
+	tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
 }
 
 # @ECLASS-VARIABLE: PATCHES

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

[Ben de Groot (yngwin)]

yngwin      10/02/10 20:34:17

  Modified:             qt4-build.eclass
  Log:
  Small patch to fix Darwinbuild issues with qt4-build.eclass

Revision  Changes    Path
1.63                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.62&r2=1.63

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- qt4-build.eclass	21 Jan 2010 05:57:09 -0000	1.62
+++ qt4-build.eclass	10 Feb 2010 20:34:17 -0000	1.63
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.62 2010/01/21 05:57:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.63 2010/02/10 20:34:17 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -72,15 +72,11 @@
 		LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
 	else
 		DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"
-		# on mac we *need* src/gui/kernel/qapplication_mac.cpp for platfrom
-		# detection since the x11-headers package b0rkens the header
-		# installation, we have to extract src/ and include/ completely on mac
-		# tools is needed for qt-demo and some others
-		QT4_EXTRACT_DIRECTORIES+=" src include"
-
-		if [[ ${PN} == qt-demo || ${PN} == qt-qt3support || ${PN} == qt-webkit ]]; then
-			QT4_EXTRACT_DIRECTORIES+=" tools"
-		fi
+		# On MacOS we *need* at least src/gui/kernel/qapplication_mac.mm for
+		# platform detection. Note: needs to come before any directories to
+		# avoid extract failure.
+		[[ ${CHOST} == *-apple-darwin* ]] && \
+			QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm ${QT4_EXTRACT_DIRECTORIES}"
 	fi
 
 	# Make sure ebuilds use the required EAPI

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

[Dror Levin (spatz)]

spatz       10/02/15 16:34:00

  Modified:             qt4-build.eclass
  Log:
  Remove unneeded and outdated ewarn in qt4-build

Revision  Changes    Path
1.64                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.63&r2=1.64

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- qt4-build.eclass	10 Feb 2010 20:34:17 -0000	1.63
+++ qt4-build.eclass	15 Feb 2010 16:34:00 -0000	1.64
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.63 2010/02/10 20:34:17 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.64 2010/02/15 16:34:00 spatz Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -584,23 +584,6 @@
 # breakages and proposed solutions.
 qt4-build_pkg_postinst() {
 	generate_qconfigs
-
-	if [[ "${PN}" == "qt-core" ]]; then
-		echo
-		ewarn "After a rebuild or upgrade of Qt, it can happen that Qt plugins (such as Qt"
-		ewarn "and KDE styles and widgets) can no longer be loaded. In this situation you"
-		ewarn "should recompile the packages providing these plugins. Also, make sure you"
-		ewarn "compile the Qt packages, and the packages that depend on it, with the same"
-		ewarn "GCC version and the same USE flag settings (especially the debug flag)."
-		ewarn
-		ewarn "Packages that typically need to be recompiled are kdelibs from KDE4, any"
-		ewarn "additional KDE4/Qt4 styles, qscintilla and PyQt4. Before filing a bug report,"
-		ewarn "make sure all your Qt4 packages are up-to-date and built with the same"
-		ewarn "configuration."
-		ewarn
-		ewarn "For more information, see http://doc.trolltech.com/${PV%.*}/plugins-howto.html"
-		echo
-	fi
 }
 
 # @FUNCTION: skip_qmake_build_patch

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

[Alex Alexander (wired)]

wired       10/02/17 23:32:25

  Modified:             qt4-build.eclass
  Log:
  [qt4-build.eclass] added exceptions USE flag for >= Qt 4.6.x - bug #240185

Revision  Changes    Path
1.65                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.64&r2=1.65

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- qt4-build.eclass	15 Feb 2010 16:34:00 -0000	1.64
+++ qt4-build.eclass	17 Feb 2010 23:32:24 -0000	1.65
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.64 2010/02/15 16:34:00 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.65 2010/02/17 23:32:24 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -17,6 +17,7 @@
 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 ]] && IUSE="+exceptions"
 else
 	MY_P=qt-x11-opensource-src-${MY_PV}
 fi
@@ -25,7 +26,7 @@
 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
-IUSE="debug pch aqua"
+IUSE+=" debug pch aqua"
 
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
@@ -38,6 +39,8 @@
 	!>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-phonon-${PV}
@@ -407,24 +410,15 @@
 		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 
-	# 4.6: build qt-core with exceptions or qt-xmlpatterns won't build
-	local exceptions=
+	# 4.5: build everything but qt-xmlpatterns w/o exceptions
+	# 4.6: exceptions USE flag
+	local exceptions="-exceptions"
 	case "${PV}" in
-		4.6.*)
-			if [[ ${PN} != "qt-core" ]] && [[ ${PN} != "qt-xmlpatterns" ]]; then
-				case "${PV}:${CHOST}" in
-					4.6.0*:*-darwin*)
-					: # http://bugreports.qt.nokia.com/browse/QTBUG-5909
-					  # workaround for compilation error on OSX (qt-gui)
-					;;
-					*)
-						exceptions="-no-exceptions"
-					;;
-				esac
-			fi
+		4.5.*)
+			[[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
 		;;
 		*)
-			[[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
+			has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)"
 		;;
 	esac
 

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

[Ben de Groot (yngwin)]

yngwin      10/03/24 14:36:28

  Modified:             qt4-build.eclass
  Log:
  [qt4-build.eclass] Prevent users from unintentionally breaking their systems

Revision  Changes    Path
1.66                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.65&r2=1.66

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- qt4-build.eclass	17 Feb 2010 23:32:24 -0000	1.65
+++ qt4-build.eclass	24 Mar 2010 14:36:28 -0000	1.66
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.65 2010/02/17 23:32:24 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.66 2010/03/24 14:36:28 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -69,6 +69,17 @@
 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 ; 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
+	fi
 
 	PATH="${S}/bin${PATH:+:}${PATH}"
 	if [[ ${CHOST} != *-darwin* ]]; then
@@ -79,7 +90,8 @@
 		# platform detection. Note: needs to come before any directories to
 		# avoid extract failure.
 		[[ ${CHOST} == *-apple-darwin* ]] && \
-			QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm ${QT4_EXTRACT_DIRECTORIES}"
+			QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
+				${QT4_EXTRACT_DIRECTORIES}"
 	fi
 
 	# Make sure ebuilds use the required EAPI
@@ -92,8 +104,6 @@
 
 	if ! version_is_at_least 4.1 $(gcc-version); then
 		ewarn "Using a GCC version lower than 4.1 is not supported!"
-		echo
-		ebeep 3
 	fi
 }
 

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

[Alex Alexander (wired)]

wired       10/05/22 15:22:46

  Modified:             qt4-build.eclass
  Log:
  fix bug 320851.
  also apply ayoy's fixes:
  - Remove changes to mkspecs in favor of setting correct env variables in configure script.
  - Make compilation output more verbose.

Revision  Changes    Path
1.67                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- qt4-build.eclass	24 Mar 2010 14:36:28 -0000	1.66
+++ qt4-build.eclass	22 May 2010 15:22:46 -0000	1.67
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.66 2010/03/24 14:36:28 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.67 2010/05/22 15:22:46 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -170,12 +170,6 @@
 		replace-flags -O2 -O3
 	fi
 
-	# Bug 282984 && Bug 295530
-	sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\n\1:" \
-		-i configure || die "sed qmake compilers failed"
-	sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX):" \
-		-i config.tests/unix/compile.test || die "sed test compilers failed"
-
 	# Bug 178652
 	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
@@ -197,19 +191,17 @@
 		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"
+	sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):" \
+		-i config.tests/unix/compile.test || die "sed test compilers failed"
+
 	# Bug 172219
-	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=${LDFLAGS}:" \
-		-e "s:X11R6/::" \
+	sed -e "s:X11R6/::" \
 		-i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
 
-	if [[ ${CHOST} != *-darwin* ]]; then
-		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=${LDFLAGS}:" \
-			-i mkspecs/common/g++.conf || die "sed mkspecs/common/g++.conf failed"
-	else
+	if [[ ${CHOST} == *-darwin* ]]; then
 		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
 		# crippled (by design) :/
 		sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
@@ -464,9 +456,9 @@
 			find "${S}" -name '*.pr[io]'
 		} | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
-		emake CC="@echo compiling \$< && $(tc-getCC)" \
-			CXX="@echo compiling \$< && $(tc-getCXX)" \
-			LINK="@echo linking \$@ && $(tc-getCXX)" || die "emake failed"
+		emake CC="$(tc-getCC)" \
+			CXX="$(tc-getCXX)" \
+			LINK="$(tc-getCXX)" || die "emake failed"
 		popd >/dev/null
 	done
 }

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

[Alex Alexander (wired)]

wired       10/05/22 19:23:51

  Modified:             qt4-build.eclass
  Log:
  inform the users that building qt-webkit with -ggdb can be problematic.
  bug 307861

Revision  Changes    Path
1.68                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- qt4-build.eclass	22 May 2010 15:22:46 -0000	1.67
+++ qt4-build.eclass	22 May 2010 19:23:51 -0000	1.68
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.67 2010/05/22 15:22:46 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.68 2010/05/22 19:23:51 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -67,6 +67,18 @@
 # @DESCRIPTION:
 # Sets up S, MY_P, PATH, and LD_LIBRARY_PATH
 qt4-build_pkg_setup() {
+	if [[ "${PN}" == "qt-webkit" ]]; then
+		if [[ "${CFLAGS}" =~ "-ggdb" ]] || [[ "${CXXFLAGS}" =~ "-ggdb" ]]; then
+			echo
+			ewarn "Your \$C{,XX}FLAGS contain -ggdb. You may experience really"
+			ewarn "long compilation times and/or increased memory usage." 
+			ewarn "If compilation fails, please try removing -ggdb before"
+			ewarn "reporting a bug."
+			ewarn "For more info check out bug #307861"
+			echo
+		fi
+	fi
+
 	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
 
 	# Protect users by not allowing downgrades between releases

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

[Alex Alexander (wired)]

wired       10/05/24 14:27:13

  Modified:             qt4-build.eclass
  Log:
  fixed 4.7.0_beta1 regression with -fvisibility=hidden

Revision  Changes    Path
1.69                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- qt4-build.eclass	22 May 2010 19:23:51 -0000	1.68
+++ qt4-build.eclass	24 May 2010 14:27:13 -0000	1.69
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.68 2010/05/22 19:23:51 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.69 2010/05/24 14:27:13 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -162,6 +162,13 @@
 	setqtenv
 	cd "${S}"
 
+	# fix qt 4.7 regression that skips -fvisibility=hidden
+	if [[ "${PV}" == "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 use aqua; then
 		# provide a proper macx-g++-64
 		use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)

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

[Dror Levin (spatz)]

spatz       10/05/24 22:03:30

  Modified:             qt4-build.eclass
  Log:
  Fix CC, CXX, LD and LINK in all test files, bug 321335.

Revision  Changes    Path
1.70                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- qt4-build.eclass	24 May 2010 14:27:13 -0000	1.69
+++ qt4-build.eclass	24 May 2010 22:03:30 -0000	1.70
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.69 2010/05/24 14:27:13 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.70 2010/05/24 22:03:30 spatz Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -213,8 +213,11 @@
 	# 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"
-	sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):" \
-		-i config.tests/unix/compile.test || die "sed test compilers 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) LD=$(tc-getCXX) LINK=$(tc-getCXX):g" \
+			-i || die "sed test compilers failed"
 
 	# Bug 172219
 	sed -e "s:X11R6/::" \

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

[Dror Levin (spatz)]

spatz       10/05/25 13:39:47

  Modified:             qt4-build.eclass
  Log:
  Improve -g{,gdb} check for qt-webkit to include test for -g{,gdb}[0-9].

Revision  Changes    Path
1.71                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- qt4-build.eclass	24 May 2010 22:03:30 -0000	1.70
+++ qt4-build.eclass	25 May 2010 13:39:46 -0000	1.71
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.70 2010/05/24 22:03:30 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.71 2010/05/25 13:39:46 spatz Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -67,18 +67,6 @@
 # @DESCRIPTION:
 # Sets up S, MY_P, PATH, and LD_LIBRARY_PATH
 qt4-build_pkg_setup() {
-	if [[ "${PN}" == "qt-webkit" ]]; then
-		if [[ "${CFLAGS}" =~ "-ggdb" ]] || [[ "${CXXFLAGS}" =~ "-ggdb" ]]; then
-			echo
-			ewarn "Your \$C{,XX}FLAGS contain -ggdb. You may experience really"
-			ewarn "long compilation times and/or increased memory usage." 
-			ewarn "If compilation fails, please try removing -ggdb before"
-			ewarn "reporting a bug."
-			ewarn "For more info check out bug #307861"
-			echo
-		fi
-	fi
-
 	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
 
 	# Protect users by not allowing downgrades between releases
@@ -93,6 +81,19 @@
 		fi
 	fi
 
+	if [[ "${PN}" == "qt-webkit" ]]; then
+		eshopts_push -s extglob
+		if is-flagq '-g?(gdb)?([0-9])'; then
+			echo
+			ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
+			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 "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}"

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

[Markos Chandras (hwoarang)]

hwoarang    10/05/26 15:17:17

  Modified:             qt4-build.eclass
  Log:
  Apply fvisibility fix for versions > 4.7.0_beta as well

Revision  Changes    Path
1.72                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- qt4-build.eclass	25 May 2010 13:39:46 -0000	1.71
+++ qt4-build.eclass	26 May 2010 15:17:17 -0000	1.72
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.71 2010/05/25 13:39:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.72 2010/05/26 15:17:17 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -164,7 +164,7 @@
 	cd "${S}"
 
 	# fix qt 4.7 regression that skips -fvisibility=hidden
-	if [[ "${PV}" == "4.7.0_beta1" ]]; then
+	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"

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

[Dror Levin (spatz)]

spatz       10/05/27 21:27:32

  Modified:             qt4-build.eclass
  Log:
  Don't pass p option to tar when unpacking.

Revision  Changes    Path
1.73                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- qt4-build.eclass	26 May 2010 15:17:17 -0000	1.72
+++ qt4-build.eclass	27 May 2010 21:27:31 -0000	1.73
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.72 2010/05/26 15:17:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.73 2010/05/27 21:27:31 spatz Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -142,8 +142,8 @@
 			targets+=" ${MY_P}/${target}"
 	done
 
-	echo tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
-	tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
+	echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
+	tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
 }
 
 # @ECLASS-VARIABLE: PATCHES

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

[Dror Levin (spatz)]

spatz       10/05/30 10:31:05

  Modified:             qt4-build.eclass
  Log:
  Fix sedding of $MAKE in qt 4.5, bug 321335 (again).

Revision  Changes    Path
1.74                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- qt4-build.eclass	27 May 2010 21:27:31 -0000	1.73
+++ qt4-build.eclass	30 May 2010 10:31:05 -0000	1.74
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.73 2010/05/27 21:27:31 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.74 2010/05/30 10:31:05 spatz Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -215,10 +215,12 @@
 	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
-	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"
+	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
 
 	# Bug 172219
 	sed -e "s:X11R6/::" \

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

[Markos Chandras (hwoarang)]

hwoarang    10/07/03 09:10:55

  Modified:             qt4-build.eclass
  Log:
  Strip CFLAGS from qmake wrt bug #312689

Revision  Changes    Path
1.75                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- qt4-build.eclass	30 May 2010 10:31:05 -0000	1.74
+++ qt4-build.eclass	3 Jul 2010 09:10:55 -0000	1.75
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.74 2010/05/30 10:31:05 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.75 2010/07/03 09:10:55 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -276,6 +276,8 @@
 	# 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\|DEBUG\)/s:+=.*:+=:' mkspecs/common/g++.conf
 
 	base_src_prepare
 }

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

[Dominik Kapusta (ayoy)]

ayoy        10/07/03 15:49:39

  Modified:             qt4-build.eclass
  Log:
  Add qt4-build_src_test that runs make check only in target build directories.

Revision  Changes    Path
1.76                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- qt4-build.eclass	3 Jul 2010 09:10:55 -0000	1.75
+++ qt4-build.eclass	3 Jul 2010 15:49:39 -0000	1.76
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.75 2010/07/03 09:10:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.76 2010/07/03 15:49:39 ayoy Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -338,6 +338,15 @@
 	build_directories ${QT4_TARGET_DIRECTORIES}
 }
 
+# @FUNCTION: qt4-build_src_test
+# @DESCRIPTION:
+# Runs tests only in target directories.
+qt4-build_src_test() {
+	for dir in ${QT4_TARGET_DIRECTORIES}; do
+		emake -j1 check -C ${dir}
+	done
+}
+
 # @FUNCTION: fix_includes
 # @DESCRIPTION:
 # For MacOSX we need to add some symlinks when frameworks are
@@ -742,4 +751,4 @@
 	echo "${spec}"
 }
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_postrm pkg_postinst
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

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

[Markos Chandras (hwoarang)]

hwoarang    10/07/08 15:45:01

  Modified:             qt4-build.eclass
  Log:
  Introduce functions from -edge eclass. Use them for 4.7.0_beta2 ebuild for now

Revision  Changes    Path
1.77                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- qt4-build.eclass	3 Jul 2010 15:49:39 -0000	1.76
+++ qt4-build.eclass	8 Jul 2010 15:45:01 -0000	1.77
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.76 2010/07/03 15:49:39 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.77 2010/07/08 15:45:01 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -162,13 +162,19 @@
 qt4-build_src_prepare() {
 	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
+	# 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"
+		hasq ${PN} ${NOLIBX11PKG} && qt_nolibx11
+		[[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup
+	fi
 
 	if use aqua; then
 		# provide a proper macx-g++-64
@@ -751,4 +757,37 @@
 	echo "${spec}"
 }
 
+# @FUNCTION: qt_assistant_cleanup
+# @RETURN: nothing
+# @DESCRIPTION:
+# Tries to clean up tools.pro for qt-assistant ebuilds
+# Meant to be called in src_prepare
+qt_assistant_cleanup() {
+	# 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
+# @RETURN: nothing
+# @DESCRIPTION:
+# 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"
+}
+
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

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

[Markos Chandras (hwoarang)]

hwoarang    10/07/11 10:32:17

  Modified:             qt4-build.eclass
  Log:
  Remove .la files from every qt module

Revision  Changes    Path
1.78                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- qt4-build.eclass	8 Jul 2010 15:45:01 -0000	1.77
+++ qt4-build.eclass	11 Jul 2010 10:32:17 -0000	1.78
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.77 2010/07/08 15:45:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.78 2010/07/11 10:32:17 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -389,6 +389,8 @@
 	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 
 }
 
 # @FUNCTION: setqtenv

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

[Raul Porcel (armin76)]

armin76     10/08/08 11:34:21

  Modified:             qt4-build.eclass
  Log:
  Add workaround for ARM

Revision  Changes    Path
1.79                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- qt4-build.eclass	11 Jul 2010 10:32:17 -0000	1.78
+++ qt4-build.eclass	8 Aug 2010 11:34:20 -0000	1.79
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.78 2010/07/11 10:32:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.79 2010/08/08 11:34:20 armin76 Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -196,6 +196,12 @@
 		replace-flags -O2 -O3
 	fi
 
+	if [[ ${CHOST} == arm* ]] ; then
+		# Fails on arm with -Os, bug 331641
+		# This can be removed once qt-4.7 is stable or the bug on gcc is fixed
+		replace-flags -Os -O2
+	fi
+
 	# Bug 178652
 	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"

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

[Markos Chandras (hwoarang)]

hwoarang    10/08/13 16:36:11

  Modified:             qt4-build.eclass
  Log:
  Don't spit out warning with -g0. Patch from Bartosz Brachaczek <b.brachaczek@gmail.com>. Bug #332537

Revision  Changes    Path
1.80                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- qt4-build.eclass	8 Aug 2010 11:34:20 -0000	1.79
+++ qt4-build.eclass	13 Aug 2010 16:36:10 -0000	1.80
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.79 2010/08/08 11:34:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.80 2010/08/13 16:36:10 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -83,7 +83,7 @@
 
 	if [[ "${PN}" == "qt-webkit" ]]; then
 		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([0-9])'; then
+		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 may experience really long compilation times and/or increased memory usage."

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

[Markos Chandras (hwoarang)]

hwoarang    10/08/14 18:09:11

  Modified:             qt4-build.eclass
  Log:
  Typo

Revision  Changes    Path
1.82                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- qt4-build.eclass	14 Aug 2010 18:00:38 -0000	1.81
+++ qt4-build.eclass	14 Aug 2010 18:09:10 -0000	1.82
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.81 2010/08/14 18:00:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.82 2010/08/14 18:09:10 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -230,7 +230,7 @@
 	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" \
+			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
 

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

[Markos Chandras (hwoarang)]

hwoarang    10/09/05 09:25:08

  Modified:             qt4-build.eclass
  Log:
  Do not strip debug QT CFLAGS per bug #329533

Revision  Changes    Path
1.83                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- qt4-build.eclass	14 Aug 2010 18:09:10 -0000	1.82
+++ qt4-build.eclass	5 Sep 2010 09:25:08 -0000	1.83
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.82 2010/08/14 18:09:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.83 2010/09/05 09:25:08 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -289,7 +289,7 @@
 	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\|DEBUG\)/s:+=.*:+=:' mkspecs/common/g++.conf
+	sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
 
 	base_src_prepare
 }

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

[Raul Porcel (armin76)]

armin76     10/10/13 19:33:17

  Modified:             qt4-build.eclass
  Log:
  Remove arm workaround now that its been fixed on gcc-4.4.3-r3

Revision  Changes    Path
1.84                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- qt4-build.eclass	5 Sep 2010 09:25:08 -0000	1.83
+++ qt4-build.eclass	13 Oct 2010 19:33:17 -0000	1.84
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.83 2010/09/05 09:25:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.84 2010/10/13 19:33:17 armin76 Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -196,12 +196,6 @@
 		replace-flags -O2 -O3
 	fi
 
-	if [[ ${CHOST} == arm* ]] ; then
-		# Fails on arm with -Os, bug 331641
-		# This can be removed once qt-4.7 is stable or the bug on gcc is fixed
-		replace-flags -Os -O2
-	fi
-
 	# Bug 178652
 	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"

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

[Alex Alexander (wired)]

wired       10/11/10 13:45:38

  Modified:             qt4-build.eclass
  Log:
  workaround for bug #344915

Revision  Changes    Path
1.85                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- qt4-build.eclass	13 Oct 2010 19:33:17 -0000	1.84
+++ qt4-build.eclass	10 Nov 2010 13:45:38 -0000	1.85
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.84 2010/10/13 19:33:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.85 2010/11/10 13:45:38 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -331,6 +331,12 @@
 		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
+	if version_is_at_least 4.7.1; then
+		myconf+=" -no-sse4.1 -no-sse4.2"
+	fi
+
 	echo ./configure ${myconf}
 	./configure ${myconf} || die "./configure failed"
 	myconf=""

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

[Alex Alexander (wired)]

wired       10/11/13 20:30:26

  Modified:             qt4-build.eclass
  Log:
  adjust qt4-build eclass for qgtkstyle

Revision  Changes    Path
1.86                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- qt4-build.eclass	10 Nov 2010 13:45:38 -0000	1.85
+++ qt4-build.eclass	13 Nov 2010 20:30:26 -0000	1.86
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.85 2010/11/10 13:45:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.86 2010/11/13 20:30:26 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -17,7 +17,9 @@
 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 ]] && IUSE="+exceptions"
+	[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && 
+		[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && 
+			IUSE="+exceptions"
 else
 	MY_P=qt-x11-opensource-src-${MY_PV}
 fi
@@ -26,7 +28,9 @@
 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
-IUSE+=" debug pch aqua"
+IUSE+=" debug"
+[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && 
+	IUSE+=" pch aqua"
 
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}

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

[Alex Alexander (wired)]

wired       10/11/13 20:50:57

  Modified:             qt4-build.eclass
  Log:
  re-enable some of the USE flags for qgtkstyle

Revision  Changes    Path
1.87                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- qt4-build.eclass	13 Nov 2010 20:30:26 -0000	1.86
+++ qt4-build.eclass	13 Nov 2010 20:50:57 -0000	1.87
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.86 2010/11/13 20:30:26 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.87 2010/11/13 20:50:57 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -28,9 +28,7 @@
 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
-IUSE+=" debug"
-[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && 
-	IUSE+=" pch aqua"
+IUSE+=" debug pch aqua"
 
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}

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

[Dror Levin (spatz)]

spatz       11/01/20 23:08:09

  Modified:             qt4-build.eclass
  Log:
  Fix escaping of quotes in qt4-build.eclass, bug 332669.

Revision  Changes    Path
1.88                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- qt4-build.eclass	13 Nov 2010 20:50:57 -0000	1.87
+++ qt4-build.eclass	20 Jan 2011 23:08:09 -0000	1.88
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.87 2010/11/13 20:50:57 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.88 2011/01/20 23:08:09 spatz Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -220,13 +220,13 @@
 	fi
 
 	# Bug 282984 && Bug 295530
-	sed -e "s:\(^SYSTEM_VARIABLES\):CC="$(tc-getCC)"\nCXX="$(tc-getCXX)"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
+	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
 	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" \
+			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
 

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

[Alex Alexander (wired)]

wired       11/03/03 21:39:29

  Modified:             qt4-build.eclass
  Log:
  enabled support for sse4 in qt-4.7.2, bug #344915

Revision  Changes    Path
1.89                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- qt4-build.eclass	20 Jan 2011 23:08:09 -0000	1.88
+++ qt4-build.eclass	3 Mar 2011 21:39:29 -0000	1.89
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.88 2011/01/20 23:08:09 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.89 2011/03/03 21:39:29 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -335,9 +335,7 @@
 
 	# Disable SSE4.x, since auto-detection is currently broken
 	# Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623
-	if version_is_at_least 4.7.1; then
-		myconf+=" -no-sse4.1 -no-sse4.2"
-	fi
+	[[ ${PV} == "4.7.1" ]] && myconf+=" -no-sse4.1 -no-sse4.2"
 
 	echo ./configure ${myconf}
 	./configure ${myconf} || die "./configure failed"

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

[Alex Alexander (wired)]

wired       11/03/10 23:45:52

  Modified:             qt4-build.eclass
  Log:
  moved makefile generation from compile to configure phase.

Revision  Changes    Path
1.90                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- qt4-build.eclass	3 Mar 2011 21:39:29 -0000	1.89
+++ qt4-build.eclass	10 Mar 2011 23:45:51 -0000	1.90
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.89 2011/03/03 21:39:29 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.90 2011/03/10 23:45:51 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -340,6 +340,8 @@
 	echo ./configure ${myconf}
 	./configure ${myconf} || die "./configure failed"
 	myconf=""
+
+	prepare_directories ${QT4_TARGET_DIRECTORIES}
 }
 
 # @FUNCTION: qt4-build_src_compile
@@ -493,19 +495,32 @@
 	echo "${myconf}"
 }
 
-# @FUNCTION: build_directories
+# @FUNCTION: prepare_directories
 # @USAGE: < directories >
 # @DESCRIPTION:
-# Compiles the code in $QT4_TARGET_DIRECTORIES
-build_directories() {
+# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
+prepare_directories() {
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null
+		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\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
+		popd >/dev/null
+	done
+}
+
+
+# @FUNCTION: build_directories
+# @USAGE: < directories >
+# @DESCRIPTION:
+# Compiles the code in $QT4_TARGET_DIRECTORIES
+build_directories() {
+	for x in "$@"; do
+		pushd "${S}"/${x} >/dev/null
 		emake CC="$(tc-getCC)" \
 			CXX="$(tc-getCXX)" \
 			LINK="$(tc-getCXX)" || die "emake failed"

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

[Markos Chandras (hwoarang)]

hwoarang    11/08/13 11:31:03

  Modified:             qt4-build.eclass
  Log:
  make eclass ready for 4.8.0_beta releases

Revision  Changes    Path
1.92                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- qt4-build.eclass	8 Jul 2011 11:35:01 -0000	1.91
+++ qt4-build.eclass	13 Aug 2011 11:31:03 -0000	1.92
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.91 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.92 2011/08/13 11:31:03 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -137,15 +137,27 @@
 # Unpacks the sources
 qt4-build_src_unpack() {
 	setqtenv
+	local unpack_p="${MY_P}"
+	case "${PV}" in
+		4.8.0_beta*)
+			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+=" ${MY_P}/${target}"
+			targets+=" ${unpack_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_beta*)
+			mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
+				${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
+		;;
+	esac
 }
 
 # @ECLASS-VARIABLE: PATCHES

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

[Markos Chandras (hwoarang)]

hwoarang    11/10/16 09:59:39

  Modified:             qt4-build.eclass
  Log:
  prepare eclass for 4.8.0_rc

Revision  Changes    Path
1.95                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- qt4-build.eclass	29 Aug 2011 01:28:10 -0000	1.94
+++ qt4-build.eclass	16 Oct 2011 09:59:39 -0000	1.95
@@ -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.94 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.95 2011/10/16 09:59:39 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -139,7 +139,7 @@
 	setqtenv
 	local unpack_p="${MY_P}"
 	case "${PV}" in
-		4.8.0_beta*)
+		4.8.0_*)
 			unpack_p="qt-everywhere-opensource-src-${PV/_*}"
 		;;
 	esac
@@ -153,7 +153,7 @@
 	echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
 	tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
 	case "${PV}" in
-		4.8.0_beta*)
+		4.8.0_*)
 			mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
 				${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
 		;;

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

[Markos Chandras (hwoarang)]

hwoarang    11/10/30 14:21:14

  Modified:             qt4-build.eclass
  Log:
  add support for qpa and c++0x use flags for Qt-4.8. patch ack'd by tampakrap

Revision  Changes    Path
1.96                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- qt4-build.eclass	16 Oct 2011 09:59:39 -0000	1.95
+++ qt4-build.eclass	30 Oct 2011 14:21:14 -0000	1.96
@@ -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.95 2011/10/16 09:59:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.96 2011/10/30 14:21:14 hwoarang Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -24,6 +24,10 @@
 	MY_P=qt-x11-opensource-src-${MY_PV}
 fi
 
+if version_is_at_least 4.7.99999999; then
+	IUSE+=" c++0x qpa"
+fi
+
 HOMEPAGE="http://qt.nokia.com/"
 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
 
@@ -209,13 +213,21 @@
 		# qmake bus errors with -O2 but -O3 works
 		replace-flags -O2 -O3
 	fi
-
+	
 	# Bug 178652
 	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
 		append-flags -fno-gcse
 	fi
 
+	if has c++0x ${IUSE//+} && use 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"
+		ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
+		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"
@@ -322,6 +334,15 @@
 		unset glibflags
 	fi
 
+	if has qpa ${IUSE//+} && use 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"
+		ewarn "disable it before reporting any bugs related to this useflag."
+		ewarn
+		myconf+=" -qpa"
+	fi
+
 	if use aqua ; then
 		# On (snow) leopard use the new (frameworked) cocoa code.
 		if [[ ${CHOST##*-darwin} -ge 9 ]] ; then

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

[Jeroen Roovers (jer)]

jer         11/11/02 18:01:00

  Modified:             qt4-build.eclass
  Log:
  Whitespace.

Revision  Changes    Path
1.97                 eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- qt4-build.eclass	30 Oct 2011 14:21:14 -0000	1.96
+++ qt4-build.eclass	2 Nov 2011 18:01:00 -0000	1.97
@@ -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.96 2011/10/30 14:21:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.97 2011/11/02 18:01:00 jer Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -213,7 +213,7 @@
 		# qmake bus errors with -O2 but -O3 works
 		replace-flags -O2 -O3
 	fi
-	
+
 	# Bug 178652
 	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"

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

[Davide Pesavento (pesa)]

pesa        11/12/21 23:38:45

  Modified:             qt4-build.eclass
  Log:
  Cleanup and sort flags in standard_configure_options(), no functional changes.

Revision  Changes    Path
1.107                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- qt4-build.eclass	21 Dec 2011 22:47:35 -0000	1.106
+++ qt4-build.eclass	21 Dec 2011 23:38:45 -0000	1.107
@@ -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.106 2011/12/21 22:47:35 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.107 2011/12/21 23:38:45 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -463,18 +463,16 @@
 # Sets up some standard configure options, like libdir (if necessary), whether
 # debug info is wanted or not.
 standard_configure_options() {
-	local myconf=
+	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}
+		-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)"
 
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		myconf+=" -no-reduce-exports"
-	fi
-
-	# precompiled headers doesn't work on hardened, where the flag is masked.
-	myconf+=" $(qt_use pch)"
-
+	# debug/release
 	if use debug; then
 		myconf+=" -debug"
 	else
@@ -482,6 +480,24 @@
 	fi
 	myconf+=" -no-separate-debug-info"
 
+	# exceptions USE flag
+	local exceptions="-exceptions"
+	in_iuse exceptions && exceptions="$(qt_use exceptions)"
+	myconf+=" ${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"
+
 	use aqua && myconf+=" -no-framework"
 
 	# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
@@ -498,29 +514,6 @@
 		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 
-	# exceptions USE flag
-	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
-	# construct a QApplication before a QPaintDevice" on Solaris
-	#   -- Daniel Vergien
-	[[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
-
-	myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
-		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
-		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
-		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
-		-demosdir ${QTDEMOSDIR} -importdir ${QTIMPORTDIR} -silent -fast -opensource
-		${exceptions}
-		-nomake examples -nomake demos"
-
 	echo "${myconf}"
 }
 

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

[Davide Pesavento (pesa)]

pesa        11/12/26 11:59:19

  Modified:             qt4-build.eclass
  Log:
  Improve eclass doc.

Revision  Changes    Path
1.110                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- qt4-build.eclass	26 Dec 2011 00:11:07 -0000	1.109
+++ qt4-build.eclass	26 Dec 2011 11:59:19 -0000	1.110
@@ -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.109 2011/12/26 00:11:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.110 2011/12/26 11:59:19 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -150,13 +150,17 @@
 }
 
 # @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
 # @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:
-# PATCHES="${FILESDIR}"/mypatch.patch
-#   ${FILESDIR}"/mypatch2.patch"
+# 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.
 #
+# @CODE
+#   PATCHES=( "${FILESDIR}/mypatch.patch"
+#             "${FILESDIR}/patches_folder/" )
+# @CODE
 
 # @FUNCTION: qt4-build_src_prepare
 # @DESCRIPTION:
@@ -417,6 +421,7 @@
 }
 
 # @FUNCTION: setqtenv
+# @INTERNAL
 setqtenv() {
 	# Set up installation directories
 	QTPREFIXDIR=${EPREFIX}/usr
@@ -441,6 +446,7 @@
 }
 
 # @FUNCTION: standard_configure_options
+# @INTERNAL
 # @DESCRIPTION:
 # Sets up some standard configure options, like libdir (if necessary), whether
 # debug info is wanted or not.
@@ -501,6 +507,7 @@
 
 # @FUNCTION: prepare_directories
 # @USAGE: < directories >
+# @INTERNAL
 # @DESCRIPTION:
 # Generates Makefiles for the given list of directories.
 prepare_directories() {
@@ -523,6 +530,7 @@
 
 # @FUNCTION: build_directories
 # @USAGE: < directories >
+# @INTERNAL
 # @DESCRIPTION:
 # Compiles the code in the given list of directories.
 build_directories() {
@@ -537,6 +545,7 @@
 
 # @FUNCTION: install_directories
 # @USAGE: < directories >
+# @INTERNAL
 # @DESCRIPTION:
 # Runs emake install in the given directories, which are separated by spaces.
 install_directories() {
@@ -563,6 +572,7 @@
 : ${QCONFIG_DEFINE:=}
 
 # @FUNCTION: install_qconfigs
+# @INTERNAL
 # @DESCRIPTION:
 # Install gentoo-specific mkspecs configurations.
 install_qconfigs() {
@@ -585,6 +595,7 @@
 }
 
 # @FUNCTION: generate_qconfigs
+# @INTERNAL
 # @DESCRIPTION:
 # Generates gentoo-specific qconfig.{h,pri}.
 generate_qconfigs() {
@@ -659,6 +670,7 @@
 }
 
 # @FUNCTION: skip_qmake_build
+# @INTERNAL
 # @DESCRIPTION:
 # Patches configure to skip qmake compilation, as it's already installed by qt-core.
 skip_qmake_build() {
@@ -666,6 +678,7 @@
 }
 
 # @FUNCTION: skip_project_generation
+# @INTERNAL
 # @DESCRIPTION:
 # Exit the script early by throwing in an exit before all of the .pro files are scanned.
 skip_project_generation() {
@@ -673,6 +686,7 @@
 }
 
 # @FUNCTION: symlink_binaries_to_buildtree
+# @INTERNAL
 # @DESCRIPTION:
 # Symlinks generated binaries to buildtree, so they can be used during compilation time.
 symlink_binaries_to_buildtree() {
@@ -682,6 +696,7 @@
 }
 
 # @FUNCTION: fix_library_files
+# @INTERNAL
 # @DESCRIPTION:
 # Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
 # moves the *.pc files into the pkgconfig directory.
@@ -786,6 +801,7 @@
 }
 
 # @FUNCTION: qt_assistant_cleanup
+# @INTERNAL
 # @DESCRIPTION:
 # Tries to clean up tools.pro for qt-assistant ebuilds.
 # Meant to be called in src_prepare().
@@ -815,6 +831,7 @@
 }
 
 # @FUNCTION: qt_nolibx11
+# @INTERNAL
 # @DESCRIPTION:
 # Ignore X11 tests for packages that don't need X libraries installed.
 qt_nolibx11() {

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

[Davide Pesavento (pesa)]

pesa        11/12/27 16:04:27

  Modified:             qt4-build.eclass
  Log:
  Reimplement qt_use() more concisely, fix/clarify doc.

Revision  Changes    Path
1.111                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- qt4-build.eclass	26 Dec 2011 11:59:19 -0000	1.110
+++ qt4-build.eclass	27 Dec 2011 16:04:27 -0000	1.111
@@ -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.110 2011/12/26 11:59:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.111 2011/12/27 16:04:27 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -726,23 +726,12 @@
 # @FUNCTION: qt_use
 # @USAGE: < flag > [ feature ] [ enableval ]
 # @DESCRIPTION:
-# This will echo "${enableval}-${feature}" if <flag> is enabled, or
-# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag>
+# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
+# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
 # will be used for that. If [enableval] is not specified, it omits the
-# assignment part.
+# "-${enableval}" part.
 qt_use() {
-	local flag=$1
-	local feature=$1
-	local enableval=
-
-	[[ -n $2 ]] && feature=$2
-	[[ -n $3 ]] && enableval=-$3
-
-	if use ${flag}; then
-		echo "${enableval}-${feature}"
-	else
-		echo "-no-${feature}"
-	fi
+	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
 }
 
 # @FUNCTION: qt_mkspecs_dir

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

[Davide Pesavento (pesa)]

pesa        12/01/01 18:12:03

  Modified:             qt4-build.eclass
  Log:
  Minor coding style cleanup.

Revision  Changes    Path
1.114                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- qt4-build.eclass	31 Dec 2011 00:46:04 -0000	1.113
+++ qt4-build.eclass	1 Jan 2012 18:12:03 -0000	1.114
@@ -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.113 2011/12/31 00:46:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.114 2012/01/01 18:12:03 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -238,7 +238,8 @@
 		CFLAGS='${CFLAGS}'\n\
 		CXXFLAGS='${CXXFLAGS}'\n\
 		LDFLAGS='${LDFLAGS}'\n" \
-		-i configure || die "sed SYSTEM_VARIABLES failed"
+		-i configure \
+		|| die "sed SYSTEM_VARIABLES failed"
 
 	# Respect CC, CXX, LINK and *FLAGS in config.tests
 	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
@@ -247,17 +248,22 @@
 			'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
+
 	# Bug 172219
 	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
 		# crippled (by design) :/
-		sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
+		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 mkspecs/common/mac-g++.conf \
+			|| die "sed mkspecs/common/mac-g++.conf failed"
 
 		# Fix configure's -arch settings that appear in qmake/Makefile and also
 		# fix arch handling (automagically duplicates our -arch arg and breaks
@@ -272,38 +278,35 @@
 			-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 -arch/-Xarch 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 deployment target failed"
+				-i configure mkspecs/common/mac-g++.conf \
+				|| die "sed deployment target failed"
 		fi
 	fi
 
 	# 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
-		sed \
-			-e "s|mac:LIBS += -liconv|LIBS += -liconv|g" \
+		sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
 			-i config.tests/unix/iconv/iconv.pro \
-			|| die "sed on iconv.pro failed"
+			|| die "sed iconv.pro failed"
 	fi
 
 	# we need some patches for Solaris
-	sed -i \
-		-e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
+	sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
 		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
 	# use GCC over SunStudio
 	sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
-	# don't flirt with non-Prefix stuff, we're quite possessive
+	# do not 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 mkspecs (bug 312689)
-	sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
-
 	base_src_prepare
 }
 
@@ -344,7 +347,7 @@
 			# We are crazy and build cocoa + qt3support :-)
 			if use qt3support; then
 				sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
-					-i configure
+					-i configure || die
 			fi
 
 			# We need the source's headers, not the installed ones.
@@ -394,7 +397,7 @@
 		dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
 
 		# Fake normal headers when frameworks are installed... eases life later on
-		local dest f
+		local dest f h
 		for frw in "${D}${QTLIBDIR}"/*.framework; do
 			[[ -e "${frw}"/Headers ]] || continue
 			f=$(basename ${frw})
@@ -423,7 +426,7 @@
 	fix_includes
 
 	# remove .la files since we are building only shared Qt libraries
-	find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
+	find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
 }
 
 # @FUNCTION: setqtenv

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

[Davide Pesavento (pesa)]

pesa        12/02/28 18:53:45

  Modified:             qt4-build.eclass
  Log:
  Minor cleanup.

Revision  Changes    Path
1.120                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- qt4-build.eclass	28 Feb 2012 18:19:29 -0000	1.119
+++ qt4-build.eclass	28 Feb 2012 18:53:45 -0000	1.120
@@ -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.119 2012/02/28 18:19:29 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.120 2012/02/28 18:53:45 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -198,7 +198,7 @@
 		symlink_binaries_to_buildtree
 	fi
 
-	if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
+	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
 		# qmake bus errors with -O2 but -O3 works
 		replace-flags -O2 -O3
 	fi
@@ -219,7 +219,7 @@
 	fi
 
 	# Unsupported old gcc versions - hardened needs this :(
-	if [[ $(gcc-major-version) -lt 4 ]] ; then
+	if [[ $(gcc-major-version) -lt 4 ]]; then
 		ewarn "Appending -fno-stack-protector to CXXFLAGS"
 		append-cxxflags -fno-stack-protector
 		# Bug 253127
@@ -284,7 +284,7 @@
 			|| die "sed -arch/-Xarch failed"
 
 		# On Snow Leopard don't fall back to 10.5 deployment target.
-		if [[ ${CHOST} == *-apple-darwin10 ]] ; then
+		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 \
@@ -294,7 +294,7 @@
 
 	# 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
+	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
 		sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
 			-i config.tests/unix/iconv/iconv.pro \
 			|| die "sed iconv.pro failed"
@@ -321,11 +321,11 @@
 
 	# this one is needed for all systems with a separate -liconv, apart from
 	# Darwin, for which the sources already cater for -liconv
-	use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
+	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
 		myconf+=" -liconv"
+	fi
 
 	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
 		myconf+=" ${glibflags//-pthread}"
@@ -341,22 +341,22 @@
 		myconf+=" -qpa"
 	fi
 
-	if use aqua ; then
+	if use aqua; then
 		# On (snow) leopard use the new (frameworked) cocoa code.
-		if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
+		if [[ ${CHOST##*-darwin} -ge 9 ]]; then
 			myconf+=" -cocoa -framework"
+			# We need the source's headers, not the installed ones.
+			myconf+=" -I${S}/include"
+			# Add hint for the framework location.
+			myconf+=" -F${QTLIBDIR}"
 
 			# We are crazy and build cocoa + qt3support :-)
 			if use qt3support; then
 				sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
 					-i configure || die
 			fi
-
-			# We need the source's headers, not the installed ones.
-			myconf+=" -I${S}/include"
-
-			# Add hint for the framework location.
-			myconf+=" -F${QTLIBDIR}"
+		else
+			myconf+=" -no-framework"
 		fi
 	else
 		# freetype2 include dir is non-standard, thus include it on configure
@@ -397,7 +397,7 @@
 # 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
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
 		# Some packages tend to include <Qt/...>
 		dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
 
@@ -465,7 +465,8 @@
 # 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}
+	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}
@@ -484,9 +485,7 @@
 	myconf+=" -no-separate-debug-info"
 
 	# exceptions USE flag
-	local exceptions="-exceptions"
-	in_iuse exceptions && exceptions="$(qt_use exceptions)"
-	myconf+=" ${exceptions}"
+	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"
@@ -501,8 +500,6 @@
 	#   -- Daniel Vergien
 	[[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
 
-	use aqua && myconf+=" -no-framework"
-
 	# 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

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

[Davide Pesavento (pesa)]

pesa        14/08/29 23:56:18

  Modified:             qt4-build.eclass
  Log:
  Update copyright year.

Revision  Changes    Path
1.155                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- qt4-build.eclass	11 Nov 2013 19:47:39 -0000	1.154
+++ qt4-build.eclass	29 Aug 2014 23:56:18 -0000	1.155
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.154 2013/11/11 19:47:39 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.155 2014/08/29 23:56:18 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:

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

[Davide Pesavento (pesa)]

pesa        14/11/17 01:31:41

  Modified:             qt4-build.eclass
  Log:
  Dead code removal and other simplifications.

Revision  Changes    Path
1.157                eclass/qt4-build.eclass

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

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- qt4-build.eclass	22 Sep 2014 00:03:25 -0000	1.156
+++ qt4-build.eclass	17 Nov 2014 01:31:41 -0000	1.157
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.156 2014/09/22 00:03:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.157 2014/11/17 01:31:41 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -14,27 +14,24 @@
 	*)	die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-if [[ ${PV} == *9999* ]]; then
-	QT4_BUILD_TYPE="live"
-	inherit git-r3
-else
-	QT4_BUILD_TYPE="release"
-fi
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="4"
 
-case ${QT4_BUILD_TYPE} in
-	live)
+case ${PV} in
+	4.?.9999)
+		QT4_BUILD_TYPE="live"
 		EGIT_REPO_URI=(
 			"git://gitorious.org/qt/qt.git"
 			"https://git.gitorious.org/qt/qt.git"
 		)
 		EGIT_BRANCH=${PV%.9999}
+		inherit git-r3
 		;;
-	release)
+	*)
+		QT4_BUILD_TYPE="release"
 		MY_P=qt-everywhere-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
 		S=${WORKDIR}/${MY_P}
@@ -42,10 +39,7 @@
 esac
 
 IUSE="aqua debug pch"
-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"
+[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
 
 DEPEND="virtual/pkgconfig"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
@@ -78,17 +72,32 @@
 	fi
 }
 
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing all the patches to be applied. This variable
+# is expected to be defined in the global scope of ebuilds. Make sure to
+# specify the full path. This variable is used in src_prepare phase.
+#
+# Example:
+# @CODE
+#	PATCHES=(
+#		"${FILESDIR}/mypatch.patch"
+#		"${FILESDIR}/patches_folder/"
+#	)
+# @CODE
+
 # @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Space-separated list including the directories that will be extracted from
-# Qt tarball.
+# Space-separated list of 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.
+# Space-separated list of directories that will be configured,
+# compiled, and installed. All paths must be relative to ${S}.
 
 # @FUNCTION: qt4-build_src_unpack
 # @DESCRIPTION:
@@ -96,13 +105,13 @@
 qt4-build_src_unpack() {
 	setqtenv
 
-	if ! version_is_at_least 4.4 $(gcc-version); then
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
 		ewarn
 		ewarn "Using a GCC version lower than 4.4 is not supported."
 		ewarn
 	fi
 
-	if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
+	if [[ ${PN} == qtwebkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			ewarn
@@ -135,19 +144,6 @@
 	esac
 }
 
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# 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_prepare() phase.
-#
-# @CODE
-#   PATCHES=( "${FILESDIR}/mypatch.patch"
-#             "${FILESDIR}/patches_folder/" )
-# @CODE
-
 # @FUNCTION: qt4-build_src_prepare
 # @DESCRIPTION:
 # Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix