diff options
author | Alex Alexander <wired@gentoo.org> | 2010-11-09 15:51:33 +0000 |
---|---|---|
committer | Alex Alexander <wired@gentoo.org> | 2010-11-09 15:51:33 +0000 |
commit | eb8dc3c44826fd3dcf7fb37b00d14d268f9f381e (patch) | |
tree | 050b9454b303a5f559b7d6334182cc3037c50fc9 | |
parent | Version bump wrt bug #342281. (diff) | |
download | historical-eb8dc3c44826fd3dcf7fb37b00d14d268f9f381e.tar.gz historical-eb8dc3c44826fd3dcf7fb37b00d14d268f9f381e.tar.bz2 historical-eb8dc3c44826fd3dcf7fb37b00d14d268f9f381e.zip |
version bump
Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64
32 files changed, 1171 insertions, 16 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index a5cb86fb65d3..23838c0459c1 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,11 @@ # 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.98 2010/11/09 09:12:02 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.99 2010/11/09 15:51:17 wired Exp $ + +*qt-assistant-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-assistant-4.7.1.ebuild: + version bump 09 Nov 2010; Alex Alexander <wired@gentoo.org> qt-assistant-4.7.0.ebuild, metadata.xml: diff --git a/x11-libs/qt-assistant/qt-assistant-4.7.1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.7.1.ebuild new file mode 100644 index 000000000000..b217a49e0ac6 --- /dev/null +++ b/x11-libs/qt-assistant/qt-assistant-4.7.1.ebuild @@ -0,0 +1,115 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:51:17 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The assistant help module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +IUSE="compat doc +glib qt3support trace" +SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )" + +DEPEND="~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support=,trace?] + ~x11-libs/qt-sql-${PV}[aqua=,qt3support=,sqlite] + ~x11-libs/qt-webkit-${PV}[aqua=] + ~x11-libs/qt-declarative-${PV}[qt3support=]" +RDEPEND="${DEPEND}" + +pkg_setup() { + # Pixeltool isn't really assistant related, but it relies on + # the assistant libraries. doc/qch/ + QT4_TARGET_DIRECTORIES=" + tools/assistant + tools/pixeltool + tools/qdoc3" + QT4_EXTRACT_DIRECTORIES=" + tools/ + demos/ + examples/ + src/ + include/ + doc/" + + use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + tools/qttracereplay" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + ${QT4_EXTRACT_DIRECTORIES}" + qt4-build_pkg_setup +} + +src_unpack() { + qt4-build_src_unpack + # compat version + # http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ + if use compat; then + unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz + mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \ + "${S}"/tools/assistant/compat || + die "moving compat to the right place failed" + tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ || + die "unpacking the include files failed" + fi +} + +src_prepare() { + qt4-build_src_prepare + if use compat; then + epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch + fi +} + +src_configure() { + myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr + -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl + -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng + -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon + -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility + -no-fontconfig -no-multimedia -no-svg $(qt_use qt3support)" + ! use glib && myconf="${myconf} -no-glib" + qt4-build_src_configure +} + +src_compile() { + # help libQtHelp find freshly built libQtCLucene (bug #289811) + export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}" + export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" + + qt4-build_src_compile + + # ugly hack to build docs + cd "${S}" + qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die + emake qch_docs || die "emake qch_docs failed" + if use doc; then + emake docs || die "emake docs failed" + fi + qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die +} + +src_install() { + qt4-build_src_install + cd "${S}" + emake INSTALL_ROOT="${D}" install_qchdocs \ + || die "failed to install qch docs" + if use doc; then + emake INSTALL_ROOT="${D}" install_htmldocs \ + || die "failed to install htmldocs" + fi + dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3" + # install correct assistant icon, bug 241208 + dodir /usr/share/pixmaps/ || die "dodir failed" + insinto /usr/share/pixmaps/ + doins tools/assistant/tools/assistant/images/assistant.png || + die "doins failed" + # Note: absolute image path required here! + make_desktop_entry "${EPREFIX}"/usr/bin/assistant Assistant \ + "${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' || + die "make_desktop_entry failed" + + if use compat; then + insinto /usr/share/qt4/mkspecs/features || die "insinto failed" + doins tools/assistant/compat/features/assistant.prf || die "doins failed" + fi +} diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 480f3f8fe6b9..d1a759ce7031 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,11 @@ # 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.113 2010/11/06 09:34:31 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.114 2010/11/09 15:49:44 wired Exp $ + +*qt-core-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-core-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-core-4.7.0.ebuild: removed alpha keyword from qt-4.7, bug #338289 diff --git a/x11-libs/qt-core/qt-core-4.7.1.ebuild b/x11-libs/qt-core/qt-core-4.7.1.ebuild new file mode 100644 index 000000000000..df004e6df3c6 --- /dev/null +++ b/x11-libs/qt-core/qt-core-4.7.1.ebuild @@ -0,0 +1,177 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:49:44 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="+glib iconv optimized-qmake private-headers qt3support ssl" + +RDEPEND="sys-libs/zlib + glib? ( dev-libs/glib ) + ssl? ( dev-libs/openssl ) + !<x11-libs/qt-4.4.0:4" +DEPEND="${RDEPEND} + dev-util/pkgconfig" +PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/tools/bootstrap + src/tools/moc + src/tools/rcc + src/tools/uic + src/corelib + src/xml + src/network + src/plugins/codecs + tools/linguist/lconvert + tools/linguist/lrelease + tools/linguist/lupdate" + + QT4_EXTRACT_DIRECTORIES=" + include/Qt + include/QtCore + include/QtDeclarative + include/QtGui + include/QtNetwork + include/QtScript + include/QtXml + src/plugins/plugins.pro + src/plugins/qpluginbase.pri + src/src.pro + src/3rdparty/des + src/3rdparty/harfbuzz + src/3rdparty/md4 + src/3rdparty/md5 + src/3rdparty/sha1 + src/3rdparty/easing + src/3rdparty/zlib_dependency.pri + src/declarative + src/gui + src/script + tools/shared + tools/linguist/shared + translations" + qt4-build_pkg_setup + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + ${QT4_EXTRACT_DIRECTORIES}" +} + +src_prepare() { + # Don't pre-strip, bug 235026 + for i in kr jp cn tw ; do + echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro + done + + qt4-build_src_prepare + + # bug 172219 + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" + sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" +} + +src_configure() { + unset QMAKESPEC + + myconf="${myconf} + $(qt_use glib) + $(qt_use iconv) + $(qt_use optimized-qmake) + $(qt_use ssl openssl) + $(qt_use qt3support)" + + myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr + -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl + -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng + -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns + -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl + -no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools + -no-cups -no-xsync -no-xinput -no-multimedia" + qt4-build_src_configure +} + +src_compile() { + # bug 259736 + unset QMAKESPEC + qt4-build_src_compile +} + +src_install() { + dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed" + + install_directories src/{corelib,xml,network,plugins/codecs} + + emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" + + #install private headers + if use private-headers; then + insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private + find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \; + fi + # use freshly built libraries + local DYLD_FPATH= + [[ -d "${S}"/lib/QtCore.framework ]] \ + && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done) + DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ + LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ + || die "generating translations faied" + insinto ${QTTRANSDIR#${EPREFIX}} + doins translations/*.qm || die "doins translations failed" + + setqtenv + fix_library_files + + # List all the multilib libdirs + local libdirs= + for libdir in $(get_all_libdirs); do + libdirs+=:${EPREFIX}/usr/${libdir}/qt4 + done + + cat <<-EOF > "${T}/44qt4" + LDPATH="${libdirs:1}" + EOF + doenvd "${T}/44qt4" + + dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed" + mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ + || die "Failed to move qconfig.pri" + + # Framework hacking + if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then + #TODO do this better + sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ + "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ + || die "sed for qconfig.h failed." + dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo || + die "dosym failed" + else + sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ + "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ + "${D}${QTHEADERDIR}"/Qt/qconfig.h \ + || die "sed for qconfig.h failed" + fi + + if use glib; then + QCONFIG_DEFINE="$(use glib && echo QT_GLIB) + $(use ssl && echo QT_OPENSSL)" + install_qconfigs + fi + # remove .la files + find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm + # remove some unnecessary headers + rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ +qatomic_windows.h,\ +qatomic_windowsce.h,\ +qt_windows.h} + + keepdir "${QTSYSCONFDIR#${EPREFIX}}" + + # Framework magic + fix_includes +} diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog index 1b6c704c9f87..35f5f9d20df6 100644 --- a/x11-libs/qt-dbus/ChangeLog +++ b/x11-libs/qt-dbus/ChangeLog @@ -1,6 +1,11 @@ # 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.79 2010/11/06 09:34:54 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.80 2010/11/09 15:47:37 wired Exp $ + +*qt-dbus-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-dbus-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-dbus-4.7.0.ebuild: removed alpha keyword from qt-4.7, bug #338289 diff --git a/x11-libs/qt-dbus/qt-dbus-4.7.1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.7.1.ebuild new file mode 100644 index 000000000000..74095a6f6044 --- /dev/null +++ b/x11-libs/qt-dbus/qt-dbus-4.7.1.ebuild @@ -0,0 +1,39 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:47:37 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The DBus module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=] + >=sys-apps/dbus-1.0.2" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/dbus + tools/qdbus/qdbus + tools/qdbus/qdbusxml2cpp + tools/qdbus/qdbuscpp2xml" + QCONFIG_ADD="dbus dbus-linked" + QCONFIG_DEFINE="QT_DBUS" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/QtCore + include/QtDBus + include/QtXml + src/corelib + src/xml" + + qt4-build_pkg_setup +} + +src_configure() { + myconf="${myconf} -dbus-linked" + qt4-build_src_configure +} diff --git a/x11-libs/qt-declarative/ChangeLog b/x11-libs/qt-declarative/ChangeLog index 73daed9b05be..94d0c09ecf3b 100644 --- a/x11-libs/qt-declarative/ChangeLog +++ b/x11-libs/qt-declarative/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-declarative # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.11 2010/11/06 19:35:06 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.12 2010/11/09 15:51:33 wired Exp $ + +*qt-declarative-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> + +qt-declarative-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-declarative-4.7.0.ebuild: diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.1.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.1.ebuild new file mode 100644 index 000000000000..ea42177b5591 --- /dev/null +++ b/x11-libs/qt-declarative/qt-declarative-4.7.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.1.ebuild,v 1.1 2010/11/09 15:51:33 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The Declarative module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +IUSE="private-headers qt3support" + +DEPEND="~x11-libs/qt-core-${PV}[aqua=,qt3support=] + ~x11-libs/qt-gui-${PV}[aqua=,qt3support=] + ~x11-libs/qt-multimedia-${PV}[aqua=] + ~x11-libs/qt-opengl-${PV}[aqua=,qt3support=] + ~x11-libs/qt-script-${PV}[aqua=] + ~x11-libs/qt-sql-${PV}[aqua=,qt3support=] + ~x11-libs/qt-svg-${PV}[aqua=] + ~x11-libs/qt-webkit-${PV}[aqua=] + ~x11-libs/qt-xmlpatterns-${PV}[aqua=] + qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=] ) + " +RDEPEND="${DEPEND}" + +pkg_setup() { + QCONFIG_ADD="declarative" + + QT4_TARGET_DIRECTORIES=" + src/declarative + tools/qml" + QT4_EXTRACT_DIRECTORIES=" + include/ + src/ + tools/" + + qt4-build_pkg_setup +} + +src_configure() { + myconf="${myconf} -declarative $(qt_use qt3support)" + qt4-build_src_configure +} + +src_install() { + qt4-build_src_install + if use private-headers; then + insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private + find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \; + fi +} diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index 65ac2c4c977c..7dd16559c130 100644 --- a/x11-libs/qt-demo/ChangeLog +++ b/x11-libs/qt-demo/ChangeLog @@ -1,6 +1,11 @@ # 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.60 2010/11/06 19:16:57 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.61 2010/11/09 15:49:26 wired Exp $ + +*qt-demo-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-demo-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-demo-4.7.0.ebuild, metadata.xml: diff --git a/x11-libs/qt-demo/qt-demo-4.7.1.ebuild b/x11-libs/qt-demo/qt-demo-4.7.1.ebuild new file mode 100644 index 000000000000..e3e20bdcc60f --- /dev/null +++ b/x11-libs/qt-demo/qt-demo-4.7.1.ebuild @@ -0,0 +1,55 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:49:26 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="Demonstration module of the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="kde qt3support" + +DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-core-${PV}:${SLOT}[aqua=,qt3support=] + ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,qt3support=] + ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,qt3support=] + !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=] + media-sound/phonon[aqua=] ) ) + kde? ( media-sound/phonon[aqua=] ) + ~x11-libs/qt-script-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,qt3support=] + ~x11-libs/qt-svg-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-test-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=] + ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=]" + +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-4.6-plugandpaint.patch" ) + +pkg_setup() { + QT4_TARGET_DIRECTORIES="demos + examples" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + doc/src/images + src/ + include/ + tools/" + + qt4-build_pkg_setup +} + +src_configure() { + myconf="${myconf} $(qt_use qt3support)" + qt4-build_src_configure +} + +src_install() { + insinto "${QTDOCDIR#${EPREFIX}}"/src + doins -r "${S}"/doc/src/images || die "Installing images failed." + + qt4-build_src_install +} diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index a2f49d2d64f8..99f7d9a14775 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.124 2010/11/07 19:31:49 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.125 2010/11/09 15:47:19 wired Exp $ + +*qt-gui-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-gui-4.7.1.ebuild: + version bump 07 Nov 2010; Jory A. Pratt <anarchy@gentoo.org> qt-gui-4.6.2.ebuild, qt-gui-4.6.2-r1.ebuild, qt-gui-4.7.0.ebuild, qt-gui-4.7.0-r1.ebuild: diff --git a/x11-libs/qt-gui/qt-gui-4.7.1.ebuild b/x11-libs/qt-gui/qt-gui-4.7.1.ebuild new file mode 100644 index 000000000000..e80b28f953df --- /dev/null +++ b/x11-libs/qt-gui/qt-gui-4.7.1.ebuild @@ -0,0 +1,166 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:47:19 wired Exp $ + +EAPI="3" +inherit confutils qt4-build + +DESCRIPTION="The GUI module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="+accessibility cups dbus egl +glib gtk mng nas nis private-headers qt3support +raster tiff trace xinerama" + +RDEPEND="media-libs/fontconfig + media-libs/freetype:2 + virtual/jpeg + 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 + ) + gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) ) + 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" + use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" + + qt4-build_pkg_setup +} + +src_prepare() { + qt4-build_src_prepare + + # Don't build plugins this go around, because they depend on qt3support lib + sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro +} + +src_configure() { + export PATH="${S}/bin:${PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + myconf="$(qt_use accessibility) + $(qt_use cups) + $(qt_use glib) + $(qt_use mng libmng system) + $(qt_use nis) + $(qt_use tiff libtiff system) + $(qt_use dbus qdbus) + $(qt_use dbus) + $(qt_use egl) + $(qt_use qt3support) + $(qt_use 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 -no-webkit + -no-phonon -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/ || die + insinto /usr/include/qt4/QtDesigner/private/ + doins "${S}"/tools/designer/src/lib/shared/* || die + doins "${S}"/tools/designer/src/lib/sdk/* || die + #install private headers + if use private-headers; then + insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private + find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \; + fi + + # install correct designer and linguist icons, bug 241208 + doicon tools/linguist/linguist/images/icons/linguist-128-32.png \ + tools/designer/src/designer/images/designer.png \ + || die "doicon failed" + # Note: absolute image path required here! + make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \ + "${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \ + 'Qt;Development;GUIDesigner' \ + || die "linguist make_desktop_entry failed" + make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \ + "${EPREFIX}"/usr/share/pixmaps/designer.png \ + 'Qt;Development;GUIDesigner' \ + || die "designer make_desktop_entry failed" +} diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog index d8a744dbde6d..974ecd745198 100644 --- a/x11-libs/qt-multimedia/ChangeLog +++ b/x11-libs/qt-multimedia/ChangeLog @@ -1,6 +1,12 @@ # 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.33 2010/11/06 09:35:44 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.34 2010/11/09 15:50:19 wired Exp $ + +*qt-multimedia-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> + +qt-multimedia-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-multimedia-4.7.0.ebuild: removed alpha keyword from qt-4.7, bug #338289 diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.7.1.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.7.1.ebuild new file mode 100644 index 000000000000..1f38411c3a67 --- /dev/null +++ b/x11-libs/qt-multimedia/qt-multimedia-4.7.1.ebuild @@ -0,0 +1,49 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:50:19 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The Qt multimedia module" +SLOT="4" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="iconv" + +DEPEND="!aqua? ( media-libs/alsa-lib ) + ~x11-libs/qt-core-${PV}[aqua=,debug=] + ~x11-libs/qt-gui-${PV}[aqua=,debug=]" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES="src/multimedia" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/Qt/ + include/QtCore/ + include/QtGui/ + include/QtMultimedia/ + include/QtNetwork/ + src/src.pro + src/3rdparty/ + src/corelib/ + src/gui/ + src/network/ + src/plugins/ + src/tools/" + + qt4-build_pkg_setup +} + +src_configure() { + myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender + -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm + -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng + -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon + -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility + -no-fontconfig -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite + -no-sql-sqlite2 -no-sql-odbc -no-glib -no-opengl -no-svg -no-gtkstyle + -no-phonon-backend -no-script -no-scripttools -no-cups -no-xsync + -no-xinput" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog index 32c1e6b5ab01..5fe42652a878 100644 --- a/x11-libs/qt-opengl/ChangeLog +++ b/x11-libs/qt-opengl/ChangeLog @@ -1,6 +1,11 @@ # 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.80 2010/11/06 09:36:08 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.81 2010/11/09 15:48:31 wired Exp $ + +*qt-opengl-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-opengl-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-opengl-4.7.0.ebuild, qt-opengl-4.7.0-r1.ebuild: diff --git a/x11-libs/qt-opengl/qt-opengl-4.7.1.ebuild b/x11-libs/qt-opengl/qt-opengl-4.7.1.ebuild new file mode 100644 index 000000000000..f162945f68ad --- /dev/null +++ b/x11-libs/qt-opengl/qt-opengl-4.7.1.ebuild @@ -0,0 +1,47 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:48:31 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The OpenGL module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="egl qt3support" + +DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=] + ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qt3support=] + virtual/opengl" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/opengl + src/plugins/graphicssystems/opengl" + + QT4_EXTRACT_DIRECTORIES=" + include/QtCore + include/QtGui + include/QtOpenGL + src/corelib + src/gui + src/opengl + src/plugins + src/3rdparty" + + QCONFIG_ADD="opengl" + QCONFIG_DEFINE="QT_OPENGL $(use egl && echo QT_EGL)" + qt4-build_pkg_setup +} + +src_configure() { + myconf="${myconf} -opengl + $(qt_use qt3support) + $(qt_use egl)" + + qt4-build_src_configure + + # Not building tools/designer/src/plugins/tools/view3d as it's + # commented out of the build in the source +} diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog index 257e8d7973e5..61f09585096d 100644 --- a/x11-libs/qt-phonon/ChangeLog +++ b/x11-libs/qt-phonon/ChangeLog @@ -1,6 +1,11 @@ # 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.84 2010/11/06 09:36:31 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.85 2010/11/09 15:50:02 wired Exp $ + +*qt-phonon-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-phonon-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-phonon-4.7.0.ebuild: removed alpha keyword from qt-4.7, bug #338289 diff --git a/x11-libs/qt-phonon/qt-phonon-4.7.1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.7.1.ebuild new file mode 100644 index 000000000000..e311a77ad4ea --- /dev/null +++ b/x11-libs/qt-phonon/qt-phonon-4.7.1.ebuild @@ -0,0 +1,44 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:50:02 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The Phonon module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="dbus" + +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 b030cd529c4a..d2069d0a192e 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.84 2010/11/06 09:36:54 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.85 2010/11/09 15:49:08 wired Exp $ + +*qt-qt3support-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> + +qt-qt3support-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-qt3support-4.7.0.ebuild: removed alpha keyword from qt-4.7, bug #338289 diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.7.1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.7.1.ebuild new file mode 100644 index 000000000000..7eb6c14ed3a5 --- /dev/null +++ b/x11-libs/qt-qt3support/qt-qt3support-4.7.1.ebuild @@ -0,0 +1,44 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:49:08 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The Qt3 support module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="+accessibility kde phonon" + +DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support] + ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support] + ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support] + phonon? ( + !kde? ( || ( ~x11-libs/qt-phonon-${PV}[aqua=,debug=] + media-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 c364fa705474..88fd515e2e29 100644 --- a/x11-libs/qt-script/ChangeLog +++ b/x11-libs/qt-script/ChangeLog @@ -1,6 +1,11 @@ # 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.82 2010/11/06 09:37:17 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.83 2010/11/09 15:48:49 wired Exp $ + +*qt-script-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-script-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-script-4.7.0.ebuild: removed alpha keyword from qt-4.7, bug #338289 diff --git a/x11-libs/qt-script/qt-script-4.7.1.ebuild b/x11-libs/qt-script/qt-script-4.7.1.ebuild new file mode 100644 index 000000000000..843cd73f747a --- /dev/null +++ b/x11-libs/qt-script/qt-script-4.7.1.ebuild @@ -0,0 +1,46 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:48:49 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The ECMAScript module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="iconv private-headers" + +DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES="src/script/" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/Qt/ + include/QtCore/ + include/QtScript/ + src/3rdparty/javascriptcore/ + src/corelib/" + + qt4-build_pkg_setup +} + +src_configure() { + myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender + -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm + -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng + -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon + -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff + -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg + -no-gtkstyle" + qt4-build_src_configure +} + +src_install() { + qt4-build_src_install + #install private headers + if use private-headers; then + insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private + find "${S}"/src/script -type f -name "*_p.h" -exec doins {} \; + fi +} diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog index 44fe8972e6f0..fd246eac0d04 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.99 2010/11/06 09:37:41 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.100 2010/11/09 15:50:59 wired Exp $ + +*qt-sql-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-sql-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-sql-4.7.0.ebuild: removed alpha keyword from qt-4.7, bug #338289 diff --git a/x11-libs/qt-sql/qt-sql-4.7.1.ebuild b/x11-libs/qt-sql/qt-sql-4.7.1.ebuild new file mode 100644 index 000000000000..5ffa4761cd7e --- /dev/null +++ b/x11-libs/qt-sql/qt-sql-4.7.1.ebuild @@ -0,0 +1,71 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:50:59 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The SQL module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="firebird freetds iconv mysql odbc postgres qt3support +sqlite" + +DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=] + firebird? ( dev-db/firebird ) + freetds? ( dev-db/freetds ) + mysql? ( virtual/mysql ) + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql-base ) + sqlite? ( dev-db/sqlite:3 )" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/Qt/ + include/QtCore/ + include/QtSql/ + include/QtScript/ + src/src.pro + src/corelib/ + src/plugins + src/3rdparty + src/tools" + + if ! ( use firebird || use freetds || use mysql || use odbc || use postgres || use sqlite ); + then + ewarn "You need to enable at least one SQL driver. Enable at least" + ewarn "one of these USE flags: \"firebird freetds mysql odbc postgres sqlite tds\"." + die "Enable at least one SQL driver." + fi + + qt4-build_pkg_setup +} + +src_prepare() { + qt4-build_src_prepare + + sed -e '/pg_config --libs/d' -i "${S}"/configure \ + || die "sed to fix postgresql usage in ./configure failed" +} + +src_configure() { + # Don't support sqlite2 anymore + myconf="${myconf} -no-sql-sqlite2 + $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql ") + $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql ") + $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo '-system-sqlite') + $(qt_use odbc sql-odbc plugin) + $(qt_use freetds sql-tds plugin) + $(qt_use firebird sql-ibase plugin) + $(qt_use qt3support)" + + myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender + -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm + -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng + -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon + -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility + -no-fontconfig -no-glib -no-opengl -no-svg -no-gtkstyle" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog index f43448ff6972..752847e6c3bd 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.78 2010/11/06 09:38:04 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.79 2010/11/09 15:47:55 wired Exp $ + +*qt-svg-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-svg-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-svg-4.7.0.ebuild: removed alpha keyword from qt-4.7, bug #338289 diff --git a/x11-libs/qt-svg/qt-svg-4.7.1.ebuild b/x11-libs/qt-svg/qt-svg-4.7.1.ebuild new file mode 100644 index 000000000000..a9a3384b64be --- /dev/null +++ b/x11-libs/qt-svg/qt-svg-4.7.1.ebuild @@ -0,0 +1,48 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:47:55 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The SVG module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="iconv" + +DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=]" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/svg + src/plugins/imageformats/svg + src/plugins/iconengines/svgiconengine" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/QtSvg/ + include/Qt/ + include/QtGui/ + include/QtCore/ + include/QtXml/ + src/corelib/ + src/gui/ + src/plugins/ + src/xml + src/3rdparty" + + QCONFIG_ADD="svg" + QCONFIG_DEFINE="QT_SVG" + + qt4-build_pkg_setup +} + +src_configure() { + myconf="${myconf} $(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 -no-fontconfig -no-glib -no-opengl -no-gtkstyle + -v -continue" + qt4-build_src_configure +} diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog index 1dfcecd5fad6..91a31bc6276b 100644 --- a/x11-libs/qt-test/ChangeLog +++ b/x11-libs/qt-test/ChangeLog @@ -1,6 +1,11 @@ # 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.78 2010/11/06 09:38:27 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.79 2010/11/09 15:46:57 wired Exp $ + +*qt-test-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-test-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-test-4.7.0.ebuild: removed alpha keyword from qt-4.7, bug #338289 diff --git a/x11-libs/qt-test/qt-test-4.7.1.ebuild b/x11-libs/qt-test/qt-test-4.7.1.ebuild new file mode 100644 index 000000000000..73e29697b03b --- /dev/null +++ b/x11-libs/qt-test/qt-test-4.7.1.ebuild @@ -0,0 +1,34 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:46:57 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The testing framework module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="iconv" + +DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES="src/testlib" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/QtTest/ + include/QtCore/ + src/corelib/" + + qt4-build_pkg_setup +} + +src_configure() { + myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender + -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm + -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng + -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon + -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff + -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg" + qt4-build_src_configure +} diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index c3d4947fe176..5d28410447bb 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,11 @@ # 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.109 2010/11/09 10:06:26 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.110 2010/11/09 15:50:40 wired Exp $ + +*qt-webkit-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> +qt-webkit-4.7.1.ebuild: + version bump *qt-webkit-4.7.0-r1 (09 Nov 2010) *qt-webkit-4.6.3-r2 (09 Nov 2010) diff --git a/x11-libs/qt-webkit/qt-webkit-4.7.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.7.1.ebuild new file mode 100644 index 000000000000..cd2adc79ce0f --- /dev/null +++ b/x11-libs/qt-webkit/qt-webkit-4.7.1.ebuild @@ -0,0 +1,49 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:50:40 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The Webkit module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="dbus kde" + +DEPEND=" + dev-db/sqlite:3 + ~x11-libs/qt-core-${PV}[aqua=,debug=,ssl] + ~x11-libs/qt-gui-${PV}[aqua=,dbus?,debug=] + ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=] + dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) + !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=] + media-sound/phonon[aqua=] ) ) + kde? ( || ( media-sound/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/3rdparty/webkit/JavaScriptCore + src/3rdparty/webkit/WebCore + tools/designer/src/plugins/qwebview" + QT4_EXTRACT_DIRECTORIES=" + include/ + src/ + tools/" + + QCONFIG_ADD="webkit" + QCONFIG_DEFINE="QT_WEBKIT" + + qt4-build_pkg_setup +} + +src_prepare() { + [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 + + qt4-build_src_prepare +} + +src_configure() { + myconf="${myconf} -webkit -system-sqlite $(qt_use dbus qdbus)" + qt4-build_src_configure +} diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog index 3eda7be1a732..ddf01d9b09c4 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.78 2010/11/06 09:39:16 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.79 2010/11/09 15:48:12 wired Exp $ + +*qt-xmlpatterns-4.7.1 (09 Nov 2010) + + 09 Nov 2010; Alex Alexander <wired@gentoo.org> + +qt-xmlpatterns-4.7.1.ebuild: + version bump 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-xmlpatterns-4.7.0.ebuild: diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.1.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.1.ebuild new file mode 100644 index 000000000000..4bf881cefa4d --- /dev/null +++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.1.ebuild @@ -0,0 +1,36 @@ +# 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.7.1.ebuild,v 1.1 2010/11/09 15:48:13 wired Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The patternist module for the Qt toolkit" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,exceptions]" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/QtCore + include/QtNetwork + include/QtXml + include/QtXmlPatterns + src/network/ + src/xml/ + src/corelib/" + + QCONFIG_ADD="xmlpatterns" + QCONFIG_DEFINE="QT_XMLPATTERNS" + + qt4-build_pkg_setup +} + +src_configure() { + myconf="${myconf} -xmlpatterns" + qt4-build_src_configure +} |