From cb2fc1f09fa4794de02594c64ae023cf4de20801 Mon Sep 17 00:00:00 2001 From: Alex Alexander Date: Sun, 5 Feb 2012 13:00:54 +0000 Subject: raster is marked as the default in the eselect qtgraphicssystem list now Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- x11-libs/qt-gui/ChangeLog | 8 +- x11-libs/qt-gui/Manifest | 24 ++-- x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild | 223 --------------------------------- x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild | 223 +++++++++++++++++++++++++++++++++ x11-libs/qt-opengl/Manifest | 24 ++-- x11-libs/qt-openvg/Manifest | 30 ++--- 6 files changed, 279 insertions(+), 253 deletions(-) delete mode 100644 x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild create mode 100644 x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild (limited to 'x11-libs') diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 559de3d319ec..116876299624 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.163 2012/01/29 23:27:49 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.164 2012/02/05 13:00:54 wired Exp $ + +*qt-gui-4.8.0-r2 (05 Feb 2012) + + 05 Feb 2012; Alex Alexander -qt-gui-4.8.0-r1.ebuild, + +qt-gui-4.8.0-r2.ebuild: + raster is marked as the default in the eselect qtgraphicssystem list now 29 Jan 2012; Joseph Jezak qt-gui-4.7.4-r1.ebuild: Marked ppc ppc64 stable for bug #390963. diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest index b8f5b2c5e675..449c6e041cdb 100644 --- a/x11-libs/qt-gui/Manifest +++ b/x11-libs/qt-gui/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX qt-gui-4.6-libpng-1.5.patch 11322 RMD160 dba67fb2e79b96644e70715d6ffb28f3e676e884 SHA1 84c758d2fb76470b9282348a487e096dba33a92b SHA256 05c7a5aceeff1cc4c2bad065402025e6d4fead98c0eb0d786d15f65d7d1774a9 AUX qt-gui-4.7.3-cups.patch 3297 RMD160 fc99e57ccfa8db47a1df799186d6daedcbdf744d SHA1 d712b9b570101de5c996692551ba5a3ae4a410e9 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 @@ -16,13 +16,23 @@ EBUILD qt-gui-4.6.3.ebuild 5483 RMD160 000cc1f41b04464e87fa72556484fb8bdbc17c8d EBUILD qt-gui-4.7.2.ebuild 6350 RMD160 a47834c6bc9471eeb188fd26ca1394083b08225a SHA1 8e34ec70e3a1a10a7302171629f8754ea13eabdf SHA256 43e21b9cea2aac8d8ee82d46585168436bfad570e3e0695244eb300d41c02110 EBUILD qt-gui-4.7.4-r1.ebuild 6288 RMD160 2d26826f88cc497c7a41f15168e9163fe4cc831a SHA1 f2d40398896f98b20865255df2872e5c3affee19 SHA256 25c7e2de07fd3b30784fcea6498de88c0b685f69828df3c47b2ddeb04ae0b0a3 EBUILD qt-gui-4.7.4.ebuild 6169 RMD160 7f15d86f439a3dc4bc7a6e017208dbe41280405a SHA1 0bebd1b5ac74f414c5010398f416345503022057 SHA256 47714fd101a43dc994633a00bc5297d151b526efc080c6eff4304e6906188256 -EBUILD qt-gui-4.8.0-r1.ebuild 7760 RMD160 1004c3ce16f0c49a468280bf2227ff73f3461065 SHA1 6ddca80b4aa342c8424b3ffcaad689a9e4d56b22 SHA256 02c5698b59c60a8f6428e542e2ad6d09a7460b2138c7cfa386539bc181ffb61c -MISC ChangeLog 24668 RMD160 dcfbd2df9c3152b76993ed0ccd8348ee1b03dc95 SHA1 f0d6ce77cc4bc9f0d8e7fbd16f56e4bca9c68709 SHA256 edc42b2e6d0283a6f1136d6cc3da7c158af0ac253cd9b1d6caed6bae1aa37270 +EBUILD qt-gui-4.8.0-r2.ebuild 7771 RMD160 ffaa5a2e7cd34c24619dc051d8ba0be85c974b63 SHA1 a164c57929ae88999213400119dda28ce01d7cac SHA256 38a15cb96b8e189fa839d6d53af167978f76f431ff89e74afcf6e339d241d2f4 +MISC ChangeLog 24876 RMD160 d4bdb8af9f67c33d48bcdc70b400ae733db0c470 SHA1 2d385554cf540167f0d87472d2ab8d267c332f2d SHA256 10dd14aadb46f99393d78148b9897e59451aaa09de8f2943e2ecf8d14c86950c MISC metadata.xml 1321 RMD160 1542571f692bb2835d37878f355c92d733e67723 SHA1 da96dabea1aa946e1a5d9a983d6ea618dee58999 SHA256 a494da2f630a67491fd5f1950247277abce91216ed93b879cd511a13672da903 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk8l1fsACgkQcsIHjyDViGQbFACeK6XCqq4oDD6HUq3nIJc9TEYJ -PoIAoLoXbhLQ8aG4/ogAbcMoFzBuaZTk -=s7ch +iQIcBAEBCgAGBQJPLn6GAAoJEDZF8K7rm0r6H5kQALGP7nGQDq6Iq933Z25QRgqI ++wYAPSz6Y34tmpMtNAuQ0tEtLnQpFUKePhSLLmBtsfZzBo3MQR1MlR4rQA9FliYp +AmE0FRrlH9byyoCBIcBHLiLPJIhAo2fbdp7zqugxlNmqD8lqFaEcXd6Ykahlqf0m +hdSpUI95XupzIat5oYXHGrNw4KgLDi3C+vYc/dSFXmna1JJp2gjLCFxWL+oDkV0t +k/Yyvz86JLo4saLIUQMXwGeC7XKJNu8Xqnob7QNIPLAPQApGULA1lfWib+zg56KG +I0jMfxRadZirYCXiHNqvau9AWrh2WiztO/h9n+nj/AXuL6LCeQo/DudmNXacu/RS +XZthLG/FsZvLngWGNDkT3K1xF9RNYAysr7eLYhw/wvithyL5lf+PeztyDsRUFrDp +xh0vGZI/Lz0j8mpbcGNjMfkk/4H3THhMfo6lErz/S7tzBYEs7LHbqIAQUtS78k6j +udKXAL3niQtiELpcN0smPyqA2iJSqUiQpmCvGf7rdw46x/J+j0ZZQ25JKcuBncAz +5GcnuUvHmhE0pU7N8YnkaDSZEpuLRKzAMveuTM49oNFel5kYjnMCpCzzQINaShiC +vmdScq5KTaMtDUmNgFZIZr0t81WliKEKFflBNVgTtnvubw2yXISFL8blCaKV51RJ +QwXMmTRXTLaONSRbbAt8 +=J+m5 -----END PGP SIGNATURE----- diff --git a/x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild deleted file mode 100644 index 7f911d81b4dd..000000000000 --- a/x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.0-r1.ebuild,v 1.1 2012/01/29 17:02:58 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 gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama" - -RDEPEND=" - app-admin/eselect-qtgraphicssystem - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0 - sys-libs/zlib - virtual/jpeg - ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=] - ~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=] - !aqua? ( - x11-libs/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=,c++0x=,qpa=,debug=] ) - gtkstyle? ( x11-libs/gtk+:2[aqua=] ) - mng? ( >=media-libs/libmng-1.0.9 ) - nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff:0 ) - xinerama? ( x11-libs/libXinerama )" -DEPEND="${RDEPEND} - !aqua? ( - x11-proto/xextproto - x11-proto/inputproto - ) - xinerama? ( x11-proto/xineramaproto )" -RDEPEND="${RDEPEND} - !~x11-themes/qgtkstyle-4.7.2" -PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,qpa=,debug=] )" - -pkg_setup() { - # this belongs to pkg_pretend, we have to upgrade to EAPI 4 :) - # was planning to use a dep, but to reproduce this you have to - # clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed. - # no need to restrict normal first time users for that :) - if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then - echo - eerror "When building qt-gui[gtkstyle] from scratch with cairo present," - eerror "cairo must have the qt4 use flag disabled, otherwise the gtk" - eerror "style cannot be built." - ewarn - eerror "You have the following options:" - eerror " - rebuild cairo with -qt4 USE" - eerror " - build qt-gui with -gtkstyle USE" - ewarn - eerror "After you successfully install qt-gui, you'll be able to" - eerror "re-enable the disabled use flag and/or reinstall cairo." - ewarn - echo - die "can't build qt-gui with gtkstyle USE if cairo has qt4 USE enabled" - fi - - confutils_use_depend_all gtkstyle glib - - QT4_TARGET_DIRECTORIES=" - src/gui - src/scripttools - tools/designer - tools/linguist/linguist - src/plugins/imageformats/gif - src/plugins/imageformats/ico - src/plugins/imageformats/jpeg - src/plugins/inputmethods" - - QT4_EXTRACT_DIRECTORIES=" - include - src - tools" - - use 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}" - - # mac version does not contain qtconfig? - [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" - - qt4-build_pkg_setup -} - -src_prepare() { - qt4-build_src_prepare - - # Don't build plugins this go around, because they depend on qt3support lib - sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro -} - -src_configure() { - export PATH="${S}/bin:${PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - myconf="$(qt_use accessibility) - $(qt_use cups) - $(qt_use glib) - $(qt_use mng libmng system) - $(qt_use nis) - $(qt_use tiff libtiff system) - $(qt_use dbus qdbus) - $(qt_use dbus) - $(qt_use egl) - $(qt_use qt3support) - $(qt_use gtkstyle) - $(qt_use xinerama)" - - use gif || myconf="${myconf} -no-gif" - use nas && myconf="${myconf} -system-nas-sound" - - [[ x86_64-apple-darwin* ]] && myconf="${myconf} -no-ssse3" #367045 - - myconf="${myconf} -system-libpng -system-libjpeg - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 - -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit - -no-phonon -no-opengl" - - qt4-build_src_configure - - if use gtkstyle; then - einfo "patching the Makefile to fix qgtkstyle compilation" - sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile || - die "sed failed" - fi - einfo "patching the Makefile to fix bug #361277" - sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile || - die "sed failed" -} - -src_install() { - QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig - $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas) - gif png system-png system-jpeg - $(use mng && echo system-mng) - $(use tiff && echo system-tiff)" - QCONFIG_REMOVE="no-gif no-png" - QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) - $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG - $(use mng && echo QT_IMAGEFORMAT_MNG) - $(use nas && echo QT_NAS) - $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE - $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR - $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER" - - qt4-build_src_install - - # qt-creator - # some qt-creator headers are located - # under /usr/include/qt4/QtDesigner/private. - # those headers are just includes of the headers - # which are located under tools/designer/src/lib/* - # So instead of installing both, we create the private folder - # and drop tools/designer/src/lib/* headers in it. - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then - insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ - else - insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/ - fi - doins "${S}"/tools/designer/src/lib/shared/* || die - doins "${S}"/tools/designer/src/lib/sdk/* || die - - # touch the available graphics systems - mkdir -p "${D}/usr/share/qt4/graphicssystems/" || - die "could not create ${D}/usr/share/qt4/graphicssystems/" - touch "${D}/usr/share/qt4/graphicssystems/raster" || - die "could not touch ${D}/usr/share/qt4/graphicssystems/raster" - touch "${D}/usr/share/qt4/graphicssystems/native" || - die "could not touch ${D}/usr/share/qt4/graphicssystems/native" - - # install private headers - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then - insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ - else - insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private - fi - find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \; - - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then - # rerun to get links to headers right - fix_includes - fi - - # 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 linguist Linguist \ - "${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \ - 'Qt;Development;GUIDesigner' \ - || die "linguist make_desktop_entry failed" - make_desktop_entry designer Designer \ - "${EPREFIX}"/usr/share/pixmaps/designer.png \ - 'Qt;Development;GUIDesigner' \ - || die "designer make_desktop_entry failed" -} - -pkg_postinst() { - # raster is the default graphicssystems, set it if first install - eselect qtgraphicssystem set raster --use-old - elog "Starting with Qt 4.8.0, you may choose the active Qt Graphics System" - elog "by using a new eselect module called qtgraphicssystem." - elog "Run" - elog " eselect qtgraphicssystem" - elog "for more information" -} diff --git a/x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild new file mode 100644 index 000000000000..f397470fc0ef --- /dev/null +++ b/x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild,v 1.1 2012/02/05 13:00:54 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 gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama" + +RDEPEND=" + app-admin/eselect-qtgraphicssystem + media-libs/fontconfig + media-libs/freetype:2 + media-libs/libpng:0 + sys-libs/zlib + virtual/jpeg + ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=] + ~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=] + !aqua? ( + x11-libs/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=,c++0x=,qpa=,debug=] ) + gtkstyle? ( x11-libs/gtk+:2[aqua=] ) + mng? ( >=media-libs/libmng-1.0.9 ) + nas? ( >=media-libs/nas-1.5 ) + tiff? ( media-libs/tiff:0 ) + xinerama? ( x11-libs/libXinerama )" +DEPEND="${RDEPEND} + !aqua? ( + x11-proto/xextproto + x11-proto/inputproto + ) + xinerama? ( x11-proto/xineramaproto )" +RDEPEND="${RDEPEND} + !~x11-themes/qgtkstyle-4.7.2" +PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,qpa=,debug=] )" + +pkg_setup() { + # this belongs to pkg_pretend, we have to upgrade to EAPI 4 :) + # was planning to use a dep, but to reproduce this you have to + # clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed. + # no need to restrict normal first time users for that :) + if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then + echo + eerror "When building qt-gui[gtkstyle] from scratch with cairo present," + eerror "cairo must have the qt4 use flag disabled, otherwise the gtk" + eerror "style cannot be built." + ewarn + eerror "You have the following options:" + eerror " - rebuild cairo with -qt4 USE" + eerror " - build qt-gui with -gtkstyle USE" + ewarn + eerror "After you successfully install qt-gui, you'll be able to" + eerror "re-enable the disabled use flag and/or reinstall cairo." + ewarn + echo + die "can't build qt-gui with gtkstyle USE if cairo has qt4 USE enabled" + fi + + confutils_use_depend_all gtkstyle glib + + QT4_TARGET_DIRECTORIES=" + src/gui + src/scripttools + tools/designer + tools/linguist/linguist + src/plugins/imageformats/gif + src/plugins/imageformats/ico + src/plugins/imageformats/jpeg + src/plugins/inputmethods" + + QT4_EXTRACT_DIRECTORIES=" + include + src + tools" + + use 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}" + + # mac version does not contain qtconfig? + [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" + + qt4-build_pkg_setup +} + +src_prepare() { + qt4-build_src_prepare + + # Don't build plugins this go around, because they depend on qt3support lib + sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro +} + +src_configure() { + export PATH="${S}/bin:${PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + myconf="$(qt_use accessibility) + $(qt_use cups) + $(qt_use glib) + $(qt_use mng libmng system) + $(qt_use nis) + $(qt_use tiff libtiff system) + $(qt_use dbus qdbus) + $(qt_use dbus) + $(qt_use egl) + $(qt_use qt3support) + $(qt_use gtkstyle) + $(qt_use xinerama)" + + use gif || myconf="${myconf} -no-gif" + use nas && myconf="${myconf} -system-nas-sound" + + [[ x86_64-apple-darwin* ]] && myconf="${myconf} -no-ssse3" #367045 + + myconf="${myconf} -system-libpng -system-libjpeg + -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 + -no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit + -no-phonon -no-opengl" + + qt4-build_src_configure + + if use gtkstyle; then + einfo "patching the Makefile to fix qgtkstyle compilation" + sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile || + die "sed failed" + fi + einfo "patching the Makefile to fix bug #361277" + sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile || + die "sed failed" +} + +src_install() { + QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig + $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas) + gif png system-png system-jpeg + $(use mng && echo system-mng) + $(use tiff && echo system-tiff)" + QCONFIG_REMOVE="no-gif no-png" + QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) + $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG + $(use mng && echo QT_IMAGEFORMAT_MNG) + $(use nas && echo QT_NAS) + $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE + $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR + $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER" + + qt4-build_src_install + + # qt-creator + # some qt-creator headers are located + # under /usr/include/qt4/QtDesigner/private. + # those headers are just includes of the headers + # which are located under tools/designer/src/lib/* + # So instead of installing both, we create the private folder + # and drop tools/designer/src/lib/* headers in it. + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then + insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ + else + insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/ + fi + doins "${S}"/tools/designer/src/lib/shared/* || die + doins "${S}"/tools/designer/src/lib/sdk/* || die + + # touch the available graphics systems + mkdir -p "${D}/usr/share/qt4/graphicssystems/" || + die "could not create ${D}/usr/share/qt4/graphicssystems/" + echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" || + die "could not touch ${D}/usr/share/qt4/graphicssystems/raster" + touch "${D}/usr/share/qt4/graphicssystems/native" || + die "could not touch ${D}/usr/share/qt4/graphicssystems/native" + + # install private headers + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then + insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ + else + insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private + fi + find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \; + + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then + # rerun to get links to headers right + fix_includes + fi + + # 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 linguist Linguist \ + "${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \ + 'Qt;Development;GUIDesigner' \ + || die "linguist make_desktop_entry failed" + make_desktop_entry designer Designer \ + "${EPREFIX}"/usr/share/pixmaps/designer.png \ + 'Qt;Development;GUIDesigner' \ + || die "designer make_desktop_entry failed" +} + +pkg_postinst() { + # raster is the default graphicssystems, set it if first install + eselect qtgraphicssystem set raster --use-old + elog "Starting with Qt 4.8.0, you may choose the active Qt Graphics System" + elog "by using a new eselect module called qtgraphicssystem." + elog "Run" + elog " eselect qtgraphicssystem" + elog "for more information" +} diff --git a/x11-libs/qt-opengl/Manifest b/x11-libs/qt-opengl/Manifest index 46052b3e826a..d3d17cc314cc 100644 --- a/x11-libs/qt-opengl/Manifest +++ b/x11-libs/qt-opengl/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768 @@ -10,13 +10,23 @@ EBUILD qt-opengl-4.6.2.ebuild 1096 RMD160 86e107a1583c965841653f2302556f49c76bb7 EBUILD qt-opengl-4.6.3.ebuild 1108 RMD160 a50e7944df748168f563d143d3261c4874471bf1 SHA1 46b0f8ebfff8570482dd562ef0ab15f34363f4c4 SHA256 0d32b5195dd883684937749fdfa4b0a790fcb9a207f9acb253c9b254914379b0 EBUILD qt-opengl-4.7.2.ebuild 1204 RMD160 bf7174ec4a1fbff6cad66907547c421d8c1e4795 SHA1 4b2ee813e79fb1780908db663d1b811466060a98 SHA256 1d89940098cba1faaec1a09a08b11c2317cb08fa528bf6b3353b38a4e5a17e13 EBUILD qt-opengl-4.7.4.ebuild 1201 RMD160 8526dc17a1f566633ebd50ca349258a800fc174a SHA1 ef18f31cc5b86d126195761823f14af18ef2e3ff SHA256 8c8dd2be42a8411681f9bbc871c89221d149e937a5e5ad2e32e3507817ea1200 -EBUILD qt-opengl-4.8.0-r1.ebuild 1549 RMD160 00910ccbe3fe8b637b516e553fbb852c284f6c43 SHA1 a7016def0ac0b1a1d4a1f61c9ed04fa061266636 SHA256 4b18f0ce9c6b942ceed241325ae9d89444ae6460ab0b75df157f22578c15091d -MISC ChangeLog 12463 RMD160 8ce38a77a042ad4743e92ee528dc84800fbb8624 SHA1 b3387571aa0ea086157f410240cc7738058281e4 SHA256 f81389d3ea6863f46b058c344a5f42f13644b7b0649220ec302f90c5dfd859d1 +EBUILD qt-opengl-4.8.0-r2.ebuild 1561 RMD160 13583bb6dd6e004d8921c8ef1e3723a4cb83bd09 SHA1 5cd0a06c07cc83e009245a7217edc35e092c3d5b SHA256 3a6d7ed6ec526a062be1b207f8deec0fbed217a0a34ca75730820e8c3683146b +MISC ChangeLog 12675 RMD160 4720c2046e90f549d4bc8d9a91861af7f32aab04 SHA1 79fe5332abfc05353a02a95391e12ede60dbcbc3 SHA256 1a30fff612614dc4ff83ecae38f4e1f3dbf07434f1ad6482e430e0cb089a6ac6 MISC metadata.xml 619 RMD160 17cd7ff149f2bb4c07f86d476f0749c8712c8491 SHA1 bcca3e89bc288fdb417ec128d23b73c331c45b63 SHA256 21497957bf34d03b2db918763557fc38a08586c2a4946fefe99ac81e5353bf9d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk8l1nMACgkQcsIHjyDViGT6uACeMriAvuZPkURCzo3rtNjJAE3l -LM4AoIV1s5qZg/KzhKXxsCl4LHH2e2sM -=tuck +iQIcBAEBCgAGBQJPLn7mAAoJEDZF8K7rm0r65hcP/i8xqYgnUhDF7kbvky/Q8QwJ +bMutbZ01QfHxJ9tD5TdmQRU5d6mL//pyXsbD/0vtOeLXsK8wIo0ejVj3hTqh5G+l +WjQgUOpJgaqpmBo7T+fahBSm6msyERlM2k4qq4LY1GI1kAxU/2p5yskFhDPxA2KI +ajDpRpqkSQyFJSCVxBo1g5d8XPQJLRzCDlExWVW6F2KyjeG4uu7U7f7ZWLVyy+1Z +B7IedAqunOgDQ0YJcE/XePeK5frJ3C55pjFF4QmhQHnHp0pl8YKYPNVJMvKJMM7x +w/lWS0qK+Inka9aylUESbxTXKgFlM3m4p/ydMF2bnJBxkOvGP51NwCyH77U624dN +gTgJ7H0UEFsAMM8cmf4abJ3YaW3HaWi2hz6a4Lb1tZsK/riNmyfjmkET5hthCZc7 +UZ/VyYHfaU7q4F+V98EtU5Bg3Yu1hUANfDqpRl2pdswDid0ofgRPKSM7xnlgI/2A +9nqtX2HZUm2Kf6tva8j8KPUQauIsunGLDe7eS2skmK3adYSorD+s/OV6vhBERnjn +zjyJZbIJysseHxaFQGA84I4KJIg7csf0oiuvo+RW7Axr8tuTmBuDEDLiIOztG+Y8 +Sx5Vbb/VJpTqeoC0XVVIR5MKQPB11mCQGoKJvVbTo6P/8ky8WxsAB+v5b6clKtz0 +1sC7TJRqftgUqTBU5mtQ +=ph9u -----END PGP SIGNATURE----- diff --git a/x11-libs/qt-openvg/Manifest b/x11-libs/qt-openvg/Manifest index e8e4ccba8c92..5d0e29d3ebff 100644 --- a/x11-libs/qt-openvg/Manifest +++ b/x11-libs/qt-openvg/Manifest @@ -2,23 +2,23 @@ Hash: SHA512 DIST qt-everywhere-opensource-src-4.8.0.tar.gz 238580694 RMD160 7506dce7743215481fd9fe56920b8a47f07a112e SHA1 2ba35adca8fb9c66a58eca61a15b21df6213f22e SHA256 9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e -EBUILD qt-openvg-4.8.0-r1.ebuild 1416 RMD160 797cf3aeabe600a97dc302a1e3740006ffe46a13 SHA1 bdb6e8033bed259d2d80d1bfcef252fcae7a8c48 SHA256 7e113d852f5947b0ec141e47cc6afd3fe69dd5391888fe36c0730b3ef42a4e9a -MISC ChangeLog 361 RMD160 ef92ca1f24fadba6f1f541ba99f685f430949f22 SHA1 17c64e45c5fbeeacd911ef1924de48859c299647 SHA256 5d41dcabd4e6d4fc577da45a5438a35487fe376a68f115d6b1adada1a4e107f3 +EBUILD qt-openvg-4.8.0-r2.ebuild 1432 RMD160 eb995f6155cf9587944e78f418e2f865c7171589 SHA1 bebf156792de6bc103c479283e02a26956d9ea6d SHA256 c92d1f82835e8a648b8f1b4ca9bd3a705957792a9bbaae163660976d8cd68adc +MISC ChangeLog 573 RMD160 8128c78bf040d0186e47a4a290fec7c99af41861 SHA1 6588b27c04dfac89741a582d4a42996274f11af3 SHA256 6f5cc29ba35c621f1ac29712c506613f82e6b4480b2248e2243904e101847807 MISC metadata.xml 451 RMD160 8290a3e1ef4bb02a45d3b0860c9dc21f2f24f979 SHA1 3841ee97cb44cef3c1a82b7629c422acdfc88a8b SHA256 6c2135bb2df8bbd48c397f37c4893a79f7448989e868e310ca11444ed37c71d5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJPJnC4AAoJEDZF8K7rm0r63bEP/1DlXMTGWikU5wXQcPEM/yfr -/tluMOKz6HRPCLJ0C9+pNgtqylh+akFmcaBYMcsxyxgf2TcEY/vHgQ2i8LStfVgC -0T2b/NGgEjlJaHN95GJa4vVV3SkP8ays2l6H6OZXKg8NKJ/N8zCoTFPY47JTC6kW -VQWWfTSf2s8gNzb/hajz0pS4bXwFAGrkVycfcawfjrn3G5wQNfmHoWPrxf3SYlQk -T8NBac5Zt2z2W4Q3124BRlsoKJ+mcLQwMdlRpY87W4cVTFlZgCcEi7Adiq2Yjo7M -sX0GNGs87KYTWSNgyvqMwyEdGCyUbbQfMeF7HkR1VgHoislJGsdH8I/HAycwpJ4X -ZQRG1kezc/4Qcfdxq4EHZ8OQvpBLlSu2zvA9Mg5GY7gurd3T0pjpc3/zZXBennM3 -42H3YRH/3srZylgryNnoJE4z1abevHY1e7bfrvVF1vfSsiaf2vbjol1E1Xv2+9v/ -BeUXf0ZEMDazi8hYTpoFVPBndmzyJnX8HJQKcJJRjcRy2mqprdaoZPxP/sNPCPfc -rn41pCWA+7FTAmtMOTme6PrtWOSObnsRJLxevu7I2txTpc+7RaLIRm/ee9YqvcgL -Hd+N3HCYMQZnfs1wbaMsx9X7Bk4dswdvzna28QQezV1OXwIQxUrFFiEQzhrvhFFa -IrDn1O+zxQnD7zip9ckB -=Wgjc +iQIcBAEBCgAGBQJPLn8nAAoJEDZF8K7rm0r6yNsQAIQ7PHZTkItaw5a1qARhjQb6 +25G1qdYOkn0ZAg8IOf8qTc+2hZU3uJtlDsH/HC+36dIx/CwTdj1ItToYYvaIPLU2 +ZkR7v9MRwnZ1qhym+Hh0dIfP58CCgMVfK1I4gQUfuRDHGu9315P2PfjXUjPRALsm +wgr/7xQ9MFgOpkG6ak8HAN8ABV5TfKZjdyKoBkormhrpjW/QQBrJCGKFl+UaGPNh +GJ2JFLFc3jqlRQwf3I/5IogxADR0skel4sOD8MeSDKu3oouoPDrVjckBXc2HnsjS +5UdrYrarlOWq40Aka26a3wNU0TYeebT3vmlSczeq+c828McXPZypPiL1jFw/LKSB +CO060bAIYQvsIKI0lkhMeL6BNSxQJK2zGcZwsgNjNRRUh+Hgw6ACC7hOmQhJOlc4 +OeNgsMj+ZQiCOjhXuMfXnEj7aufhpmYNRpFCUmbsunZecbznssqJ5gLv8kNGreom +ruwLyxc/KOUqECanTB87koTvMMrEmDdxbHVxz/ocDeg6y9/ir1MzPl4l3RY+24TZ +t+Wovl1vR124Du61+wKvsjGrQGwjrjvrZrl7fyyhPVhTNeo5VIedUgVQui+ZpwoK +Yk+ZWOxMZ9E81ga6dsYgGC/V4mYfm4EP6Ii/G83LkyvpF/R2Ee+Fnb6+O1hQ7ANE +OEwsaanemtKWfdyLzAtX +=XmQE -----END PGP SIGNATURE----- -- cgit v1.2.3-65-gdbad