diff options
author | Johannes Huber <johu@gentoo.org> | 2012-05-14 13:06:02 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2012-05-14 13:06:02 +0000 |
commit | 32be5b52c96cb3fc1a7f9de16bbff1d9d46cbb06 (patch) | |
tree | c35fad25cfd471d2c9a7ee74b9776a4753cc2248 /x11-libs | |
parent | Useless blank line (diff) | |
download | historical-32be5b52c96cb3fc1a7f9de16bbff1d9d46cbb06.tar.gz historical-32be5b52c96cb3fc1a7f9de16bbff1d9d46cbb06.tar.bz2 historical-32be5b52c96cb3fc1a7f9de16bbff1d9d46cbb06.zip |
Removing Qt-4.7.2
Package-Manager: portage-2.2.0_alpha104/cvs/Linux i686
Diffstat (limited to 'x11-libs')
32 files changed, 65 insertions, 1139 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 97a345f3a052..27509ce53f06 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.132 2012/05/13 09:12:09 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.133 2012/05/14 12:25:03 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-assistant-4.7.2.ebuild: + Drop Qt-4.7.2 13 May 2012; Markus Meier <maekke@gentoo.org> qt-assistant-4.8.1-r1.ebuild: arm stable, bug #414241 diff --git a/x11-libs/qt-assistant/qt-assistant-4.7.2.ebuild b/x11-libs/qt-assistant/qt-assistant-4.7.2.ebuild deleted file mode 100644 index 5634776ebea4..000000000000 --- a/x11-libs/qt-assistant/qt-assistant-4.7.2.ebuild +++ /dev/null @@ -1,121 +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.7.2.ebuild,v 1.7 2012/04/12 23:47:32 pesa Exp $ - -EAPI="3" -inherit qt4-build - -DESCRIPTION="The assistant help module for the Qt toolkit" -SRC_URI+=" - compat? ( - ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz - http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz - )" - -SLOT="4" -KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86" -IUSE="compat doc +glib qt3support trace" - -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. - 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 \ - ${PN}-compat-headers-4.7.tar.gz - mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \ - "${S}"/tools/assistant/compat || die - mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die - fi -} - -src_prepare() { - qt4-build_src_prepare - - use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch -} - -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 -} diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index a368a8ca7dbd..cef54cbd21e3 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.164 2012/05/13 10:23:50 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.165 2012/05/14 12:29:59 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-core-4.7.2-r2.ebuild: + Drop Qt-4.7.2 13 May 2012; Davide Pesavento <pesa@gentoo.org> -qt-core-4.8.1-r1.ebuild: Remove unused revision. diff --git a/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild b/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild deleted file mode 100644 index 2396f6139a24..000000000000 --- a/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# 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.2-r2.ebuild,v 1.6 2011/11/20 19:03:44 pesa 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" - -DEPEND="sys-libs/zlib - glib? ( dev-libs/glib ) - ssl? ( dev-libs/openssl ) - !<x11-libs/qt-4.4.0:4" -RDEPEND="${DEPEND}" -PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )" - -PATCHES=( - "${FILESDIR}/blacklist_ssl.patch" - # 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 -} diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog index e04c4011e0c9..dd4649fd7d71 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.109 2012/05/12 15:39:25 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.110 2012/05/14 12:32:13 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-dbus-4.7.2.ebuild: + Drop Qt-4.7.2 12 May 2012; Alexis Ballier <aballier@gentoo.org> qt-dbus-4.8.1.ebuild: keyword ~amd64-fbsd diff --git a/x11-libs/qt-dbus/qt-dbus-4.7.2.ebuild b/x11-libs/qt-dbus/qt-dbus-4.7.2.ebuild deleted file mode 100644 index 40a5e076df94..000000000000 --- a/x11-libs/qt-dbus/qt-dbus-4.7.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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.2.ebuild,v 1.8 2011/07/13 12:47:33 xarthisius 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 -} diff --git a/x11-libs/qt-declarative/ChangeLog b/x11-libs/qt-declarative/ChangeLog index fa2387d22c9b..b6f7c574d37f 100644 --- a/x11-libs/qt-declarative/ChangeLog +++ b/x11-libs/qt-declarative/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-declarative # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.41 2012/05/13 08:05:55 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.42 2012/05/14 12:34:13 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> + -qt-declarative-4.7.2-r1.ebuild: + Drop Qt-4.7.2 13 May 2012; Markus Meier <maekke@gentoo.org> qt-declarative-4.8.1.ebuild: arm stable, bug #414241 diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.2-r1.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.2-r1.ebuild deleted file mode 100644 index 9a438c439ec7..000000000000 --- a/x11-libs/qt-declarative/qt-declarative-4.7.2-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# 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.2-r1.ebuild,v 1.6 2011/07/13 12:54:51 xarthisius 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" -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 -} diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index 9131c627d88b..5836fc485cad 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.87 2012/05/12 09:42:46 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.88 2012/05/14 12:35:58 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-demo-4.7.2.ebuild: + Drop Qt-4.7.2 12 May 2012; Davide Pesavento <pesa@gentoo.org> qt-demo-4.8.1-r1.ebuild: Sort deps. diff --git a/x11-libs/qt-demo/qt-demo-4.7.2.ebuild b/x11-libs/qt-demo/qt-demo-4.7.2.ebuild deleted file mode 100644 index 34a17a39ec35..000000000000 --- a/x11-libs/qt-demo/qt-demo-4.7.2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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.2.ebuild,v 1.7 2011/07/13 13:02:41 xarthisius 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 -} diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 00da1d233f19..45fb51638edc 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.179 2012/05/12 15:40:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.180 2012/05/14 12:53:26 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-gui-4.7.2.ebuild: + Drop Qt-4.7.2 12 May 2012; Alexis Ballier <aballier@gentoo.org> qt-gui-4.8.1-r1.ebuild: keyword ~amd64-fbsd diff --git a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild b/x11-libs/qt-gui/qt-gui-4.7.2.ebuild deleted file mode 100644 index 42b0ae567087..000000000000 --- a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild +++ /dev/null @@ -1,188 +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.7.2.ebuild,v 1.12 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 +glib gtkstyle mng nas nis private-headers qt3support raster tiff trace xinerama" - -RDEPEND="media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0 - sys-libs/zlib - virtual/jpeg - ~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} - !aqua? ( - x11-proto/xextproto - x11-proto/inputproto - ) - xinerama? ( x11-proto/xineramaproto )" -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" -} diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog index 53b13938254b..d6e200a0e277 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.54 2012/05/08 18:26:10 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.55 2012/05/14 12:40:29 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-multimedia-4.7.2.ebuild: + Drop Qt-4.7.2 08 May 2012; Markos Chandras <hwoarang@gentoo.org> qt-multimedia-4.8.1.ebuild: Stable on amd64 wrt bug #414241 diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.7.2.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.7.2.ebuild deleted file mode 100644 index 73498ebde72c..000000000000 --- a/x11-libs/qt-multimedia/qt-multimedia-4.7.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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.2.ebuild,v 1.5 2011/07/13 13:02:07 xarthisius 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 -} diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog index 2b4c88e5ef29..3467b22c19d4 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.108 2012/05/12 16:12:42 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.109 2012/05/14 12:43:10 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-opengl-4.7.2.ebuild: + Drop Qt-4.7.2 12 May 2012; Alexis Ballier <aballier@gentoo.org> qt-opengl-4.8.1.ebuild: keyword ~amd64-fbsd diff --git a/x11-libs/qt-opengl/qt-opengl-4.7.2.ebuild b/x11-libs/qt-opengl/qt-opengl-4.7.2.ebuild deleted file mode 100644 index 4778880750c0..000000000000 --- a/x11-libs/qt-opengl/qt-opengl-4.7.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# 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.2.ebuild,v 1.6 2011/07/13 12:53:27 xarthisius 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 -} diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog index 0ab00db1d290..e40785d61bb5 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.111 2012/05/13 08:08:09 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.112 2012/05/14 12:46:13 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-phonon-4.7.2.ebuild: + Drop Qt-4.7.2 13 May 2012; Markus Meier <maekke@gentoo.org> qt-phonon-4.8.1.ebuild: arm stable, bug #414241 diff --git a/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild b/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild deleted file mode 100644 index 53409f0a655d..000000000000 --- a/x11-libs/qt-phonon/qt-phonon-4.7.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# 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.2.ebuild,v 1.8 2011/07/13 13:03:59 xarthisius 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 -} diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog index df4736c66821..375b3c496745 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.113 2012/05/13 13:49:35 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.114 2012/05/14 12:48:33 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-qt3support-4.7.2.ebuild: + Drop Qt-4.7.2 13 May 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml: Fix kde USE flag description (media-libs/phonon vs. media-sound/phonon). diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.7.2.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.7.2.ebuild deleted file mode 100644 index 35a1e3892673..000000000000 --- a/x11-libs/qt-qt3support/qt-qt3support-4.7.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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.2.ebuild,v 1.7 2011/07/13 12:46:25 xarthisius 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 -} diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog index 06c2b455c7ee..9186a4c00442 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.111 2012/05/12 15:39:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.112 2012/05/14 12:51:29 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-script-4.7.2.ebuild: + Drop Qt-4.7.2 12 May 2012; Alexis Ballier <aballier@gentoo.org> qt-script-4.8.1.ebuild: keyword ~amd64-fbsd diff --git a/x11-libs/qt-script/qt-script-4.7.2.ebuild b/x11-libs/qt-script/qt-script-4.7.2.ebuild deleted file mode 100644 index f8f9dd5c85e3..000000000000 --- a/x11-libs/qt-script/qt-script-4.7.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# 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.2.ebuild,v 1.6 2011/07/13 12:48:40 xarthisius 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 -} diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog index fa66ac72f8e9..2095a5af8e36 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.131 2012/05/13 16:42:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.132 2012/05/14 12:54:39 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-sql-4.7.2.ebuild: + Drop Qt-4.7.2 13 May 2012; Alexis Ballier <aballier@gentoo.org> qt-sql-4.8.1-r1.ebuild: keyword ~amd64-fbsd diff --git a/x11-libs/qt-sql/qt-sql-4.7.2.ebuild b/x11-libs/qt-sql/qt-sql-4.7.2.ebuild deleted file mode 100644 index b4d71149e0e5..000000000000 --- a/x11-libs/qt-sql/qt-sql-4.7.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# 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.2.ebuild,v 1.6 2011/07/13 12:44:39 xarthisius 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 -} diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog index 7a954ddb631c..c0a8727fc8a2 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.106 2012/05/12 15:43:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.107 2012/05/14 12:56:54 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-svg-4.7.2.ebuild: + Drop Qt-4.7.2 12 May 2012; Alexis Ballier <aballier@gentoo.org> qt-svg-4.8.1.ebuild: keyword ~amd64-fbsd diff --git a/x11-libs/qt-svg/qt-svg-4.7.2.ebuild b/x11-libs/qt-svg/qt-svg-4.7.2.ebuild deleted file mode 100644 index abc2b1833a7e..000000000000 --- a/x11-libs/qt-svg/qt-svg-4.7.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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.2.ebuild,v 1.6 2011/07/13 12:54:22 xarthisius 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 -} diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog index c91d8cb23e88..ccc2f18e9db1 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.104 2012/05/13 08:10:29 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.105 2012/05/14 12:59:35 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-test-4.7.2.ebuild: + Drop Qt-4.7.2 13 May 2012; Markus Meier <maekke@gentoo.org> qt-test-4.8.1.ebuild: arm stable, bug #414241 diff --git a/x11-libs/qt-test/qt-test-4.7.2.ebuild b/x11-libs/qt-test/qt-test-4.7.2.ebuild deleted file mode 100644 index da46b8557e3b..000000000000 --- a/x11-libs/qt-test/qt-test-4.7.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# 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.2.ebuild,v 1.6 2011/07/13 13:01:10 xarthisius 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 -} diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index f9a9c75826dd..b1916d20f4ba 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.148 2012/05/13 14:00:17 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.149 2012/05/14 13:06:02 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-webkit-4.7.2.ebuild: + Drop Qt-4.7.2 13 May 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml: Fix kde USE flag description (media-libs/phonon vs. media-sound/phonon). diff --git a/x11-libs/qt-webkit/qt-webkit-4.7.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.7.2.ebuild deleted file mode 100644 index 2f59ad3cb71c..000000000000 --- a/x11-libs/qt-webkit/qt-webkit-4.7.2.ebuild +++ /dev/null @@ -1,49 +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.7.2.ebuild,v 1.8 2012/01/03 08:56:26 wired 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 -} diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog index 3cbbc5473bb0..ecbded33c55d 100644 --- a/x11-libs/qt-xmlpatterns/ChangeLog +++ b/x11-libs/qt-xmlpatterns/ChangeLog @@ -1,6 +1,9 @@ # 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.105 2012/05/12 15:52:38 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.106 2012/05/14 13:04:17 johu Exp $ + + 14 May 2012; Johannes Huber <johu@gentoo.org> -qt-xmlpatterns-4.7.2.ebuild: + Drop Qt-4.7.2 12 May 2012; Alexis Ballier <aballier@gentoo.org> qt-xmlpatterns-4.8.1.ebuild: diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.2.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.2.ebuild deleted file mode 100644 index a05bac721d06..000000000000 --- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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.2.ebuild,v 1.6 2011/07/13 12:51:08 xarthisius 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 -} |