# ChangeLog for x11-libs/qt-assistant
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.113 2011/11/26 19:57:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.114 2011/11/28 23:47:18 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -qt-assistant-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild,v 1.2 2011/05/12 19:11:59 grobian Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The assistant help module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="compat doc +glib qt3support trace"
-SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
-
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
- ~x11-libs/qt-webkit-${PV}[aqua=,debug=]
- ~x11-libs/qt-declarative-${PV}[debug=,qt3support=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- # Pixeltool isn't really assistant related, but it relies on
- # the assistant libraries. doc/qch/
- QT4_TARGET_DIRECTORIES="
- tools/assistant
- tools/pixeltool
- tools/qdoc3"
- QT4_EXTRACT_DIRECTORIES="
- tools/
- demos/
- examples/
- src/
- include/
- doc/"
-
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- tools/qttracereplay"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- ${QT4_EXTRACT_DIRECTORIES}"
- qt4-build_pkg_setup
-}
-
-src_unpack() {
- qt4-build_src_unpack
- # compat version
- # http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
- if use compat; then
- unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz
- mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \
- "${S}"/tools/assistant/compat ||
- die "moving compat to the right place failed"
- tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ ||
- die "unpacking the include files failed"
- fi
-}
-
-src_prepare() {
- qt4-build_src_prepare
- if use compat; then
- epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
- fi
-}
-
-src_configure() {
- myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
- -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-multimedia -no-svg $(qt_use qt3support)"
- ! use glib && myconf="${myconf} -no-glib"
- qt4-build_src_configure
-}
-
-src_compile() {
- # help libQtHelp find freshly built libQtCLucene (bug #289811)
- export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
- export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
-
- qt4-build_src_compile
-
- # ugly hack to build docs
- cd "${S}"
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
- emake qch_docs || die "emake qch_docs failed"
- if use doc; then
- emake docs || die "emake docs failed"
- fi
- qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-}
-
-src_install() {
- qt4-build_src_install
- cd "${S}"
- emake INSTALL_ROOT="${D}" install_qchdocs \
- || die "failed to install qch docs"
- if use doc; then
- emake INSTALL_ROOT="${D}" install_htmldocs \
- || die "failed to install htmldocs"
- fi
- dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3"
- # install correct assistant icon, bug 241208
- dodir /usr/share/pixmaps/ || die "dodir failed"
- insinto /usr/share/pixmaps/
- doins tools/assistant/tools/assistant/images/assistant.png ||
- die "doins failed"
- # Note: absolute image path required here!
- make_desktop_entry "${EPREFIX}"/usr/bin/assistant Assistant \
- "${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' ||
- die "make_desktop_entry failed"
-
- if use compat; then
- insinto /usr/share/qt4/mkspecs/features || die "insinto failed"
- doins tools/assistant/compat/features/assistant.prf || die "doins failed"
- fi
-}
# ChangeLog for x11-libs/qt-core
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.146 2011/11/28 20:48:24 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.147 2011/11/28 23:47:53 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -files/qt-4.5-nolibx11.diff,
+ -qt-core-4.7.3-r1.ebuild, -qt-core-4.7.3.ebuild:
+ Remove Qt 4.7.3
*qt-core-4.7.4-r1 (28 Nov 2011)
+++ /dev/null
-diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure
---- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300
-+++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300
-@@ -4733,14 +4733,6 @@
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.3-r1.ebuild,v 1.1 2011/09/08 08:14:47 wired Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl"
-
-RDEPEND="sys-libs/zlib
- glib? ( dev-libs/glib )
- ssl? ( dev-libs/openssl )
- !<x11-libs/qt-4.4.0:4"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )"
-
-PATCHES=(
- # bug 382171
- "${FILESDIR}/blacklist-diginotar-certs.diff"
-)
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/xml
- src/network
- src/plugins/codecs
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
- QT4_EXTRACT_DIRECTORIES="
- include/Qt
- include/QtCore
- include/QtDeclarative
- include/QtGui
- include/QtNetwork
- include/QtScript
- include/QtXml
- src/plugins/plugins.pro
- src/plugins/qpluginbase.pri
- src/src.pro
- src/3rdparty/des
- src/3rdparty/harfbuzz
- src/3rdparty/md4
- src/3rdparty/md5
- src/3rdparty/sha1
- src/3rdparty/easing
- src/3rdparty/zlib_dependency.pri
- src/declarative
- src/gui
- src/script
- tools/shared
- tools/linguist/shared
- translations"
- qt4-build_pkg_setup
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- ${QT4_EXTRACT_DIRECTORIES}"
-}
-
-src_prepare() {
- # Don't pre-strip, bug 235026
- for i in kr jp cn tw ; do
- echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
- done
-
- qt4-build_src_prepare
-
- # bug 172219
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
- sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-}
-
-src_configure() {
- unset QMAKESPEC
-
- myconf="${myconf}
- $(qt_use glib)
- $(qt_use iconv)
- $(qt_use optimized-qmake)
- $(qt_use ssl openssl)
- $(qt_use qt3support)
- $(qt_use jit javascript-jit)"
-
- myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
- -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
- -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
- -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl
- -no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
- -no-cups -no-xsync -no-xinput -no-multimedia"
- qt4-build_src_configure
-}
-
-src_compile() {
- # bug 259736
- unset QMAKESPEC
- qt4-build_src_compile
-}
-
-src_install() {
- dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
-
- install_directories src/{corelib,xml,network,plugins/codecs}
-
- emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
-
- #install private headers
- if use private-headers; then
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
- fi
- # use freshly built libraries
- local DYLD_FPATH=
- [[ -d "${S}"/lib/QtCore.framework ]] \
- && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
- || die "generating translations faied"
- insinto ${QTTRANSDIR#${EPREFIX}}
- doins translations/*.qm || die "doins translations failed"
-
- setqtenv
- fix_library_files
-
- # List all the multilib libdirs
- local libdirs=
- for libdir in $(get_all_libdirs); do
- libdirs+=:${EPREFIX}/usr/${libdir}/qt4
- done
-
- cat <<-EOF > "${T}/44qt4"
- LDPATH="${libdirs:1}"
- EOF
- doenvd "${T}/44qt4"
-
- dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed"
- mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die "Failed to move qconfig.pri"
-
- # Framework hacking
- if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
- #TODO do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
- || die "sed for qconfig.h failed."
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo ||
- die "dosym failed"
- else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
- || die "sed for qconfig.h failed"
- fi
-
- if use glib; then
- QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
- $(use ssl && echo QT_OPENSSL)"
- install_qconfigs
- fi
- # remove .la files
- find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
- # remove some unnecessary headers
- rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
-qatomic_windows.h,\
-qatomic_windowsce.h,\
-qt_windows.h}
-
- keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
- # Framework magic
- fix_includes
-}
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.3.ebuild,v 1.2 2011/05/10 21:40:09 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl"
-
-RDEPEND="sys-libs/zlib
- glib? ( dev-libs/glib )
- ssl? ( dev-libs/openssl )
- !<x11-libs/qt-4.4.0:4"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/tools/uic
- src/corelib
- src/xml
- src/network
- src/plugins/codecs
- tools/linguist/lconvert
- tools/linguist/lrelease
- tools/linguist/lupdate"
-
- QT4_EXTRACT_DIRECTORIES="
- include/Qt
- include/QtCore
- include/QtDeclarative
- include/QtGui
- include/QtNetwork
- include/QtScript
- include/QtXml
- src/plugins/plugins.pro
- src/plugins/qpluginbase.pri
- src/src.pro
- src/3rdparty/des
- src/3rdparty/harfbuzz
- src/3rdparty/md4
- src/3rdparty/md5
- src/3rdparty/sha1
- src/3rdparty/easing
- src/3rdparty/zlib_dependency.pri
- src/declarative
- src/gui
- src/script
- tools/shared
- tools/linguist/shared
- translations"
- qt4-build_pkg_setup
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- ${QT4_EXTRACT_DIRECTORIES}"
-}
-
-src_prepare() {
- # Don't pre-strip, bug 235026
- for i in kr jp cn tw ; do
- echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
- done
-
- qt4-build_src_prepare
-
- # bug 172219
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
- sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-}
-
-src_configure() {
- unset QMAKESPEC
-
- myconf="${myconf}
- $(qt_use glib)
- $(qt_use iconv)
- $(qt_use optimized-qmake)
- $(qt_use ssl openssl)
- $(qt_use qt3support)
- $(qt_use jit javascript-jit)"
-
- myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
- -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
- -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
- -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl
- -no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
- -no-cups -no-xsync -no-xinput -no-multimedia"
- qt4-build_src_configure
-}
-
-src_compile() {
- # bug 259736
- unset QMAKESPEC
- qt4-build_src_compile
-}
-
-src_install() {
- dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
-
- install_directories src/{corelib,xml,network,plugins/codecs}
-
- emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
-
- #install private headers
- if use private-headers; then
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
- fi
- # use freshly built libraries
- local DYLD_FPATH=
- [[ -d "${S}"/lib/QtCore.framework ]] \
- && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
- || die "generating translations faied"
- insinto ${QTTRANSDIR#${EPREFIX}}
- doins translations/*.qm || die "doins translations failed"
-
- setqtenv
- fix_library_files
-
- # List all the multilib libdirs
- local libdirs=
- for libdir in $(get_all_libdirs); do
- libdirs+=:${EPREFIX}/usr/${libdir}/qt4
- done
-
- cat <<-EOF > "${T}/44qt4"
- LDPATH="${libdirs:1}"
- EOF
- doenvd "${T}/44qt4"
-
- dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed"
- mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die "Failed to move qconfig.pri"
-
- # Framework hacking
- if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
- #TODO do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
- || die "sed for qconfig.h failed."
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo ||
- die "dosym failed"
- else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
- || die "sed for qconfig.h failed"
- fi
-
- if use glib; then
- QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
- $(use ssl && echo QT_OPENSSL)"
- install_qconfigs
- fi
- # remove .la files
- find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
- # remove some unnecessary headers
- rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
-qatomic_windows.h,\
-qatomic_windowsce.h,\
-qt_windows.h}
-
- keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
- # Framework magic
- fix_includes
-}
# ChangeLog for x11-libs/qt-dbus
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.95 2011/11/26 20:00:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.96 2011/11/28 23:48:27 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -files/qt-4.5-nolibx11.diff,
+ -qt-dbus-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure
---- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300
-+++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300
-@@ -4733,14 +4733,6 @@
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.7.3.ebuild,v 1.3 2011/05/17 20:51:23 jer Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]
- >=sys-apps/dbus-1.0.2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/dbus
- tools/qdbus/qdbus
- tools/qdbus/qdbusxml2cpp
- tools/qdbus/qdbuscpp2xml"
- QCONFIG_ADD="dbus dbus-linked"
- QCONFIG_DEFINE="QT_DBUS"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtDBus
- include/QtXml
- src/corelib
- src/xml"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -dbus-linked"
- qt4-build_src_configure
-}
# ChangeLog for x11-libs/qt-declarative
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.30 2011/11/26 20:00:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.31 2011/11/28 23:48:57 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -qt-declarative-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.3.ebuild,v 1.2 2011/05/12 19:09:42 grobian Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="private-headers qt3support webkit"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,qt3support=]
- ~x11-libs/qt-opengl-${PV}[aqua=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=]
- ~x11-libs/qt-sql-${PV}[aqua=,qt3support=]
- ~x11-libs/qt-svg-${PV}[aqua=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=]
- qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=] )
- webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=] )
- "
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QCONFIG_ADD="declarative"
-
- QT4_TARGET_DIRECTORIES="
- src/declarative
- src/imports
- tools/designer/src/plugins/qdeclarativeview
- tools/qml"
-
- if use webkit; then
- QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- src/3rdparty/webkit/WebKit/qt/declarative"
- fi
-
- QT4_EXTRACT_DIRECTORIES="
- include/
- src/
- tools/"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -declarative $(qt_use qt3support) $(qt_use webkit)"
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
- if use private-headers; then
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
- # ran for the 2nd time, need it for the updated headers
- fix_includes
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
- fi
- find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
- fi
-}
# ChangeLog for x11-libs/qt-demo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.75 2011/11/26 20:00:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.76 2011/11/28 23:45:17 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org>
+ -files/qt-demo-4.5.0-fixes.patch, -qt-demo-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
---- demos/shared/arthurwidgets.cpp 2009-02-25 23:09:13.000000000 +0200
-+++ demos/shared/arthurwidgets.cpp 2009-03-05 02:31:04.290106276 +0200
-@@ -51,7 +51,7 @@
- #include <QTextBrowser>
- #include <QBoxLayout>
-
--#include <private/qpixmapdata_p.h>
-+#include "../../include/QtGui/private/qpixmapdata_p.h"
-
- extern QPixmap cached(const QString &img);
-
---- examples/tools/plugandpaint/plugandpaint.pro 2009-02-25 23:09:15.000000000 +0200
-+++ examples/tools/plugandpaint/plugandpaint.pro 2009-03-05 02:31:45.372350805 +0200
-@@ -7,7 +7,7 @@
- mainwindow.cpp \
- paintarea.cpp \
- plugindialog.cpp
--LIBS = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools
-+LIBS += -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -L plugins/ -lpnp_basictools
-
- if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
- mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.3.ebuild,v 1.1 2011/05/10 20:05:38 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="Demonstration module of the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="kde qt3support"
-
-DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
- ~x11-libs/qt-core-${PV}:${SLOT}[aqua=,qt3support=]
- ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=]
- ~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,webkit]
- ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,qt3support=]
- ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
- ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,qt3support=]
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=]
- media-libs/phonon[aqua=] ) )
- kde? ( media-libs/phonon[aqua=] )
- ~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
- ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,qt3support=]
- ~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]
- ~x11-libs/qt-test-${PV}:${SLOT}[aqua=]
- ~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=]
- ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=]"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.6-plugandpaint.patch" )
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="demos
- examples"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- doc/src/images
- src/
- include/
- tools/"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use qt3support)"
- qt4-build_src_configure
-}
-
-src_install() {
- insinto "${QTDOCDIR#${EPREFIX}}"/src
- doins -r "${S}"/doc/src/images || die "Installing images failed."
-
- qt4-build_src_install
-}
# ChangeLog for x11-libs/qt-gui
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.156 2011/11/28 22:52:01 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.157 2011/11/28 23:49:33 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -qt-gui-4.7.3-r1.ebuild,
+ -qt-gui-4.7.3.ebuild:
+ Remove Qt 4.7.3
28 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt-gui-4.7.4.ebuild,
qt-gui-4.7.4-r1.ebuild:
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild,v 1.2 2011/11/12 12:16:34 jlec Exp $
-
-EAPI="3"
-inherit confutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt3support raster tiff trace xinerama"
-
-RDEPEND="media-libs/fontconfig
- media-libs/freetype:2
- virtual/jpeg
- media-libs/libpng:0
- sys-libs/zlib
- ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,debug=]
- !aqua? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/libXfont
- x11-libs/libSM
- x11-libs/libXi
- )
- cups? ( net-print/cups )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
- gtkstyle? ( x11-libs/gtk+:2[aqua=] )
- mng? ( >=media-libs/libmng-1.0.9 )
- nas? ( >=media-libs/nas-1.5 )
- tiff? ( media-libs/tiff:0 )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- !aqua? (
- x11-proto/xextproto
- x11-proto/inputproto
- )
- xinerama? ( x11-proto/xineramaproto )"
-RDEPEND="${RDEPEND}
- !~x11-themes/qgtkstyle-4.7.2"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.3-cups.patch" )
-
-pkg_setup() {
- if ! use qt3support; then
- ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
- fi
-
- confutils_use_depend_all gtkstyle glib
-
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- tools/designer
- tools/linguist/linguist
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/inputmethods"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools/linguist/phrasebooks
- tools/linguist/shared
- tools/shared"
-
- use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
- use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
- use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- # Don't build plugins this go around, because they depend on qt3support lib
- sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
-}
-
-src_configure() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- myconf="$(qt_use accessibility)
- $(qt_use cups)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use dbus qdbus)
- $(qt_use dbus)
- $(qt_use egl)
- $(qt_use qt3support)
- $(qt_use gtkstyle)
- $(qt_use xinerama)"
-
- use nas && myconf="${myconf} -system-nas-sound"
- use raster && myconf="${myconf} -graphicssystem raster"
-
- myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
- -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
- -no-phonon -no-opengl"
-
- qt4-build_src_configure
-
- if use gtkstyle; then
- einfo "patching the Makefile to fix qgtkstyle compilation"
- sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
- die "sed failed"
- fi
- einfo "patching the Makefile to fix bug #361277"
- sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile ||
- die "sed failed"
-}
-
-src_install() {
- QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
- $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
- gif png system-png system-jpeg
- $(use mng && echo system-mng)
- $(use tiff && echo system-tiff)"
- QCONFIG_REMOVE="no-gif no-png"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
- $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
- $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-
- qt4-build_src_install
-
- # remove unnecessary Windows headers
- rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/qwindowdefs_win.h
- # remove Mac OS X headers
- use aqua || rm -f \
- "${D}${QTHEADERDIR}"/{Qt,QtGui}/qmacstyle_mac.h \
- "${D}${QTHEADERDIR}"/QtGui/QMacStyle
-
- # qt-creator
- # some qt-creator headers are located
- # under /usr/include/qt4/QtDesigner/private.
- # those headers are just includes of the headers
- # which are located under tools/designer/src/lib/*
- # So instead of installing both, we create the private folder
- # and drop tools/designer/src/lib/* headers in it.
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
- fi
- doins "${S}"/tools/designer/src/lib/shared/* || die
- doins "${S}"/tools/designer/src/lib/sdk/* || die
- #install private headers
- if use private-headers; then
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
- fi
- find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
- fi
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- # rerun to get links to headers right
- fix_includes
- fi
-
- # install correct designer and linguist icons, bug 241208
- doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
- tools/designer/src/designer/images/designer.png \
- || die "doicon failed"
- # Note: absolute image path required here!
- make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
- "${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
- 'Qt;Development;GUIDesigner' \
- || die "linguist make_desktop_entry failed"
- make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
- "${EPREFIX}"/usr/share/pixmaps/designer.png \
- 'Qt;Development;GUIDesigner' \
- || die "designer make_desktop_entry failed"
-}
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.3.ebuild,v 1.2 2011/11/12 12:16:34 jlec Exp $
-
-EAPI="3"
-inherit confutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt3support raster tiff trace xinerama"
-
-RDEPEND="media-libs/fontconfig
- media-libs/freetype:2
- virtual/jpeg
- media-libs/libpng:0
- sys-libs/zlib
- ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
- ~x11-libs/qt-script-${PV}[aqua=,debug=]
- !aqua? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/libXfont
- x11-libs/libSM
- x11-libs/libXi
- )
- cups? ( net-print/cups )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
- gtkstyle? ( x11-libs/gtk+:2[aqua=] )
- mng? ( >=media-libs/libmng-1.0.9 )
- nas? ( >=media-libs/nas-1.5 )
- tiff? ( media-libs/tiff:0 )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- !aqua? (
- x11-proto/xextproto
- x11-proto/inputproto
- )
- xinerama? ( x11-proto/xineramaproto )"
-RDEPEND="${RDEPEND}
- !~x11-themes/qgtkstyle-4.7.2"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
-
-pkg_setup() {
- if ! use qt3support; then
- ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
- fi
-
- confutils_use_depend_all gtkstyle glib
-
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- tools/designer
- tools/linguist/linguist
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/inputmethods"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools/linguist/phrasebooks
- tools/linguist/shared
- tools/shared"
-
- use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
- use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
- use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
- use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
- use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- # Don't build plugins this go around, because they depend on qt3support lib
- sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
-}
-
-src_configure() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- myconf="$(qt_use accessibility)
- $(qt_use cups)
- $(qt_use glib)
- $(qt_use mng libmng system)
- $(qt_use nis)
- $(qt_use tiff libtiff system)
- $(qt_use dbus qdbus)
- $(qt_use dbus)
- $(qt_use egl)
- $(qt_use qt3support)
- $(qt_use gtkstyle)
- $(qt_use xinerama)"
-
- use nas && myconf="${myconf} -system-nas-sound"
- use raster && myconf="${myconf} -graphicssystem raster"
-
- myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
- -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
- -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
- -no-phonon -no-opengl"
-
- qt4-build_src_configure
-
- if use gtkstyle; then
- einfo "patching the Makefile to fix qgtkstyle compilation"
- sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
- die "sed failed"
- fi
- einfo "patching the Makefile to fix bug #361277"
- sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile ||
- die "sed failed"
-}
-
-src_install() {
- QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
- $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
- gif png system-png system-jpeg
- $(use mng && echo system-mng)
- $(use tiff && echo system-tiff)"
- QCONFIG_REMOVE="no-gif no-png"
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
- $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
- $(use mng && echo QT_IMAGEFORMAT_MNG)
- $(use nas && echo QT_NAS)
- $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
- $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
- $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-
- qt4-build_src_install
-
- # remove unnecessary Windows headers
- rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/qwindowdefs_win.h
- # remove Mac OS X headers
- use aqua || rm -f \
- "${D}${QTHEADERDIR}"/{Qt,QtGui}/qmacstyle_mac.h \
- "${D}${QTHEADERDIR}"/QtGui/QMacStyle
-
- # qt-creator
- # some qt-creator headers are located
- # under /usr/include/qt4/QtDesigner/private.
- # those headers are just includes of the headers
- # which are located under tools/designer/src/lib/*
- # So instead of installing both, we create the private folder
- # and drop tools/designer/src/lib/* headers in it.
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
- fi
- doins "${S}"/tools/designer/src/lib/shared/* || die
- doins "${S}"/tools/designer/src/lib/sdk/* || die
- #install private headers
- if use private-headers; then
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
- else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
- fi
- find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
- fi
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
- # rerun to get links to headers right
- fix_includes
- fi
-
- # install correct designer and linguist icons, bug 241208
- doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
- tools/designer/src/designer/images/designer.png \
- || die "doicon failed"
- # Note: absolute image path required here!
- make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
- "${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
- 'Qt;Development;GUIDesigner' \
- || die "linguist make_desktop_entry failed"
- make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
- "${EPREFIX}"/usr/share/pixmaps/designer.png \
- 'Qt;Development;GUIDesigner' \
- || die "designer make_desktop_entry failed"
-}
# ChangeLog for x11-libs/qt-multimedia
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.44 2011/11/26 20:01:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.45 2011/11/28 23:50:06 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -qt-multimedia-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.7.3.ebuild,v 1.1 2011/05/10 20:06:24 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Qt multimedia module"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="iconv"
-
-DEPEND="!aqua? ( media-libs/alsa-lib )
- ~x11-libs/qt-core-${PV}[aqua=,debug=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/multimedia"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtGui/
- include/QtMultimedia/
- include/QtNetwork/
- src/src.pro
- src/3rdparty/
- src/corelib/
- src/gui/
- src/network/
- src/plugins/
- src/tools/"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
- -no-sql-sqlite2 -no-sql-odbc -no-glib -no-opengl -no-svg -no-gtkstyle
- -no-phonon-backend -no-script -no-scripttools -no-cups -no-xsync
- -no-xinput"
-
- qt4-build_src_configure
-}
# ChangeLog for x11-libs/qt-opengl
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.94 2011/11/26 20:02:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.95 2011/11/28 23:50:40 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -qt-opengl-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.7.3.ebuild,v 1.1 2011/05/10 20:06:45 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="egl qt3support"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qt3support=]
- virtual/opengl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/opengl
- src/plugins/graphicssystems/opengl"
-
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenGL
- src/corelib
- src/gui
- src/opengl
- src/plugins
- src/3rdparty"
-
- QCONFIG_ADD="opengl"
- QCONFIG_DEFINE="QT_OPENGL $(use egl && echo QT_EGL)"
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -opengl
- $(qt_use qt3support)
- $(qt_use egl)"
-
- qt4-build_src_configure
-
- # Not building tools/designer/src/plugins/tools/view3d as it's
- # commented out of the build in the source
-}
# ChangeLog for x11-libs/qt-phonon
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.99 2011/11/26 20:02:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.100 2011/11/28 23:51:38 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -qt-phonon-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.7.3.ebuild,v 1.1 2011/05/10 20:07:06 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="dbus qt3support"
-
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=]
- !kde-base/phonon-kde
- !kde-base/phonon-xine
- !media-libs/phonon
- !media-sound/phonon
- !aqua? ( media-libs/gstreamer
- media-plugins/gst-plugins-meta )
- aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,qt3support=] )
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon
- tools/designer/src/plugins/phononwidgets"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/
- src
- tools"
-
- QCONFIG_ADD="phonon"
- use aqua || QCONFIG_DEFINE="QT_GSTREAMER"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg
- $(qt_use dbus qdbus)
- $(qt_use qt3support)"
-
- qt4-build_src_configure
-}
# ChangeLog for x11-libs/qt-qt3support
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.99 2011/11/26 20:03:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.100 2011/11/28 23:52:10 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -qt-qt3support-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.3.ebuild,v 1.1 2011/05/10 20:07:28 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Qt3 support module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+accessibility kde phonon"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support]
- ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support]
- ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support]
- phonon? (
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}[aqua=,debug=]
- media-libs/phonon[aqua=,gstreamer] ) )
- kde? ( media-libs/phonon[aqua=,gstreamer] ) )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/qt3support
- src/tools/uic3
- tools/designer/src/plugins/widgets
- tools/porting"
-
- QT4_EXTRACT_DIRECTORIES="src include tools"
-
- # mac version does not contain qtconfig?
- [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -qt3support
- $(qt_use phonon gstreamer)
- $(qt_use phonon)
- $(qt_use accessibility)"
- qt4-build_src_configure
-}
# ChangeLog for x11-libs/qt-script
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.97 2011/11/26 20:03:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.98 2011/11/28 23:52:43 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -files/qt-4.5-nolibx11.diff,
+ -qt-script-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure
---- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300
-+++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300
-@@ -4733,14 +4733,6 @@
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.7.3.ebuild,v 1.1 2011/05/10 20:07:48 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="iconv +jit private-headers"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/script/"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtScript/
- src/3rdparty/javascriptcore/
- src/corelib/"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) $(qt_use jit javascript-jit) -no-xkb
- -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
- -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
- -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
- -no-gtkstyle"
- qt4-build_src_configure
-}
-
-src_install() {
- qt4-build_src_install
- #install private headers
- if use private-headers; then
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
- find "${S}"/src/script -type f -name "*_p.h" -exec doins {} \;
- fi
-}
# ChangeLog for x11-libs/qt-sql
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.114 2011/11/26 20:03:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.115 2011/11/28 23:53:23 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -files/qt-4.5-nolibx11.diff,
+ -files/qt-sql-4.7.1_postgres_9.patch, -qt-sql-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure
---- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300
-+++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300
-@@ -4733,14 +4733,6 @@
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+++ /dev/null
---- qt-everywhere-opensource-src-4.7.1/src/sql/drivers/psql/qsql_psql.cpp 2010-09-10 11:05:25.000000000 +0200
-+++ qsql_psql.cpp 2010-11-03 12:37:55.966977333 +0100
-@@ -661,6 +661,17 @@
- break;
- }
- break;
-+ case 9:
-+ switch (vMin) {
-+ case 0:
-+ serverVersion = QPSQLDriver::Version9;
-+ break;
-+ default:
-+ serverVersion = QPSQLDriver::Version9;
-+ break;
-+ }
-+ break;
-+
- default:
- break;
- }
-@@ -852,7 +863,8 @@
- // This hack can dissapear once there is an API to query this sort of information.
- if (d->pro == QPSQLDriver::Version8 ||
- d->pro == QPSQLDriver::Version81 ||
-- d->pro == QPSQLDriver::Version82) {
-+ d->pro == QPSQLDriver::Version82 ||
-+ d->pro == QPSQLDriver::Version9) {
- transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0;
- }
-
-@@ -963,6 +975,7 @@
- case QPSQLDriver::Version8:
- case QPSQLDriver::Version81:
- case QPSQLDriver::Version82:
-+ case QPSQLDriver::Version9:
- stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
- "pg_class.relname "
- "FROM pg_attribute, pg_class "
-@@ -1046,6 +1059,7 @@
- case QPSQLDriver::Version8:
- case QPSQLDriver::Version81:
- case QPSQLDriver::Version82:
-+ case QPSQLDriver::Version9:
- stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
- "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
- "pg_attrdef.adsrc "
---- qt-everywhere-opensource-src-4.7.1/src/sql/drivers/psql/qsql_psql.h 2010-09-10 11:05:25.000000000 +0200
-+++ qsql_psql.h 2010-11-03 12:36:16.380310668 +0100
-@@ -104,7 +104,8 @@
- Version74 = 10,
- Version8 = 11,
- Version81 = 12,
-- Version82 = 13
-+ Version82 = 13,
-+ Version9 = 14
- };
-
- explicit QPSQLDriver(QObject *parent=0);
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.7.3.ebuild,v 1.1 2011/05/10 20:08:10 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="firebird freetds iconv mysql odbc postgres qt3support +sqlite"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
- firebird? ( dev-db/firebird )
- freetds? ( dev-db/freetds )
- mysql? ( virtual/mysql )
- odbc? ( dev-db/unixODBC )
- postgres? ( dev-db/postgresql-base )
- sqlite? ( dev-db/sqlite:3 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtSql/
- include/QtScript/
- src/src.pro
- src/corelib/
- src/plugins
- src/3rdparty
- src/tools"
-
- if ! ( use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite );
- then
- ewarn "You need to enable at least one SQL driver. Enable at least"
- ewarn "one of these USE flags: \"firebird freetds mysql odbc postgres sqlite tds\"."
- die "Enable at least one SQL driver."
- fi
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- qt4-build_src_prepare
-
- sed -e '/pg_config --libs/d' -i "${S}"/configure \
- || die "sed to fix postgresql usage in ./configure failed"
-}
-
-src_configure() {
- # Don't support sqlite2 anymore
- myconf="${myconf} -no-sql-sqlite2
- $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql ")
- $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql ")
- $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo '-system-sqlite')
- $(qt_use odbc sql-odbc plugin)
- $(qt_use freetds sql-tds plugin)
- $(qt_use firebird sql-ibase plugin)
- $(qt_use qt3support)"
-
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-fontconfig -no-glib -no-opengl -no-svg -no-gtkstyle"
-
- qt4-build_src_configure
-}
# ChangeLog for x11-libs/qt-svg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.94 2011/11/26 20:04:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.95 2011/11/28 23:53:55 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -qt-svg-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.7.3.ebuild,v 1.1 2011/05/10 20:08:36 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+accessibility iconv"
-
-DEPEND="~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/svg
- src/plugins/imageformats/svg
- src/plugins/iconengines/svgiconengine"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtSvg/
- include/Qt/
- include/QtGui/
- include/QtCore/
- include/QtXml/
- src/corelib/
- src/gui/
- src/plugins/
- src/xml
- src/3rdparty"
-
- QCONFIG_ADD="svg"
- QCONFIG_DEFINE="QT_SVG"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -svg
- $(qt_use iconv)
- $(qt_use accessibility)
- -no-xkb -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-fontconfig -no-glib -no-gtkstyle"
- qt4-build_src_configure
-}
# ChangeLog for x11-libs/qt-test
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.92 2011/11/26 20:04:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.93 2011/11/28 23:54:28 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -files/qt-4.5-nolibx11.diff,
+ -qt-test-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure
---- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300
-+++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300
-@@ -4733,14 +4733,6 @@
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.7.3.ebuild,v 1.1 2011/05/10 20:08:56 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The testing framework module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="iconv"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/testlib"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtTest/
- include/QtCore/
- src/corelib/"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender
- -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
- -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg"
- qt4-build_src_configure
-}
# ChangeLog for x11-libs/qt-webkit
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.125 2011/11/26 20:05:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.126 2011/11/28 23:55:02 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org>
+ -files/30_webkit_unaligned_access.diff,
+ -files/qt-webkit-4.5.3-no-javascript-crash.patch, -qt-webkit-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-From: Mike Hommey <glandium@debian.org>
-Date: Sun, 6 Jul 2008 08:37:28 +0000 (+0200)
-Subject: Fixed some alignment problems on sparc
-X-Git-Tag: debian/1.0.1-1~7
-X-Git-Url: http://git.debian.org/?p=pkg-webkit%2Fwebkit.git;a=commitdiff_plain;h=11c220f6d31898a7a1dfafd5d96619fefe6ba597;hp=1db04c3a5c8c3e9c990b93836d5bb09d43a47921
-
-Fixed some alignment problems on sparc
-
-(and some that might occur on arm, too).
-
-Some compiler warnings about alignment remain, but I don't know if they are
-a real problem yet.
----
-
---- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
-+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -1936,13 +1936,13 @@ static TCMalloc_Central_FreeListPadded c
-
- // Page-level allocator
- static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
--static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
-+static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
- static bool phinited = false;
-
- // Avoid extra level of indirection by making "pageheap" be just an alias
- // of pageheap_memory.
- typedef union {
-- void* m_memory;
-+ uint64_t* m_memory;
- TCMalloc_PageHeap* m_pageHeap;
- } PageHeapUnion;
-
---- a/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
-+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@ namespace WTF {
- : m_freeList(pool())
- , m_isDoneWithInitialFreeList(false)
- {
-- memset(m_pool.pool, 0, sizeof(m_pool.pool));
-+ memset(m_pool, 0, sizeof(m_pool));
- }
-
- Node* allocate()
-@@ -171,7 +171,7 @@ namespace WTF {
- }
-
- private:
-- Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+ Node* pool() { return reinterpret_cast<Node*>(m_pool); }
- Node* pastPool() { return pool() + m_poolSize; }
-
- bool inPool(Node* node)
-@@ -182,10 +182,7 @@ namespace WTF {
- Node* m_freeList;
- bool m_isDoneWithInitialFreeList;
- static const size_t m_poolSize = 256;
-- union {
-- char pool[sizeof(Node) * m_poolSize];
-- double forAlignment;
-- } m_pool;
-+ uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
- };
-
- template<typename ValueArg> struct ListHashSetNode {
---- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -233,6 +233,23 @@
- # endif
- #endif
-
-+/* PLATFORM(SPARC) */
-+#if defined(__sparc__) \
-+ || defined(__sparc)
-+#define WTF_PLATFORM_SPARC 1
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#endif
-+
-+/* For undefined platforms */
-+#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
-+#include <sys/param.h>
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#elif __BYTE_ORDER == __PDP_ENDIAN
-+#define WTF_PLATFORM_MIDDLE_ENDIAN 1
-+#endif
-+#endif
-+
- /* Compiler */
-
- /* COMPILER(MSVC) */
---- a/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
-+++ b/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
-@@ -101,7 +101,7 @@ static inline bool equal(StringImpl* str
- if (string->length() != length)
- return false;
-
--#if PLATFORM(ARM)
-+#if PLATFORM(ARM) || PLATFORM(SPARC)
- const UChar* stringCharacters = string->characters();
- for (unsigned i = 0; i != length; ++i) {
- if (*stringCharacters++ != *characters++)
---- a/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
-+++ b/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
-@@ -47,6 +47,15 @@ namespace WebCore {
- if (aLength != bLength)
- return false;
-
-+#if PLATFORM(ARM) || PLATFORM(SPARC)
-+ const UChar* aChars = a->characters();
-+ const UChar* bChars = b->characters();
-+ for (unsigned i = 0; i != aLength; ++i)
-+ if (*aChars++ != *bChars++)
-+ return false;
-+
-+ return true;
-+#else
- const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters());
- const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters());
-
-@@ -59,6 +68,7 @@ namespace WebCore {
- return false;
-
- return true;
-+#endif
- }
-
- static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); }
+++ /dev/null
---- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
-+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
-@@ -317,4 +317,6 @@
- javaScriptWindowObjectCleared() signal.
-
-+ If Javascript is not enabled for this page, then this method does nothing.
-+
- The \a object will never be explicitly deleted by QtWebKit.
- */
-@@ -339,8 +341,13 @@
- javaScriptWindowObjectCleared() signal.
-
-+ If Javascript is not enabled for this page, then this method does nothing.
-+
- The ownership of \a object is specified using \a own.
- */
- void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object, QScriptEngine::ValueOwnership ownership)
- {
-+ if (!page()->settings()->testAttribute(QWebSettings::JavascriptEnabled))
-+ return;
-+
- JSC::JSLock lock(false);
- JSDOMWindow* window = toJSDOMWindow(d->frame);
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.7.3.ebuild,v 1.1 2011/05/10 20:09:22 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Webkit module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="dbus +jit kde"
-
-DEPEND="
- dev-db/sqlite:3
- ~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
- ~x11-libs/qt-gui-${PV}[aqua=,dbus?,debug=]
- ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=]
- media-libs/phonon[aqua=] ) )
- kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/3rdparty/webkit/JavaScriptCore
- src/3rdparty/webkit/WebCore
- tools/designer/src/plugins/qwebview"
- QT4_EXTRACT_DIRECTORIES="
- include/
- src/
- tools/"
-
- QCONFIG_ADD="webkit"
- QCONFIG_DEFINE="QT_WEBKIT"
-
- qt4-build_pkg_setup
-}
-
-src_prepare() {
- [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
-
- qt4-build_src_prepare
-}
-
-src_configure() {
- myconf="${myconf} -webkit -system-sqlite $(qt_use jit javascript-jit) $(qt_use dbus qdbus)"
- qt4-build_src_configure
-}
# ChangeLog for x11-libs/qt-xmlpatterns
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.92 2011/11/26 20:05:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.93 2011/11/28 23:55:35 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -files/qt-4.5-nolibx11.diff,
+ -qt-xmlpatterns-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
+++ /dev/null
-diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure
---- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300
-+++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300
-@@ -4733,14 +4733,6 @@
- X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
- fi
-
-- # Check we actually have X11 :-)
-- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
-- echo "Basic XLib functionality test failed!"
-- echo " You might need to modify the include and library search paths by editing"
-- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
-- exit 1
-- fi
--
- # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.3.ebuild,v 1.1 2011/05/10 20:09:44 tampakrap Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The patternist module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,exceptions]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtNetwork
- include/QtXml
- include/QtXmlPatterns
- src/network/
- src/xml/
- src/corelib/"
-
- QCONFIG_ADD="xmlpatterns"
- QCONFIG_DEFINE="QT_XMLPATTERNS"
-
- qt4-build_pkg_setup
-}
-
-src_configure() {
- myconf="${myconf} -xmlpatterns"
- qt4-build_src_configure
-}
projects / gentoo.git / commitdiff