diff options
30 files changed, 61 insertions, 1151 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 0f7a1571fcda..9f4cfe26c12e 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-assistant # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.126 2012/03/30 13:55:10 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.127 2012/04/05 15:19:56 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-assistant-4.8.0-r1.ebuild: + Drop Qt-4.8.0 *qt-assistant-4.8.1-r1 (30 Mar 2012) diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.0-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.0-r1.ebuild deleted file mode 100644 index 35df3844613b..000000000000 --- a/x11-libs/qt-assistant/qt-assistant-4.8.0-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2012 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.8.0-r1.ebuild,v 1.1 2012/03/19 16:31:42 pesa Exp $ - -EAPI="3" - -inherit qt4-build - -DESCRIPTION="The Help module and Assistant application for the Qt toolkit" -SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )" -SLOT="4" - -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos" -IUSE="compat doc +glib qt3support trace webkit" - -DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?] - ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=,sqlite] - webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )" -RDEPEND="${DEPEND}" - -PATCHES=( - # bug 395067 - "${FILESDIR}/${P}-install-fix.patch" -) - -pkg_setup() { - # Pixeltool isn't really assistant related, but it relies on - # the assistant libraries. - QT4_TARGET_DIRECTORIES=" - tools/assistant - tools/pixeltool - tools/qdoc3" - QT4_EXTRACT_DIRECTORIES=" - tools - demos - examples - src - include - doc" - - use trace && 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 - - use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch - - # bug 401173 - use webkit || epatch "${FILESDIR}"/disable-webkit.patch - - # bug 348034 - sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die -} - -src_configure() { - myconf+=" - -no-xkb -no-fontconfig -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) $(qt_use webkit)" - use glib || 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 - - cd "${S}" - # ugly hack to build docs - 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 -} - -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 html docs" - fi - - dobin "${S}"/bin/qdoc3 || die - - doicon tools/assistant/tools/assistant/images/assistant.png || die - make_desktop_entry assistant Assistant assistant 'Qt;Development' - - if use compat; then - insinto /usr/share/qt4/mkspecs/features - doins tools/assistant/compat/features/assistant.prf || die - fi -} diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index cbc5b790589b..6fab1565073e 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.155 2012/04/03 21:46:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.156 2012/04/05 15:22:25 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-core-4.8.0-r1.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-core-4.7.4-r1.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-core/qt-core-4.8.0-r1.ebuild b/x11-libs/qt-core/qt-core-4.8.0-r1.ebuild deleted file mode 100644 index 35083bdfcfec..000000000000 --- a/x11-libs/qt-core/qt-core-4.8.0-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2012 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.8.0-r1.ebuild,v 1.1 2012/01/29 17:00:02 wired Exp $ - -EAPI="3" -if [[ ${PV} == 4*9999 ]]; then - ECLASS="-edge" -fi -inherit qt4-build${ECLASS} - -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -SLOT="4" -if [[ ${PV} != 4*9999 ]]; then - 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" -else - KEYWORDS="" -fi -IUSE="+glib iconv optimized-qmake qt3support ssl" - -DEPEND="sys-libs/zlib - glib? ( dev-libs/glib ) - ssl? ( dev-libs/openssl ) - !<x11-libs/qt-4.4.0:4 - !<x11-libs/cairo-1.10.2-r2" -RDEPEND="${DEPEND}" -PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )" - -PATCHES=( - "${FILESDIR}/${P}-qurl-regression-fix.patch" -) - -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" - - # This is not needed in live ebuilds since the git repo contains everything - if [[ ${PV} != 4*9999 ]]; then - QT4_EXTRACT_DIRECTORIES=" ${QT4_TARGET_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" - fi - qt4-build${ECLASS}_pkg_setup -} - -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${ECLASS}_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() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use optimized-qmake) - $(qt_use ssl openssl) - $(qt_use qt3support)" - - qt4-build${ECLASS}_src_configure -} - -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 - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \; - - # 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 failed" - 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 - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog index aeccdb4b1df8..46351c1e521c 100644 --- a/x11-libs/qt-dbus/ChangeLog +++ b/x11-libs/qt-dbus/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-dbus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.104 2012/04/03 21:44:47 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.105 2012/04/05 15:24:31 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-dbus-4.8.0.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-dbus-4.7.4.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.0.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.0.ebuild deleted file mode 100644 index e66ab30086f1..000000000000 --- a/x11-libs/qt-dbus/qt-dbus-4.8.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 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.8.0.ebuild,v 1.1 2012/01/29 17:00:46 wired Exp $ - -EAPI="3" -if [[ ${PV} == 4*9999 ]]; then - ECLASS="-edge" -fi -inherit qt4-build${ECLASS} - -DESCRIPTION="The DBus module for the Qt toolkit" -SLOT="4" -if [[ ${PV} != 4*9999 ]]; then - 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" -else - KEYWORDS="" -fi -IUSE="" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,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" - - if [[ ${PV} != 4*9999 ]]; then - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/QtCore - include/QtDBus - include/QtXml - src/corelib - src/xml" - fi - - qt4-build${ECLASS}_pkg_setup -} - -src_configure() { - myconf="${myconf} -dbus-linked" - qt4-build${ECLASS}_src_configure -} diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index 045ce8c18f0a..7458a9635125 100644 --- a/x11-libs/qt-demo/ChangeLog +++ b/x11-libs/qt-demo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-demo # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.83 2012/04/01 15:42:58 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.84 2012/04/05 15:26:26 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-demo-4.8.0.ebuild: + Drop Qt-4.8.0 *qt-demo-4.8.1-r1 (01 Apr 2012) diff --git a/x11-libs/qt-demo/qt-demo-4.8.0.ebuild b/x11-libs/qt-demo/qt-demo-4.8.0.ebuild deleted file mode 100644 index d54f5713728d..000000000000 --- a/x11-libs/qt-demo/qt-demo-4.8.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 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.8.0.ebuild,v 1.1 2012/01/29 17:02:04 wired 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=,c++0x=,qpa=,debug=] - ~x11-libs/qt-core-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=] - ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=] - ~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,webkit] - ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=] - ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=] - ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=] - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=] - media-libs/phonon[aqua=,debug=] ) ) - kde? ( media-libs/phonon[aqua=,debug=] ) - ~x11-libs/qt-script-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=] - ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=] - ~x11-libs/qt-svg-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=] - ~x11-libs/qt-test-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=] - ~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=] - ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]" - -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) -no-openvg" - qt4-build_src_configure -} - -src_install() { - insinto "${QTDOCDIR#${EPREFIX}}"/src - doins -r "${S}"/doc/src/images || die "Installing images failed." - - qt4-build_src_install -} diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 13eac9b2e429..bd7b12ab707d 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.175 2012/04/04 11:47:17 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.176 2012/04/05 15:29:07 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-gui-4.8.0-r4.ebuild: + Drop Qt-4.8.0 *qt-gui-4.8.1-r1 (04 Apr 2012) diff --git a/x11-libs/qt-gui/qt-gui-4.8.0-r4.ebuild b/x11-libs/qt-gui/qt-gui-4.8.0-r4.ebuild deleted file mode 100644 index 6e9a891c1ce3..000000000000 --- a/x11-libs/qt-gui/qt-gui-4.8.0-r4.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2012 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.8.0-r4.ebuild,v 1.2 2012/03/30 19:53:22 hwoarang 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 gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" - -RDEPEND=" - app-admin/eselect-qtgraphicssystem - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0 - sys-libs/zlib - virtual/jpeg - ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=] - ~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=] - !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - cups? ( net-print/cups ) - dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] ) - egl? ( media-libs/mesa[egl] ) - gtkstyle? ( x11-libs/gtk+:2[aqua=] ) - mng? ( >=media-libs/libmng-1.0.9 ) - nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${RDEPEND} - !aqua? ( - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - xv? ( x11-proto/videoproto ) - ) -" -PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,qpa=,debug=] )" - -PATCHES=( - "${FILESDIR}/${PN}-4.7.3-cups.patch" -) - -pkg_setup() { - # this belongs to pkg_pretend, we have to upgrade to EAPI 4 :) - # was planning to use a dep, but to reproduce this you have to - # clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed. - # no need to restrict normal first time users for that :) - if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then - echo - eerror "When building qt-gui[gtkstyle] from scratch with cairo present," - eerror "cairo must have the qt4 use flag disabled, otherwise the gtk" - eerror "style cannot be built." - ewarn - eerror "You have the following options:" - eerror " - rebuild cairo with -qt4 USE" - eerror " - build qt-gui with -gtkstyle USE" - ewarn - eerror "After you successfully install qt-gui, you'll be able to" - eerror "re-enable the disabled use flag and/or reinstall cairo." - ewarn - echo - die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled" - 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" - - use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets" - 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 trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace" - - # mac version does not contain qtconfig? - [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_pkg_setup -} - -src_prepare() { - qt4-build_src_prepare - - # Add -xvideo to the list of accepted configure options - sed -i -e 's:|-xinerama|:&-xvideo|:' configure - - # Don't build plugins this go around, because they depend on qt3support lib - sed -i -e 's:CONFIG(shared:# &:g' 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) - $(use gif || echo -no-gif) - $(qt_use glib) - $(qt_use mng libmng system) - $(qt_use nas nas-sound 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) - $(qt_use xv xvideo)" - - myconf+=" - -system-libpng -system-libjpeg - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" - - [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045 - - 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 - sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || - die "sed failed" -} - -src_install() { - QCONFIG_ADD=" - mitshm x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync - fontconfig gif png system-png jpeg system-jpeg - $(usev accessibility) - $(usev cups) - $(use mng && echo system-mng) - $(usev nas) - $(usev nis) - $(use tiff && echo system-tiff) - $(usev xinerama) - $(use xv && echo xvideo)" - QCONFIG_REMOVE="no-gif no-jpeg no-png" - QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) - $(use cups && echo QT_CUPS) - QT_FONTCONFIG QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG - $(use mng && echo QT_IMAGEFORMAT_MNG) - $(use nas && echo QT_NAS) - $(use nis && echo QT_NIS) - $(use tiff && echo QT_IMAGEFORMAT_TIFF) - QT_SESSIONMANAGER QT_SHAPE QT_XCURSOR QT_XFIXES - $(use xinerama && echo QT_XINERAMA) - QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC - $(use xv && echo QT_XVIDEO)" - - qt4-build_src_install - - # 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 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 {} + - - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then - # rerun to get links to headers right - fix_includes - fi - - # touch the available graphics systems - mkdir -p "${ED}"/usr/share/qt4/graphicssystems || die - echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die - touch "${ED}"/usr/share/qt4/graphicssystems/native || die - - doicon tools/designer/src/designer/images/designer.png \ - tools/linguist/linguist/images/icons/linguist-128-32.png || die - make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' - make_desktop_entry linguist Linguist linguist-128-32 'Qt;Development;GUIDesigner' -} - -pkg_postinst() { - # raster is the default graphicssystems, set it if first install - eselect qtgraphicssystem set raster --use-old - elog "Starting with Qt 4.8.0, you may choose the active Qt Graphics System" - elog "by using a new eselect module called qtgraphicssystem." - elog "Run" - elog " eselect qtgraphicssystem" - elog "for more information." -} diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog index c8a191e9f884..0b7d6e5d7d57 100644 --- a/x11-libs/qt-multimedia/ChangeLog +++ b/x11-libs/qt-multimedia/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-multimedia # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.52 2012/03/29 22:12:21 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.53 2012/04/05 15:31:13 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-multimedia-4.8.0-r1.ebuild: + Drop Qt-4.8.0 *qt-multimedia-4.8.1 (29 Mar 2012) diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.0-r1.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.0-r1.ebuild deleted file mode 100644 index 88462dc8113c..000000000000 --- a/x11-libs/qt-multimedia/qt-multimedia-4.8.0-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 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.8.0-r1.ebuild,v 1.1 2012/03/13 00:05:32 pesa Exp $ - -EAPI="3" -inherit qt4-build - -DESCRIPTION="The Multimedia module for the Qt toolkit" -SLOT="4" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="alsa" - -DEPEND=" - alsa? ( media-libs/alsa-lib ) - ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=] - ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-alsa.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/multimedia" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtGui - include/QtMultimedia - src/src.pro - src/corelib - src/gui" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -multimedia -audio-backend - $(qt_use alsa) - -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend - -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" - - qt4-build_src_configure -} diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog index 1cfe384c09a2..b2bda21c1026 100644 --- a/x11-libs/qt-opengl/ChangeLog +++ b/x11-libs/qt-opengl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-opengl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.104 2012/04/03 21:49:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.105 2012/04/05 15:33:15 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-opengl-4.8.0-r2.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-opengl-4.7.4.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.0-r2.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.0-r2.ebuild deleted file mode 100644 index 6d8802614f8b..000000000000 --- a/x11-libs/qt-opengl/qt-opengl-4.8.0-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 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.8.0-r2.ebuild,v 1.2 2012/02/28 13:30:35 jlec 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=,c++0x=,qpa=,debug=,qt3support=] - ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,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 -} - -src_install() { - qt4-build_src_install - - #touch the available graphics systems - mkdir -p "${ED}/usr/share/qt4/graphicssystems/" || - die "could not create ${ED}/usr/share/qt4/graphicssystems/" - echo "experimental" > "${ED}/usr/share/qt4/graphicssystems/opengl" || - die "could not touch ${ED}/usr/share/qt4/graphicssystems/opengl" -} diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog index bbfe38865906..b4dca25f9960 100644 --- a/x11-libs/qt-phonon/ChangeLog +++ b/x11-libs/qt-phonon/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-phonon # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.107 2012/04/03 21:49:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.108 2012/04/05 15:35:14 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-phonon-4.8.0.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-phonon-4.7.4.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.0.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.0.ebuild deleted file mode 100644 index 1442fe7e817f..000000000000 --- a/x11-libs/qt-phonon/qt-phonon-4.8.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2012 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.8.0.ebuild,v 1.1 2012/01/29 17:05:54 wired 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=,c++0x=,qpa=,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,debug=,qt3support=] ) - dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,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 -} diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog index 77691f29bb7c..8488aedeb409 100644 --- a/x11-libs/qt-qt3support/ChangeLog +++ b/x11-libs/qt-qt3support/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-qt3support # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.108 2012/04/03 21:48:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.109 2012/04/05 15:37:23 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-qt3support-4.8.0-r1.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-qt3support-4.7.4.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.0-r1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.0-r1.ebuild deleted file mode 100644 index 6de60dc3ac7c..000000000000 --- a/x11-libs/qt-qt3support/qt-qt3support-4.8.0-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2012 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.8.0-r1.ebuild,v 1.1 2012/02/18 14:43:37 pesa 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" - -DEPEND=" - ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support] - ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support] - ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support] -" -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" - - qt4-build_pkg_setup -} - -src_configure() { - myconf="${myconf} -qt3support - $(qt_use accessibility)" - qt4-build_src_configure -} diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog index 572b0afbae5e..6e5a71b0356b 100644 --- a/x11-libs/qt-script/ChangeLog +++ b/x11-libs/qt-script/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-script # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.106 2012/04/03 21:44:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.107 2012/04/05 15:39:22 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-script-4.8.0.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-script-4.7.4.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-script/qt-script-4.8.0.ebuild b/x11-libs/qt-script/qt-script-4.8.0.ebuild deleted file mode 100644 index d91d600f2fcf..000000000000 --- a/x11-libs/qt-script/qt-script-4.8.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2012 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.8.0.ebuild,v 1.1 2012/01/29 17:07:26 wired 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" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,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 - insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private - find "${S}"/src/script -type f -name "*_p.h" -exec doins {} \; -} diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog index 5c0b1ced31a4..88ed9aa38a36 100644 --- a/x11-libs/qt-sql/ChangeLog +++ b/x11-libs/qt-sql/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-sql # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.123 2012/04/03 21:46:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.124 2012/04/05 15:41:31 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-sql-4.8.0-r1.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-sql-4.7.4.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-sql/qt-sql-4.8.0-r1.ebuild b/x11-libs/qt-sql/qt-sql-4.8.0-r1.ebuild deleted file mode 100644 index d829f8e66eac..000000000000 --- a/x11-libs/qt-sql/qt-sql-4.8.0-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2012 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.8.0-r1.ebuild,v 1.1 2012/02/23 23:49:46 pesa 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 mysql odbc postgres qt3support +sqlite" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=] - firebird? ( dev-db/firebird ) - freetds? ( dev-db/freetds ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) - 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 - src/src.pro - src/corelib - src/plugins - src/tools/tools.pro" - - 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 one" - ewarn "of these USE flags: \"firebird freetds mysql odbc postgres sqlite\"." - die "Enable at least one SQL driver." - fi - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - $(qt_use firebird sql-ibase plugin) - $(qt_use freetds sql-tds plugin) - $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql") - $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc") - $(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) - -no-sql-db2 - -no-sql-oci - -no-sql-sqlite2 - -no-sql-symsql - $(qt_use qt3support) - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - -no-glib" - - qt4-build_src_configure -} diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog index bd6c6ac0089a..d3034cbba777 100644 --- a/x11-libs/qt-svg/ChangeLog +++ b/x11-libs/qt-svg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-svg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.102 2012/04/03 21:50:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.103 2012/04/05 15:43:32 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-svg-4.8.0.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-svg-4.7.4.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-svg/qt-svg-4.8.0.ebuild b/x11-libs/qt-svg/qt-svg-4.8.0.ebuild deleted file mode 100644 index 2dd6375e7c32..000000000000 --- a/x11-libs/qt-svg/qt-svg-4.8.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2012 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.8.0.ebuild,v 1.1 2012/01/29 17:08:58 wired 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=,c++0x=,qpa=,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 -} diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog index 017022f35c0b..c091ea7eea4f 100644 --- a/x11-libs/qt-test/ChangeLog +++ b/x11-libs/qt-test/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-test # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.100 2012/04/03 21:49:35 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.101 2012/04/05 15:45:33 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-test-4.8.0.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-test-4.7.4.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-test/qt-test-4.8.0.ebuild b/x11-libs/qt-test/qt-test-4.8.0.ebuild deleted file mode 100644 index fe116570cda0..000000000000 --- a/x11-libs/qt-test/qt-test-4.8.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2012 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.8.0.ebuild,v 1.1 2012/01/29 17:09:42 wired 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=,c++0x=,qpa=,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 -} diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index 90d960c62e39..55e189a50ee9 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.140 2012/04/04 13:29:25 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.141 2012/04/05 15:47:39 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-webkit-4.8.0-r1.ebuild: + Drop Qt-4.8.0 04 Apr 2012; Davide Pesavento <pesa@gentoo.org> +files/qt-webkit-4.8.1+glib-2.31.patch, qt-webkit-4.8.1.ebuild: diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild deleted file mode 100644 index 1dda18f9fc4d..000000000000 --- a/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2012 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.8.0-r1.ebuild,v 1.5 2012/03/10 16:05:31 pesa Exp $ - -EAPI="3" -inherit qt4-build flag-o-matic - -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="+gstreamer +jit" - -DEPEND=" - dev-db/sqlite:3 - dev-libs/icu - x11-libs/libXrender - ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl] - ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=] - ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=] - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-c++0x-fix.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/Source/JavaScriptCore - src/3rdparty/webkit/Source/WebCore - src/3rdparty/webkit/Source/WebKit/qt - tools/designer/src/plugins/qwebview" - - QT4_EXTRACT_DIRECTORIES=" - include - src - tools" - - QCONFIG_ADD="webkit" - QCONFIG_DEFINE="QT_WEBKIT" - - qt4-build_pkg_setup -} - -src_prepare() { - use c++0x && append-cxxflags -fpermissive - - # Fix version number in generated pkgconfig file, bug 406443 - sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ - src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - - # Always enable icu to avoid build failure, bug 407315 - sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ - src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die - - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ - src/3rdparty/webkit/Source/WebKit.pri || die - - qt4-build_src_prepare -} - -src_configure() { - myconf+=" - -webkit - -icu -system-sqlite - $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0) - " - qt4-build_src_configure -} diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog index 4112e10a649e..4801c43b15e0 100644 --- a/x11-libs/qt-xmlpatterns/ChangeLog +++ b/x11-libs/qt-xmlpatterns/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-xmlpatterns # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.101 2012/04/03 21:50:53 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.102 2012/04/05 15:49:37 johu Exp $ + + 05 Apr 2012; Johannes Huber <johu@gentoo.org> + -qt-xmlpatterns-4.8.0-r1.ebuild: + Drop Qt-4.8.0 03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-xmlpatterns-4.7.4.ebuild: Stable for HPPA (bug #390963). diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.0-r1.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.0-r1.ebuild deleted file mode 100644 index 2b8b52b4c0eb..000000000000 --- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2012 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.8.0-r1.ebuild,v 1.1 2012/02/18 18:23:51 pesa Exp $ - -EAPI="3" -inherit qt4-build - -DESCRIPTION="The XmlPatterns 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=,c++0x=,qpa=,debug=,exceptions]" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/xmlpatterns - tools/xmlpatterns - tools/xmlpatternsvalidator" - - 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+=" -xmlpatterns" - qt4-build_src_configure -} |