From: Markos Chandras Date: Thu, 24 Jun 2010 17:39:50 +0000 (+0000) Subject: Removing Qt-4.6.1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5309690482789d843dce25bf94b432548c2a2df7;p=gentoo.git Removing Qt-4.6.1 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 74069ed291b9..32bd9c9183dd 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-assistant # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.79 2010/06/08 12:14:22 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.80 2010/06/24 17:31:22 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras + -qt-assistant-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-assistant-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild deleted file mode 100644 index b866b401f5e7..000000000000 --- a/x11-libs/qt-assistant/qt-assistant-4.6.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.3 2010/01/19 19:08:50 spatz Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The assistant help module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND="~x11-libs/qt-gui-${PV}[aqua=] - ~x11-libs/qt-sql-${PV}[aqua=,sqlite] - ~x11-libs/qt-webkit-${PV}[aqua=]" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-tools.patch" ) - -# Pixeltool isn't really assistant related, but it relies on -# the assistant libraries. doc/qch/ -QT4_TARGET_DIRECTORIES=" -tools/assistant -tools/pixeltool -tools/qdoc3" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -tools/ -demos/ -examples/ -src/ -include/ -doc/" -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-glib -no-multimedia -no-qt3support -no-svg" - qt4-build_src_configure -} - -src_compile() { - # help libQtHelp find freshly built libQtCLucene (bug #289811) - export LD_LIBRARY_PATH="${S}/lib" - 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 "qmake projects faied" - emake qch_docs || die "emake docs failed" -} - -src_install() { - qt4-build_src_install - # install documentation - # note that emake install_qchdocs fails for undefined reason so we use a - # workaround - cd "${S}" - insinto ${QTDOCDIR#${EPREFIX}} - doins -r "${S}"/doc/qch || die "doins qch documentation failed" - dobin "${S}"/bin/qdoc3 || die "Installing qdoc3 failed" - #emake INSTALL_ROOT="${D}" install_qchdocs || die "emake install_qchdocs failed" - # install correct assistant icon, bug 241208 - dodir /usr/share/pixmaps/ || die "dodir failed" - insinto /usr/share/pixmaps/ || die "insinto failed" - doins tools/assistant/tools/assistant/images/assistant.png \ - || die "doins failed" - # Note: absolute image path required here! - make_desktop_entry /usr/bin/assistant Assistant \ - /usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \ - || die "make_desktop_entry failed" -} diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 28b7e1de7cc6..ad946ed9df8f 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.97 2010/06/08 12:15:06 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.98 2010/06/24 17:31:54 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras + -qt-core-4.6.1-r1.ebuild: + Drop Qt-4.6.1 *qt-core-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-core/qt-core-4.6.1-r1.ebuild b/x11-libs/qt-core/qt-core-4.6.1-r1.ebuild deleted file mode 100644 index 52ec6601cf94..000000000000 --- a/x11-libs/qt-core/qt-core-4.6.1-r1.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2010 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.6.1-r1.ebuild,v 1.1 2010/02/20 09:55:06 ayoy Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -SLOT="4" -KEYWORDS="~alpha ~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="doc +glib iconv optimized-qmake qt3support ssl" - -RDEPEND="sys-libs/zlib - glib? ( dev-libs/glib ) - ssl? ( dev-libs/openssl ) - !> "${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)" - - 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" - - if ! use doc; then - myconf="${myconf} -nomake docs" - fi - - 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" - - if use doc; then - emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed" - 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 - 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 \n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '2a#include \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 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 416569b260f4..a091f3caa5c1 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.65 2010/06/08 12:15:49 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.66 2010/06/24 17:32:32 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras -qt-dbus-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-dbus-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild deleted file mode 100644 index 0da53ae8f485..000000000000 --- a/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.3 2010/02/15 15:09:03 spatz Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The DBus module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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}" - -QT4_TARGET_DIRECTORIES=" -src/dbus -tools/qdbus/qdbus -tools/qdbus/qdbusxml2cpp -tools/qdbus/qdbuscpp2xml" -QCONFIG_ADD="dbus dbus-linked" -QCONFIG_DEFINE="QT_DBUS" - -#FIXME: Check if these are still needed with the header package -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/QtCore -include/QtDBus -include/QtXml -src/corelib -src/xml" - -PATCHES=( - "${FILESDIR}/qt-4.6-nolibx11.patch" -) - -src_configure() { - myconf="${myconf} -dbus-linked" - qt4-build_src_configure -} diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index 205182c6c643..c343978c17c2 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.48 2010/06/08 12:16:32 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.49 2010/06/24 17:33:04 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras -qt-demo-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-demo-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-demo/qt-demo-4.6.1.ebuild b/x11-libs/qt-demo/qt-demo-4.6.1.ebuild deleted file mode 100644 index 1d5016b10c4e..000000000000 --- a/x11-libs/qt-demo/qt-demo-4.6.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.4 2010/01/22 21:57:17 yngwin Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="Demonstration module of the Qt toolkit" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="kde" - -DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-core-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=] - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=] - media-sound/phonon[aqua=] ) ) - kde? ( media-sound/phonon[aqua=] ) - ~x11-libs/qt-script-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=] - ~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}" - -QT4_TARGET_DIRECTORIES="demos - examples" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - doc/src/images - src/ - include/ - tools/" - -PATCHES=( - "${FILESDIR}/${PN}-4.6-plugandpaint.patch" -) - -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 6fcbdaf4e7ef..98ff28b6e3da 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.104 2010/06/08 12:17:17 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.105 2010/06/24 17:33:40 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras -qt-gui-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-gui-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-gui/qt-gui-4.6.1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.1.ebuild deleted file mode 100644 index 9cd37365f73f..000000000000 --- a/x11-libs/qt-gui/qt-gui-4.6.1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.6 2010/02/10 20:11:56 yngwin Exp $ - -EAPI="2" -inherit confutils eutils qt4-build - -DESCRIPTION="The GUI module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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 +glib gtk mng nas nis raster tiff qt3support xinerama" - -RDEPEND="media-libs/fontconfig - >=media-libs/freetype-2 - media-libs/jpeg:0 - media-libs/libpng - sys-libs/zlib - ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] - ~x11-libs/qt-script-${PV}[aqua=,debug=] - !aqua? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfont - x11-libs/libSM - x11-libs/libXi - ) - cups? ( net-print/cups ) - dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) - gtk? ( x11-libs/gtk+:2[aqua=] ) - mng? ( >=media-libs/libmng-1.0.9 ) - nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) - 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 gtk 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" - 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 qt3support) - $(qt_use gtk 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" - - # Explicitly don't compile these packages. - # Emerge "qt-webkit", "qt-phonon", etc for their functionality. - myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl" - - qt4-build_src_configure -} - -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 - - # 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. - dodir /usr/include/qt4/QtDesigner/private/ - insinto /usr/include/qt4/QtDesigner/private/ - doins "${S}"/tools/designer/src/lib/shared/* - doins "${S}"/tools/designer/src/lib/sdk/* - - # 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 6aa0fd80467a..fd8a5cb105e8 100644 --- a/x11-libs/qt-multimedia/ChangeLog +++ b/x11-libs/qt-multimedia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-multimedia # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.19 2010/06/08 12:17:57 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.20 2010/06/24 17:34:14 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras + -qt-multimedia-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-multimedia-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild deleted file mode 100644 index 0d60ab1cd922..000000000000 --- a/x11-libs/qt-multimedia/qt-multimedia-4.6.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.4 2010/05/22 16:05:49 armin76 Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Qt multimedia module" -SLOT="4" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="iconv" - -# currently supported audio backends are: alsa, mac, win32 -DEPEND="!aqua? ( media-libs/alsa-lib ) - ~x11-libs/qt-core-${PV}[aqua=,debug=] - ~x11-libs/qt-gui-${PV}[aqua=,debug=]" -RDEPEND="${DEPEND}" - -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/ -src/plugins -src/3rdparty -src/tools" - -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 24264c6d54b4..cc9d60defa18 100644 --- a/x11-libs/qt-opengl/ChangeLog +++ b/x11-libs/qt-opengl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-opengl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.64 2010/06/08 12:18:38 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.65 2010/06/24 17:34:49 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras + -qt-opengl-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-opengl-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-opengl/qt-opengl-4.6.1.ebuild b/x11-libs/qt-opengl/qt-opengl-4.6.1.ebuild deleted file mode 100644 index 7866563d9e1e..000000000000 --- a/x11-libs/qt-opengl/qt-opengl-4.6.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.1 2010/01/19 14:53:10 yngwin Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The OpenGL module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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="qt3support" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=] - ~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=] - virtual/opengl - virtual/glu" -RDEPEND="${DEPEND}" - -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" - -src_configure() { - myconf="${myconf} -opengl - $(qt_use qt3support)" - - 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 706a0b37dbd0..98d1b061d811 100644 --- a/x11-libs/qt-phonon/ChangeLog +++ b/x11-libs/qt-phonon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-phonon # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.70 2010/06/08 12:19:20 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.71 2010/06/24 17:35:28 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras + -qt-phonon-4.6.1-r2.ebuild: + Drop Qt-4.6.1 *qt-phonon-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-phonon/qt-phonon-4.6.1-r2.ebuild b/x11-libs/qt-phonon/qt-phonon-4.6.1-r2.ebuild deleted file mode 100644 index 7fb46a471448..000000000000 --- a/x11-libs/qt-phonon/qt-phonon-4.6.1-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 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.6.1-r2.ebuild,v 1.2 2010/02/06 16:34:42 yngwin Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Phonon module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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" - -DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support] - !kde-base/phonon-kde - !kde-base/phonon-xine - !media-sound/phonon - !aqua? ( media-libs/gstreamer - media-plugins/gst-plugins-meta ) - aqua? ( ~x11-libs/qt-opengl-${PV}[aqua] ) - 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)" - - qt4-build_src_configure -} diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog index 5a65fcd120f8..38dca38b32d1 100644 --- a/x11-libs/qt-qt3support/ChangeLog +++ b/x11-libs/qt-qt3support/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-qt3support # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.69 2010/06/08 12:20:03 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.70 2010/06/24 17:36:04 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras + -qt-qt3support-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-qt3support-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.6.1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.6.1.ebuild deleted file mode 100644 index 279a6404ce69..000000000000 --- a/x11-libs/qt-qt3support/qt-qt3support-4.6.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.1 2010/01/19 14:54:47 yngwin Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Qt3 support module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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-sound/phonon[aqua=,gstreamer] ) ) - kde? ( media-sound/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 b378984600b6..f9aeff0a240a 100644 --- a/x11-libs/qt-script/ChangeLog +++ b/x11-libs/qt-script/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-script # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.68 2010/06/08 12:20:47 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.69 2010/06/24 17:36:43 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras + -qt-script-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-script-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-script/qt-script-4.6.1.ebuild b/x11-libs/qt-script/qt-script-4.6.1.ebuild deleted file mode 100644 index 058f58009afa..000000000000 --- a/x11-libs/qt-script/qt-script-4.6.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.3 2010/02/15 15:11:28 spatz Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The ECMAScript module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/script/" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/Qt/ -include/QtCore/ -include/QtScript/ -src/corelib/ -src/3rdparty/javascriptcore/ -" - -PATCHES=( - "${FILESDIR}/qt-4.6-nolibx11.patch" -) - -src_configure() { - myconf="${myconf} $(qt_use iconv) -script -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 -} diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog index bf0e6a418966..38e558c83b84 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.83 2010/06/17 21:11:48 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.84 2010/06/24 17:37:18 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras -qt-sql-4.6.1.ebuild: + Drop Qt-4.6.1 17 Jun 2010; Patrick Lauer qt-sql-4.5.3.ebuild, qt-sql-4.6.1.ebuild, qt-sql-4.6.2.ebuild, qt-sql-4.6.3.ebuild, diff --git a/x11-libs/qt-sql/qt-sql-4.6.1.ebuild b/x11-libs/qt-sql/qt-sql-4.6.1.ebuild deleted file mode 100644 index bfa53c1663ef..000000000000 --- a/x11-libs/qt-sql/qt-sql-4.6.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.5 2010/06/17 21:11:48 patrick Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The SQL module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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 iconv mysql odbc postgres qt3support +sqlite" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=] - firebird? ( dev-db/firebird ) - mysql? ( virtual/mysql ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql-base ) - sqlite? ( dev-db/sqlite:3 )" -RDEPEND="${DEPEND}" - -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" - -PATCHES=( - "${FILESDIR}/qt-4.6-nolibx11.patch" -) - -pkg_setup() { - if ! (use firebird || 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 mysql odbc postgres sqlite\"" - 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 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 121093cf3fa6..a27436a559d5 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.65 2010/06/08 12:22:11 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.66 2010/06/24 17:38:01 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras -qt-svg-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-svg-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-svg/qt-svg-4.6.1.ebuild b/x11-libs/qt-svg/qt-svg-4.6.1.ebuild deleted file mode 100644 index 381453670875..000000000000 --- a/x11-libs/qt-svg/qt-svg-4.6.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.1 2010/01/19 15:18:31 spatz Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The SVG module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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-gui-${PV}[aqua=,debug=]" -RDEPEND="${DEPEND}" - -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" - -src_configure() { - myconf="${myconf} $(qt_use iconv) -svg -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 - -v -no-fontconfig -no-glib -no-opengl -no-gtkstyle -continue" - qt4-build_src_configure -} diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog index 565d14aacc87..fe9ef413d6a8 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.65 2010/06/08 12:22:52 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.66 2010/06/24 17:38:37 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras -qt-test-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-test-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-test/qt-test-4.6.1.ebuild b/x11-libs/qt-test/qt-test-4.6.1.ebuild deleted file mode 100644 index f633501bdcdd..000000000000 --- a/x11-libs/qt-test/qt-test-4.6.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.3 2010/02/15 15:12:21 spatz Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The testing framework module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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}" - -QT4_TARGET_DIRECTORIES="src/testlib" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/QtTest/ -include/QtCore/ -src/corelib/" - -PATCHES=( - "${FILESDIR}/qt-4.6-nolibx11.patch" -) - -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 02b03a2e477e..f1a65efad6e9 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.90 2010/06/08 12:23:40 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.91 2010/06/24 17:39:14 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras + -qt-webkit-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-webkit-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild deleted file mode 100644 index 6c234dd88d36..000000000000 --- a/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.3 2010/02/15 15:12:39 spatz Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Webkit module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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="kde" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,ssl] - ~x11-libs/qt-dbus-${PV}[aqua=,debug=] - ~x11-libs/qt-gui-${PV}[aqua=,dbus,debug=] - ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=] - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus,debug=] - media-sound/phonon[aqua=] ) ) - kde? ( media-sound/phonon[aqua=] )" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" -QT4_EXTRACT_DIRECTORIES=" -include/ -src/ -tools/" -QCONFIG_ADD="webkit" -QCONFIG_DEFINE="QT_WEBKIT" - -PATCHES=( - "${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch -) - -src_prepare() { - [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 - qt4-build_src_prepare -} - -src_configure() { - myconf="${myconf} -webkit" - qt4-build_src_configure -} diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog index b1fefe2d0e76..34e3951dfcb8 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.65 2010/06/08 12:24:25 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.66 2010/06/24 17:39:50 hwoarang Exp $ + + 24 Jun 2010; Markos Chandras + -qt-xmlpatterns-4.6.1.ebuild: + Drop Qt-4.6.1 *qt-xmlpatterns-4.6.3 (08 Jun 2010) diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild deleted file mode 100644 index 9bcf44d6ee6d..000000000000 --- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2010 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.6.1.ebuild,v 1.4 2010/02/17 23:35:16 wired Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The patternist module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~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}" - -QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/QtCore -include/QtXml -include/QtNetwork -include/QtXmlPatterns -src/network/ -src/xml/ -src/corelib/" - -QCONFIG_ADD="xmlpatterns" -QCONFIG_DEFINE="QT_XMLPATTERNS" - -PATCHES=( - "${FILESDIR}/qt-4.6-nolibx11.patch" -) - -src_configure() { - myconf="${myconf} -xmlpatterns" - qt4-build_src_configure -}