diff options
37 files changed, 1301 insertions, 15 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 03971c74d867..5fc69ff5ec20 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-assistant # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.48 2009/10/11 17:22:23 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.49 2009/10/16 16:46:56 wired Exp $ + +*qt-assistant-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-assistant-4.6.0_beta1.ebuild, +files/qt-assistant-4.6-tools.patch: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-assistant-4.5.2.ebuild: alpha/ia64 stable wrt #286653 diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.6-tools.patch b/x11-libs/qt-assistant/files/qt-assistant-4.6-tools.patch new file mode 100644 index 000000000000..b9f897dfdeab --- /dev/null +++ b/x11-libs/qt-assistant/files/qt-assistant-4.6-tools.patch @@ -0,0 +1,37 @@ +diff --git a/tools/tools.pro b/tools/tools.pro +index 4b36115..d3dd1a5 100644 +--- a/tools/tools.pro ++++ b/tools/tools.pro +@@ -4,31 +4,9 @@ no-png { + message("Some graphics-related tools are unavailable without PNG support") + } else { + SUBDIRS += assistant \ + pixeltool \ +- porting \ +- qtestlib \ +- qttracereplay +- contains(QT_EDITION, Console) { +- SUBDIRS += designer/src/uitools # Linguist depends on this +- } else { +- SUBDIRS += designer +- } +- SUBDIRS += linguist +- symbian: SUBDIRS = designer +- wince*: SUBDIRS = qtestlib designer +- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig +- win32:!wince*:SUBDIRS += activeqt ++ qdoc3 + } + +-mac { +- SUBDIRS += macdeployqt +-} +- +-embedded:SUBDIRS += kmap2qmap +- +-contains(QT_CONFIG, dbus):SUBDIRS += qdbus +-!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator +-embedded: SUBDIRS += makeqpf +- + CONFIG+=ordered + QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.0_beta1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..1806cfecde65 --- /dev/null +++ b/x11-libs/qt-assistant/qt-assistant-4.6.0_beta1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:46:56 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The assistant help module for the Qt toolkit." +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + ~x11-libs/qt-gui-${PV} + ~x11-libs/qt-sql-${PV}[sqlite] + ~x11-libs/qt-webkit-${PV} +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.6-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() { + qt4-build_src_compile + # ugly hack to build docs + cd "${S}" + export LD_LIBRARY_PATH="${S}/lib" + 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}" + 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 dd0844d65118..498e29cd6411 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.62 2009/10/11 16:59:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.63 2009/10/16 16:51:30 wired Exp $ + +*qt-core-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-core-4.6.0_beta1.ebuild, metadata.xml: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-core-4.5.2.ebuild: alpha/ia64/sparc stable wrt #286653 diff --git a/x11-libs/qt-core/metadata.xml b/x11-libs/qt-core/metadata.xml index 4ee56059c6bc..bee11797dfcb 100644 --- a/x11-libs/qt-core/metadata.xml +++ b/x11-libs/qt-core/metadata.xml @@ -4,6 +4,7 @@ <herd>qt</herd> <use> <flag name='glib'>Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> + <flag name='optimized-qmake'>Enable qmake optimization</flag> <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.</flag> </use> diff --git a/x11-libs/qt-core/qt-core-4.6.0_beta1.ebuild b/x11-libs/qt-core/qt-core-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..a5c6ea9d1db6 --- /dev/null +++ b/x11-libs/qt-core/qt-core-4.6.0_beta1.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:51:30 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="doc +glib iconv optimized-qmake qt3support ssl" + +RDEPEND="sys-libs/zlib + glib? ( dev-libs/glib ) + ssl? ( dev-libs/openssl ) + !<x11-libs/qt-gui-${PVR} + !<x11-libs/qt-4.4.0:4" +DEPEND="${RDEPEND} + dev-util/pkgconfig" +PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[qt3support] )" + +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" + +# Most ebuilds include almost everything for testing +# Will clear out unneeded directories after everything else works OK +QT4_EXTRACT_DIRECTORIES=" +include/Qt +include/QtCore +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/script +tools/linguist/shared +translations" + +pkg_setup() { + qt4-build_pkg_setup + + if has_version x11-libs/qt-core; then + # Check to see if they've changed the glib flag since the last time installing this package. + if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then + ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." + ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." + elif ! use glib && built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then + ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." + ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." + fi + + # Check to see if they've changed the qt3support flag since the last time installing this package. + # If so, give a list of packages they need to uninstall first. + if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then + local need_to_remove + ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." + for x in sql opengl gui qt3support; do + local pkg="x11-libs/qt-${x}" + if has_version $pkg; then + need_to_remove="${need_to_remove} ${pkg}" + fi + done + if [[ -n ${need_to_remove} ]]; then + die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}" + fi + elif ! use qt3support && built_with_use x11-libs/qt-core qt3support ; then + local need_to_remove + ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." + for x in sql opengl gui qt3support; do + local pkg="x11-libs/qt-${x}" + if has_version $pkg; then + need_to_remove="${need_to_remove} ${pkg}" + fi + done + if [[ -n ${need_to_remove} ]]; then + die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}" + fi + fi + fi +} + +src_unpack() { + if use doc; then + QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES} + doc/" + QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + tools/qdoc3" + fi + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + ${QT4_EXTRACT_DIRECTORIES}" + + qt4-build_src_unpack + + # 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 +} + +src_prepare() { + 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 + LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ + || die "generating translations faied" + insinto ${QTTRANSDIR} + 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="${libdirs}:/usr/${libdir}/qt4" + done + + cat <<-EOF > "${T}/44qt4" + LDPATH=${libdirs:1} + EOF + doenvd "${T}/44qt4" + + dodir /${QTDATADIR}/mkspecs/gentoo + mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ + || die "Failed to move qconfig.pri" + + 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" + + 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_macosx.h,\ +qatomic_windows.h,\ +qatomic_windowsce.h,\ +qt_windows.h} + + keepdir "${QTSYSCONFDIR}" +} diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog index 189943ce80ab..cdf74b35f17c 100644 --- a/x11-libs/qt-dbus/ChangeLog +++ b/x11-libs/qt-dbus/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-dbus # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.39 2009/10/11 17:00:46 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.40 2009/10/16 16:48:47 wired Exp $ + +*qt-dbus-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-dbus-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-dbus-4.5.2.ebuild: alpha/ia64/sparc stable wrt #286653 diff --git a/x11-libs/qt-dbus/qt-dbus-4.6.0_beta1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..cd13aefdbdde --- /dev/null +++ b/x11-libs/qt-dbus/qt-dbus-4.6.0_beta1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:48:47 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The DBus module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="~x11-libs/qt-core-${PV}[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" + +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 77b50db1425b..6237ba6ee405 100644 --- a/x11-libs/qt-demo/ChangeLog +++ b/x11-libs/qt-demo/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-demo # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.28 2009/10/09 06:07:37 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.29 2009/10/16 16:44:04 wired Exp $ + +*qt-demo-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-demo-4.6.0_beta1.ebuild, +files/qt-demo-4.6-plugandpaint.patch: + added version 4.6.0_beta1 09 Oct 2009; Markus Meier <maekke@gentoo.org> qt-demo-4.5.2.ebuild: amd64/arm/x86 stable, bug #286653 diff --git a/x11-libs/qt-demo/files/qt-demo-4.6-plugandpaint.patch b/x11-libs/qt-demo/files/qt-demo-4.6-plugandpaint.patch new file mode 100644 index 000000000000..262996aa1068 --- /dev/null +++ b/x11-libs/qt-demo/files/qt-demo-4.6-plugandpaint.patch @@ -0,0 +1,13 @@ +diff --git a/examples/tools/plugandpaint/plugandpaint.pro b/examples/tools/plugandpaint/plugandpaint.pro +index 9616eb8..e188bc1 100644 +--- a/examples/tools/plugandpaint/plugandpaint.pro ++++ b/examples/tools/plugandpaint/plugandpaint.pro +@@ -10,7 +10,7 @@ SOURCES = main.cpp \ + symbian { + LIBS = -lpnp_basictools.lib + } else { +- LIBS = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools ++ LIBS += -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools + } + + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { diff --git a/x11-libs/qt-demo/qt-demo-4.6.0_beta1.ebuild b/x11-libs/qt-demo/qt-demo-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..c1e00d0d6f93 --- /dev/null +++ b/x11-libs/qt-demo/qt-demo-4.6.0_beta1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:44:04 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="Demonstration module of the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT} + ~x11-libs/qt-core-${PV}:${SLOT} + ~x11-libs/qt-dbus-${PV}:${SLOT} + ~x11-libs/qt-gui-${PV}:${SLOT} + ~x11-libs/qt-multimedia-${PV}:${SLOT} + ~x11-libs/qt-opengl-${PV}:${SLOT} + || ( ~x11-libs/qt-phonon-${PV}:${SLOT} media-sound/phonon ) + ~x11-libs/qt-script-${PV}:${SLOT} + ~x11-libs/qt-sql-${PV}:${SLOT} + ~x11-libs/qt-svg-${PV}:${SLOT} + ~x11-libs/qt-test-${PV}:${SLOT} + ~x11-libs/qt-webkit-${PV}:${SLOT} + ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}" + +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}/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 e75f9f52e731..0911c6b64e11 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.70 2009/10/11 17:09:07 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.71 2009/10/16 16:47:27 wired Exp $ + +*qt-gui-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> +qt-gui-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-gui-4.5.2-r2.ebuild: alpha/ia64/sparc stable wrt #286653 diff --git a/x11-libs/qt-gui/qt-gui-4.6.0_beta1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..4936ba3be457 --- /dev/null +++ b/x11-libs/qt-gui/qt-gui-4.6.0_beta1.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:47:27 wired Exp $ + +EAPI="2" +inherit eutils qt4-build + +DESCRIPTION="The GUI module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xinerama" + +RDEPEND="media-libs/fontconfig + >=media-libs/freetype-2 + media-libs/jpeg + media-libs/libpng + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXfont + x11-libs/libSM + x11-libs/libXi + ~x11-libs/qt-core-${PV}[debug=,glib=,qt3support=] + ~x11-libs/qt-script-${PV}[debug=] + cups? ( net-print/cups ) + dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] ) + gtk? ( x11-libs/gtk+:2 ) + mng? ( >=media-libs/libmng-1.0.9 ) + nas? ( >=media-libs/nas-1.5 ) + tiff? ( media-libs/tiff ) + xinerama? ( x11-libs/libXinerama ) + " +DEPEND="${RDEPEND} + xinerama? ( x11-proto/xineramaproto ) + x11-proto/xextproto + x11-proto/inputproto" +PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=] )" + +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" + +pkg_setup() { + if ! use qt3support; then + ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support." + ebeep 5 + fi + + if use raster; then + ewarn "WARNING: You have enabled raster backend rendering engine." + ewarn "This is a new feature and may lead to composite problems" + ewarn "screen corruption and broken qt4 or kde4 applications. " + ewarn "If you encounter such problems please" + ewarn "remove 'raster' use flag and re-compile qt-gui before" + ewarn "filling a bug on gentoo bugzilla." + ebeep 5 + fi + qt4-build_pkg_setup +} + +src_unpack() { + 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_src_unpack +} + +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 + + # remove some unnecessary headers + rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.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. + 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 /usr/bin/linguist Linguist \ + /usr/share/pixmaps/linguist-128-32.png \ + 'Qt;Development;GUIDesigner' \ + || die "linguist make_desktop_entry failed" + make_desktop_entry /usr/bin/designer Designer \ + /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 new file mode 100644 index 000000000000..ac5bef53d996 --- /dev/null +++ b/x11-libs/qt-multimedia/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for x11-libs/qt-multimedia +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.1 2009/10/16 16:47:56 wired Exp $ + +*qt-multimedia-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-multimedia-4.6.0_beta1.ebuild, +metadata.xml: + added version 4.6.0_beta1 + diff --git a/x11-libs/qt-multimedia/metadata.xml b/x11-libs/qt-multimedia/metadata.xml new file mode 100644 index 000000000000..dc199bb8c1e0 --- /dev/null +++ b/x11-libs/qt-multimedia/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>qt</herd> +</pkgmetadata> diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.6.0_beta1.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..cee30f99cd89 --- /dev/null +++ b/x11-libs/qt-multimedia/qt-multimedia-4.6.0_beta1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:47:56 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The Qt multimedia module" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="~x11-libs/qt-core-${PV}[debug=] + ~x11-libs/qt-gui-${PV}[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 984883bd7f06..29d2dd7071b9 100644 --- a/x11-libs/qt-opengl/ChangeLog +++ b/x11-libs/qt-opengl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-opengl # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.41 2009/10/11 17:11:15 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.42 2009/10/16 16:48:22 wired Exp $ + +*qt-opengl-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-opengl-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-opengl-4.5.2-r1.ebuild: alpha/ia64/sparc stable wrt #286653 diff --git a/x11-libs/qt-opengl/qt-opengl-4.6.0_beta1.ebuild b/x11-libs/qt-opengl/qt-opengl-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..265121f6616e --- /dev/null +++ b/x11-libs/qt-opengl/qt-opengl-4.6.0_beta1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:48:22 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The OpenGL module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="qt3support" + +DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=] + ~x11-libs/qt-gui-${PV}[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 7f0953ed2149..eabd9cef6d0d 100644 --- a/x11-libs/qt-phonon/ChangeLog +++ b/x11-libs/qt-phonon/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-phonon # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.39 2009/10/11 17:10:06 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.40 2009/10/16 16:51:03 wired Exp $ + +*qt-phonon-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-phonon-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-phonon-4.5.2.ebuild: alpha stable wrt #286653 diff --git a/x11-libs/qt-phonon/qt-phonon-4.6.0_beta1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..d6cc8c8193dc --- /dev/null +++ b/x11-libs/qt-phonon/qt-phonon-4.6.0_beta1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:51:03 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The Phonon module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="dbus" + +DEPEND="~x11-libs/qt-gui-${PV}[debug=,glib,qt3support] + !kde-base/phonon-kde + !kde-base/phonon-xine + !media-sound/phonon + media-libs/gstreamer + media-libs/gst-plugins-base + dbus? ( =x11-libs/qt-dbus-${PV}[debug=] )" +RDEPEND="${DEPEND}" + +QT4_TARGET_DIRECTORIES=" +src/phonon +src/plugins/phonon" +QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} +include/ +src" + +QCONFIG_ADD="phonon" +QCONFIG_DEFINE="QT_GSTREAMER" + +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 6bbfe7a44836..0d58f41ecc86 100644 --- a/x11-libs/qt-qt3support/ChangeLog +++ b/x11-libs/qt-qt3support/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-qt3support # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.46 2009/10/11 17:07:49 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.47 2009/10/16 16:49:17 wired Exp $ + +*qt-qt3support-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-qt3support-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-qt3support-4.5.2.ebuild: alpha/ia64/sparc stable wrt #286653 diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.6.0_beta1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..d03e2df98e3a --- /dev/null +++ b/x11-libs/qt-qt3support/qt-qt3support-4.6.0_beta1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:49:17 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The Qt3 support module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="+accessibility kde phonon" + +DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support] + ~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support] + ~x11-libs/qt-sql-${PV}[debug=,qt3support] + phonon? ( + !kde? ( || ( ~x11-libs/qt-phonon-${PV}[debug=] + media-sound/phonon[gstreamer] ) ) + kde? ( media-sound/phonon[gstreamer] ) )" + +RDEPEND="${DEPEND} + !=x11-libs/qt-gui-${PV}-r1 +" + +QT4_TARGET_DIRECTORIES=" +src/qt3support +src/tools/uic3 +tools/designer/src/plugins/widgets +tools/qtconfig +tools/porting" +QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} +src/ +include/ +tools/" + +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 65f8b257f3b0..400596eac933 100644 --- a/x11-libs/qt-script/ChangeLog +++ b/x11-libs/qt-script/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-script # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.42 2009/10/11 17:03:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.43 2009/10/16 16:44:56 wired Exp $ + +*qt-script-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-script-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-script-4.5.2.ebuild: alpha/ia64/sparc stable wrt #286653 diff --git a/x11-libs/qt-script/qt-script-4.6.0_beta1.ebuild b/x11-libs/qt-script/qt-script-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..d206d28c9eca --- /dev/null +++ b/x11-libs/qt-script/qt-script-4.6.0_beta1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:44:56 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The ECMAScript module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="iconv" + +DEPEND="~x11-libs/qt-core-${PV}[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/ +" + +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 799479c25a1c..4201ab55a2f2 100644 --- a/x11-libs/qt-sql/ChangeLog +++ b/x11-libs/qt-sql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-sql # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.52 2009/10/11 17:02:13 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.53 2009/10/16 16:46:03 wired Exp $ + +*qt-sql-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> +qt-sql-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-sql-4.5.2.ebuild: alpha/ia64/sparc stable wrt #286653 diff --git a/x11-libs/qt-sql/qt-sql-4.6.0_beta1.ebuild b/x11-libs/qt-sql/qt-sql-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..157fba05560a --- /dev/null +++ b/x11-libs/qt-sql/qt-sql-4.6.0_beta1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:46:03 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The SQL module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="firebird iconv mysql odbc postgres qt3support +sqlite" + +DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=] + firebird? ( dev-db/firebird ) + mysql? ( virtual/mysql ) + odbc? ( dev-db/unixODBC ) + postgres? ( virtual/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/sql +src/3rdparty +src/tools" + +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/usr/include/mysql -L/usr/$(get_libdir)/mysql ") + $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I/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 cc0f84181bdc..adeb0c934b98 100644 --- a/x11-libs/qt-svg/ChangeLog +++ b/x11-libs/qt-svg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-svg # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.41 2009/10/11 17:12:21 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.42 2009/10/16 16:50:08 wired Exp $ + +*qt-svg-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> +qt-svg-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-svg-4.5.2.ebuild: alpha/ia64/sparc stable wrt #286653 diff --git a/x11-libs/qt-svg/qt-svg-4.6.0_beta1.ebuild b/x11-libs/qt-svg/qt-svg-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..8ca503a4ba9d --- /dev/null +++ b/x11-libs/qt-svg/qt-svg-4.6.0_beta1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:50:08 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The SVG module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="iconv" + +DEPEND="~x11-libs/qt-gui-${PV}[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 6380ae3535e9..4d499de5784f 100644 --- a/x11-libs/qt-test/ChangeLog +++ b/x11-libs/qt-test/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-test # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.40 2009/10/11 17:04:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.41 2009/10/16 16:49:42 wired Exp $ + +*qt-test-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-test-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-test-4.5.2.ebuild: alpha/ia64/sparc stable wrt #286653 diff --git a/x11-libs/qt-test/qt-test-4.6.0_beta1.ebuild b/x11-libs/qt-test/qt-test-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..4bbfd5736127 --- /dev/null +++ b/x11-libs/qt-test/qt-test-4.6.0_beta1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:49:42 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The testing framework module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="iconv" + +DEPEND="~x11-libs/qt-core-${PV}[debug=]" +RDEPEND="${DEPEND}" + +QT4_TARGET_DIRECTORIES="src/testlib" +QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} +include/QtTest/ +include/QtCore/ +src/corelib/" + +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 41b7b6eecc21..a2f2f7d38eb5 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.55 2009/10/11 17:14:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.56 2009/10/16 16:46:30 wired Exp $ + +*qt-webkit-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-webkit-4.6.0_beta1.ebuild, +files/sparc-qt-webkit-sigbus.patch: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-webkit-4.5.2-r1.ebuild: alpha/ia64 stable wrt #286653 diff --git a/x11-libs/qt-webkit/files/sparc-qt-webkit-sigbus.patch b/x11-libs/qt-webkit/files/sparc-qt-webkit-sigbus.patch new file mode 100644 index 000000000000..7bb297f988ef --- /dev/null +++ b/x11-libs/qt-webkit/files/sparc-qt-webkit-sigbus.patch @@ -0,0 +1,148 @@ +commit 11c220f6d31898a7a1dfafd5d96619fefe6ba597 +Author: Mike Hommey <glandium@debian.org> +Date: Sun Jul 6 10:37:28 2008 +0200 + + Fixed some alignment problems on sparc + + (and some that might occur on arm, too). + + Some compiler warnings about alignment remain, but I don't know if they are + a real problem yet. + +diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp +index 1ba1290..7f08646 100644 +--- a/JavaScriptCore/wtf/FastMalloc.cpp ++++ b/JavaScriptCore/wtf/FastMalloc.cpp +@@ -1824,13 +1824,13 @@ static TCMalloc_Central_FreeListPadded central_cache[kNumClasses]; + + // Page-level allocator + static SpinLock pageheap_lock = SPINLOCK_INITIALIZER; +-static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)]; ++static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)]; + static bool phinited = false; + + // Avoid extra level of indirection by making "pageheap" be just an alias + // of pageheap_memory. + typedef union { +- void* m_memory; ++ uint64_t* m_memory; + TCMalloc_PageHeap* m_pageHeap; + } PageHeapUnion; + +diff --git a/JavaScriptCore/wtf/ListHashSet.h b/JavaScriptCore/wtf/ListHashSet.h +index 5aa13cd..ce09222 100644 +--- a/JavaScriptCore/wtf/ListHashSet.h ++++ b/JavaScriptCore/wtf/ListHashSet.h +@@ -122,7 +122,7 @@ namespace WTF { + : m_freeList(pool()) + , m_isDoneWithInitialFreeList(false) + { +- memset(m_pool.pool, 0, sizeof(m_pool.pool)); ++ memset(m_pool, 0, sizeof(m_pool)); + } + + Node* allocate() +@@ -166,7 +166,7 @@ namespace WTF { + } + + private: +- Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); } ++ Node* pool() { return reinterpret_cast<Node*>(m_pool); } + Node* pastPool() { return pool() + m_poolSize; } + + bool inPool(Node* node) +@@ -177,10 +177,7 @@ namespace WTF { + Node* m_freeList; + bool m_isDoneWithInitialFreeList; + static const size_t m_poolSize = 256; +- union { +- char pool[sizeof(Node) * m_poolSize]; +- double forAlignment; +- } m_pool; ++ uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)]; + }; + + template<typename ValueArg> struct ListHashSetNode { +diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h +index d935052..ce44c25 100644 +--- a/JavaScriptCore/wtf/Platform.h ++++ b/JavaScriptCore/wtf/Platform.h +@@ -172,6 +172,23 @@ + #define WTF_PLATFORM_X86_64 1 + #endif + ++/* PLATFORM(SPARC) */ ++#if defined(__sparc__) \ ++ || defined(__sparc) ++#define WTF_PLATFORM_SPARC 1 ++#define WTF_PLATFORM_BIG_ENDIAN 1 ++#endif ++ ++/* For undefined platforms */ ++#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN) ++#include <sys/param.h> ++#if __BYTE_ORDER == __BIG_ENDIAN ++#define WTF_PLATFORM_BIG_ENDIAN 1 ++#elif __BYTE_ORDER == __PDP_ENDIAN ++#define WTF_PLATFORM_MIDDLE_ENDIAN 1 ++#endif ++#endif ++ + /* Compiler */ + + /* COMPILER(MSVC) */ +diff --git a/JavaScriptCore/wtf/Vector.h b/JavaScriptCore/wtf/Vector.h +index 41ab32c..671b20b 100644 +--- a/JavaScriptCore/wtf/Vector.h ++++ b/JavaScriptCore/wtf/Vector.h +@@ -386,8 +386,7 @@ namespace WTF { + static const size_t m_inlineBufferSize = inlineCapacity * sizeof(T); + T* inlineBuffer() { return reinterpret_cast<T*>(&m_inlineBuffer); } + +- // FIXME: Nothing guarantees this buffer is appropriately aligned to hold objects of type T. +- char m_inlineBuffer[m_inlineBufferSize]; ++ uint64_t m_inlineBuffer[(m_inlineBufferSize + sizeof(uint64_t) - 1) / sizeof(uint64_t)]; + }; + + template<typename T, size_t inlineCapacity = 0> +diff --git a/WebCore/platform/text/AtomicString.cpp b/WebCore/platform/text/AtomicString.cpp +index d908dca..1460904 100644 +--- a/WebCore/platform/text/AtomicString.cpp ++++ b/WebCore/platform/text/AtomicString.cpp +@@ -94,7 +94,7 @@ static inline bool equal(StringImpl* string, const UChar* characters, unsigned l + if (string->length() != length) + return false; + +-#if PLATFORM(ARM) ++#if PLATFORM(ARM) || PLATFORM(SPARC) + const UChar* stringCharacters = string->characters(); + for (unsigned i = 0; i != length; ++i) { + if (*stringCharacters++ != *characters++) +diff --git a/WebCore/platform/text/StringHash.h b/WebCore/platform/text/StringHash.h +index 1eba8c7..8e16b51 100644 +--- a/WebCore/platform/text/StringHash.h ++++ b/WebCore/platform/text/StringHash.h +@@ -46,6 +46,15 @@ namespace WebCore { + if (aLength != bLength) + return false; + ++#if PLATFORM(ARM) || PLATFORM(SPARC) ++ const UChar* aChars = a->characters(); ++ const UChar* bChars = b->characters(); ++ for (unsigned i = 0; i != aLength; ++i) ++ if (*aChars++ != *bChars++) ++ return false; ++ ++ return true; ++#else + const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters()); + const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters()); + +@@ -58,6 +67,7 @@ namespace WebCore { + return false; + + return true; ++#endif + } + + static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); } diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.0_beta1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..fab3e91f06c8 --- /dev/null +++ b/x11-libs/qt-webkit/qt-webkit-4.6.0_beta1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:46:30 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The Webkit module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="kde" + +DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl] + ~x11-libs/qt-gui-${PV}[debug=] + !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon ) ) + kde? ( media-sound/phonon )" +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" + +src_prepare() { + [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 + if use sparc; then + epatch "${FILESDIR}"/sparc-qt-webkit-sigbus.patch + fi + 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 8ff3c684a865..a746da35c755 100644 --- a/x11-libs/qt-xmlpatterns/ChangeLog +++ b/x11-libs/qt-xmlpatterns/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-xmlpatterns # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.39 2009/10/11 17:05:26 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.40 2009/10/16 16:44:29 wired Exp $ + +*qt-xmlpatterns-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> + +qt-xmlpatterns-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-xmlpatterns-4.5.2.ebuild: diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0_beta1.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..85b13186c8e4 --- /dev/null +++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0_beta1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2009 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.0_beta1.ebuild,v 1.1 2009/10/16 16:44:29 wired Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The patternist module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="~x11-libs/qt-core-${PV}[debug=]" +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" + +src_configure() { + myconf="${myconf} -xmlpatterns" + qt4-build_src_configure +} diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 10efd1d01c17..25212775533e 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.590 2009/10/11 17:31:20 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.591 2009/10/16 16:50:37 wired Exp $ + +*qt-4.6.0_beta1 (16 Oct 2009) + + 16 Oct 2009; Alex Alexander <wired@gentoo.org> +qt-4.6.0_beta1.ebuild: + added version 4.6.0_beta1 11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-4.5.2.ebuild: alpha/ia64 stable wrt #286653 diff --git a/x11-libs/qt/qt-4.6.0_beta1.ebuild b/x11-libs/qt/qt-4.6.0_beta1.ebuild new file mode 100644 index 000000000000..af59b68b8d31 --- /dev/null +++ b/x11-libs/qt/qt-4.6.0_beta1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.6.0_beta1.ebuild,v 1.1 2009/10/16 16:50:37 wired Exp $ + +EAPI=2 +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +HOMEPAGE="http://www.qtsoftware.com/" + +LICENSE="|| ( LGPL-2.1 GPL-3 )" +SLOT="4" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86" +IUSE="dbus kde opengl qt3support" + +DEPEND="" +RDEPEND="~x11-libs/qt-core-${PV} + ~x11-libs/qt-gui-${PV} + ~x11-libs/qt-svg-${PV} + ~x11-libs/qt-sql-${PV} + ~x11-libs/qt-script-${PV} + ~x11-libs/qt-xmlpatterns-${PV} + dbus? ( ~x11-libs/qt-dbus-${PV} ) + opengl? ( ~x11-libs/qt-opengl-${PV} ) + !kde? ( || ( ~x11-libs/qt-phonon-${PV} media-sound/phonon ) ) + kde? ( media-sound/phonon ) + qt3support? ( ~x11-libs/qt-qt3support-${PV} ) + ~x11-libs/qt-webkit-${PV} + ~x11-libs/qt-test-${PV} + ~x11-libs/qt-multimedia-${PV} + ~x11-libs/qt-assistant-${PV}" + +pkg_postinst() { + echo + elog "Please note that this meta package is only provided for convenience." + elog "No packages should depend directly on this meta package, but on the" + elog "specific split Qt packages needed. This ebuild will be removed in" + elog "future versions. Users that want all Qt components installed are" + elog "advised to use the set currently available in qting-edge overlay." + echo +} |