From 366935c81ee51a0e2dc8967c9b64189f0b05eb81 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Tue, 12 Mar 2013 05:51:18 +0000 Subject: Punt vulnerable version. Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64 Manifest-Sign-Key: 0x17A85C72 --- dev-qt/qtcore/ChangeLog | 5 +- dev-qt/qtcore/Manifest | 31 +++-- dev-qt/qtcore/qtcore-4.8.4.ebuild | 179 --------------------------- dev-qt/qtgui/ChangeLog | 5 +- dev-qt/qtgui/Manifest | 31 +++-- dev-qt/qtgui/qtgui-4.8.4.ebuild | 249 -------------------------------------- 6 files changed, 38 insertions(+), 462 deletions(-) delete mode 100644 dev-qt/qtcore/qtcore-4.8.4.ebuild delete mode 100644 dev-qt/qtgui/qtgui-4.8.4.ebuild (limited to 'dev-qt') diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog index 4367e23bd4ee..a4262615bca5 100644 --- a/dev-qt/qtcore/ChangeLog +++ b/dev-qt/qtcore/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-qt/qtcore # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.3 2013/03/11 17:49:34 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.4 2013/03/12 05:48:33 pesa Exp $ + + 12 Mar 2013; Davide Pesavento -qtcore-4.8.4.ebuild: + Punt vulnerable version. 11 Mar 2013; Agostino Sarubbo qtcore-4.8.4-r2.ebuild: Stable for sparc, wrt bug #455884 diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 59ff6a5d0fbe..400e34407074 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX CVE-2013-0254.patch 2694 SHA256 708714e387b607e4c28182420af42f9169c632c909feef6224190053da0c869f SHA512 227ed44a8e90eb63402cd6658bff1244e3684c4f9757aa9c3cf53e60127f6324a978d82f2de25e6a718b88392d51641e9b8010d313a25a0154f871c0dcc94182 WHIRLPOOL 472b5ca7da456ae9e6c62072be6f6c1fb71c13450d8108745a7f14d5f7511e299377a7cd88f6bf5e03b906259a0a6961115e7012e998878ba306d8a67b4fc935 AUX blacklist-mis-issued-Turktrust-certs.patch 5939 SHA256 abf2632243cd5b82dfcb2f297908c37ee79e42240a5539eb4738713470658bc8 SHA512 5f4d5be5389b3b2423a33cb09ace4514b53fb96ad0d95e2d02dca7673a9a37b879f739e0988b4bd5e90976ca83ad802ce8179da7433e6ffc3f519a151b8aeec3 WHIRLPOOL ab4a4d61654aa159e82f66d6600a932296f5ee5c0778009dd69f899866a4f1bf3d7b6cb858092f75cd00582fcf357e963e4c7cf0a363ba9bab1cb2455b4fd9c5 @@ -10,23 +10,22 @@ AUX set-pkg-config-locations-directly-to-install-dir.patch 2048 SHA256 862b2be51 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 EBUILD qtcore-4.8.4-r2.ebuild 5107 SHA256 301a9502a239084dd24c45b3fb5494e2239c045dcb530961ffa5ff33451962e0 SHA512 468ede9ffb5de65a80f3790cca9806a3dc9773adfc9df17dac958a8f15698d55f9975dfcb956df492e4f5d8c6a239aac5f02e024ad3b20c431ba90d0f10b5f84 WHIRLPOOL 1406bcbf42f6b5f35d2ae1b0fa91234c2d8fa8dce76420c289af59ad441a72dcf1a1671e2d61ad55ac0edb0d3ab27dc8da13399d81ce99ebae940fb3ffc32322 EBUILD qtcore-4.8.4-r4.ebuild 5249 SHA256 475965a9ebd1422c35e385ca115e754a4dbd0b343ec95c920c26effe0f2a979d SHA512 5c46f650a0b5b0e36789fac3ee9a4fae79e0451e66bd18ef2ff373fe8f08bc308750e2e01f3e6b31207429fbca3dbe4ce602219aae25b98085dba8c32776bbd6 WHIRLPOOL f06ea3b104bd1fcbf71036e12554c441d039846fb31abd6960f009f1f49826410c4cde209ddcb45cee7f4e0f00169a9c8ecaa6466293b0ba64fa42db931af0cd -EBUILD qtcore-4.8.4.ebuild 4998 SHA256 042cc00014f52e0716fe3ff43b803013e6b2ae192b7678436cd8e98fa87a86ae SHA512 d012b4a93f55b82c4979444a6dd19997d70f599d7237f4c3f285d6f7d02bdff4111f32c49e5228ff4cc16fbe9ea5b68e8dbd52a8f10d42177ab4fb00779c6a11 WHIRLPOOL 6e4a6f106639bb59ed278dba10ae524887675ce78a8683979db3085e0c11db0eb8333bd367ad8b2b0c7fb684535904a9d6e1249fa40ed82fe824ed9d7896adf3 -MISC ChangeLog 29451 SHA256 4ad0f44cb7fabe54dab3efcd76dfcb557953e8c33b35d5e4333e2a8d8f68fa52 SHA512 c910489156f7030897b43ed7728b8972972deeb60e0ae738fae3cdf959b474d4ee7ebd22009280cd3b479992fb70c26b54c5550f8257ec213f7a3195f60a606e WHIRLPOOL 5da3239fe3373d93d43f42c2238a455430481904a3aca9b102a8b45d650073794564c3fa0ce32511a1642223e2964f4dca9815efea8b60d53e181dda50143818 +MISC ChangeLog 29552 SHA256 04f1062cb92d913e0596509388275a107c273644dea22532cd7adfaffe3cbc8b SHA512 b5b29590b1e27c9ef68561d9ce2661b47413b63983d4a1e340f483eb4e6040109930d89690055a979a3927fc6d45f005a8bff5635ea62c4f9d345b9948d67df4 WHIRLPOOL b1ee1239a63c0302708a86d155bbeca544749735b1421b4ccd40bd56112bafae79286801c2f2c9c0bdd1e545efbd27d0042f9a287898149a9ea062debdf74608 MISC metadata.xml 711 SHA256 999402a925dbe1f9d510372e9e03e5527e94e95e1cededaa01b2a8f7d89e2a61 SHA512 ac9f28c9efb0aeebb145c1cfc22d1a3c7ba25b141f5640249c914921138eb309c522392e750614a531bdedf0f4385738a840ea4591785d54cadeb2f1c74a4d5f WHIRLPOOL e2ac4864fcc8b665251fdce4203156f0bba2636d2a170a225c13005c656fce29f49e51dd6b8c6639fa48a11307522887ff26bc02603b676ec20aa826b2198824 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRPhihAAoJELp701BxlEWf6zYP/1ANTnNQF3D5c7N2MzHoZBMN -IjkzOFyt5/VVrcFEGaYyZrHb0r+9GuUZv5DBKfFOpFIkRAogDQ5D0tjVL2uwaHX+ -TCNNJiXEHxvj9vjFArqEc0ijsA1abjR2PUwFr/GxhImcGkXtWePYbQ/a6Ogm1oLb -9bK6t/5xCgue7d3IPgUlFcp8S8feEk7X90I/9LbjD8kqglHb79kq03nlj9f4Tlzr -cbvyhugS80itiCl9t3MGktl8/r+ulUCqQ4bMbMTX0nQDezy+cqPeT3Dmazqf7mYW -V5KbiTn/Im+TBy4uKH4QN6EU/tNwHF12vGTIgCv1NW3qgBbpjisqU+ytCxKLwyAS -iF13Gp3sUIkRHRCPJ3qi3r9gQv6G7wUyW6h18nv+ZOfoQNhMNds0IToA5cOAdyqS -Ruc69PC9/mjTr6FDz9j18yAW4P56iIeUvabrKycg60O/3J5VtvVRxvniEGw/8tSY -TpLGWluZ6ChSgozs6jzxQeuL4dEoNwElDSmBvnaFhnLRkf2K0YXleEH0zdNX5F9y -6oH6zjNpxNY3P38Y5kG0s2Rveif0x0mxQcwEWXNHbY/Sjj+9d9y3VDC4WwXUfis7 -+WTeCvwrUCpQFJ/xYKN18HvWwCNYir3N5k5BH0fFc112TsCnUuPBUryJ8JnBc/BG -0qmbuGGl1tirE01HFIpW -=6D8U +iQIcBAEBCAAGBQJRPsHHAAoJENXLsxwXqFxyE0AQAKnjq7L5ylG63+J6D5JsOwnY +hS033vTWvRr8aDPg3aoAuoCf1QDEpNx6SYPkj6OvaLvLYSUezTv+aylJWwFJqIeq +izPKzroJd96KkbGXMgUbKUyX+X8ooCAr9uVxPHEp0Mt7xocBp4I/olwnZdpRAI9U +++VSgro8ksDTg4F13fD6F7Ok0E7sTRW5Lw6voY6Zgte7qPgjHhjApiGtQDmlajix +yy6cjnjhGlH3fuMvZRlJVSunCGpB9mHOnXdsUuq/AcGstzigKxI6RZik1ijro55h +kyIafd4dBvwyAD9TvBzdl8oB2SElsqxQg3mrx3F9Z0j/mFBC9sJcrTSFDEueyUfm +iXS/VrZ51PHwd3FCjfk4BdC3DsUHolN4aCbYur/yYvz6i5fCFzB67y1LKk0rTV+H +fdOruxuX0IxlzUJu6Ws0OVJtjYfvs6tdb4y6q8F9I2gDxzkqSl2/SARHWHIFwTKC +gyao3IzUe4bi3dcXAraq8tukMuOdjHKVR5X0qE1EdiQhF3tq6jWyi7oQDQ0Urmnh +CirnwIgjsCcfI7SgtEkqpVareqzYM0B+6RBpqoZiNnOa40HNJm42oBQtrkSiuOUr +kNFLO+cQ3jTzjvMeJ6aaTJyMDyYcY5uU9mU6XBlfirFIAM5v4xPLbRQOyUNL316Z +/JotXAhNzLUfX91nbo73 +=1bBn -----END PGP SIGNATURE----- diff --git a/dev-qt/qtcore/qtcore-4.8.4.ebuild b/dev-qt/qtcore/qtcore-4.8.4.ebuild deleted file mode 100644 index 3e45eb1c7271..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.4.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4.ebuild,v 1.2 2013/03/03 03:31:54 pesa Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49 ) - ssl? ( dev-libs/openssl ) - !> "${S}"/src/plugins/codecs/${i}/${i}.pro - done - - qt4-build_src_prepare - - # bug 172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" - sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # 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 failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - setqtenv - fix_library_files - - # List all the multilib libdirs - local libdirs= - for libdir in $(get_all_libdirs); do - libdirs+=":${EPREFIX}/usr/${libdir}/qt4" - done - - cat <<-EOF > "${T}"/44qt4 - LDPATH="${libdirs:1}" - EOF - doenvd "${T}"/44qt4 - - dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo - mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ - || die "failed to move qconfig.pri" - - # Framework hacking - if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then - # TODO: do this better - sed -i -e '2a#include \n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '2a#include \n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed for qconfig.h failed" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog index e7a4f8ee6b21..279f53226d9b 100644 --- a/dev-qt/qtgui/ChangeLog +++ b/dev-qt/qtgui/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-qt/qtgui # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.3 2013/03/11 17:50:05 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.4 2013/03/12 05:51:16 pesa Exp $ + + 12 Mar 2013; Davide Pesavento -qtgui-4.8.4.ebuild: + Punt vulnerable version. 11 Mar 2013; Agostino Sarubbo qtgui-4.8.4-r1.ebuild: Stable for sparc, wrt bug #455884 diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 3fc6b803ba2d..79f136f9428b 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,27 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX CVE-2013-0254.patch 6449 SHA256 c25f54ed3fdfed4cc945e53f7a848f88be8bda899c8ebff904f241cf9096df3e SHA512 957d1f3e5ca9a8585e0e5c806cd0ea731e97a3b05cf60e84aef44912cbd9b8db80961f336f91734f9759d14d4e0de39a73becb45f58ca8af831c1780e5368739 WHIRLPOOL 633cba444159eb134ec2df8a4b4fbb145aea28012b75353c9684f3d47b1c50736ea7c5adbd4fa1fbb0bf285a1e517b122bb6b5edac1313f6578465c8381d60d9 AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 EBUILD qtgui-4.8.4-r1.ebuild 7204 SHA256 5b818eff711c7e5fe8b7324e4f6dbf4dec561fd685dc85815cc087643ee401bb SHA512 51dfc7359f8cdcfddd42b68f23f8295d0fc8c8f53304d669c0a541608331f416865a800399393d2d2c7b870279380ad61b50e01aa7ca3b36ec308d67bb37eaba WHIRLPOOL ec262059076ab41d31fd021ff5672d8d2c9a8d11b93afc0468400f11daf27f82292d35ef0669668832e15d4f25c3d7355a05bb2092d6a8fbf3412638d9eea481 -EBUILD qtgui-4.8.4.ebuild 8012 SHA256 c7f95f7c67b7dc273d217c43337ecee5d82688e0fbf4a37b7689f535543b2d99 SHA512 a4b6cb1bb4ae47b7a914ff4fcce49fafcc855c42d792da6e73ec4b4f52f983ebbcaf8200013c237c62ce6d41e43e20690f4fafd418e7f2876af5f3117dce885a WHIRLPOOL 9713948af0df711403e2b72b264d152baccbb3ef5a649b65a02be0423c70bd07f8d4796f895206ba2d3337428972bbacc4c1133ce7b7df579b7a90108642726e -MISC ChangeLog 33781 SHA256 89d0dac50faea7e4a5ec73c458da123a4ee5345ec5cd6f34dc25299e3ddf2603 SHA512 1e4ca46eef85cc797acb77aadfe72518cd09b3eb7e7adadd5a32331d3b0f2813c75b490e7c1379d2ef636be90a9e6cf690216c53c736fae9a53f5ad59a6aa39d WHIRLPOOL d2631bece1f4bf8a4058a8a83b07a2e8aa28a5152f75f8d9a19fc074008278a38743fd1b6a85aa0b0a0200de7ffc71afd66eeb732bc7aa0f7d92d443605bcb07 +MISC ChangeLog 33881 SHA256 71e575b53c9d74eb4d8faea7f1eaff48bd29ab269b8ae76d0497d7700aaf70d2 SHA512 3192d08c7cee713aef1e262601eb6d39cbcc4393a05a0d9bcd86d24af89b63238c880ab832bea1f634a7d528f4baaaf1ce4cd07c5e3942802dd97e5ec3ce790b WHIRLPOOL 8020341605c19ecbf35f1a4891b8ec949317bc34d3b638ead56f2233c11d24edcbdc2e81841e58cbe8c1a30a6def35f8e9b1b0e979d1ea6f533b30d74402253c MISC metadata.xml 1117 SHA256 fe5f2ec8d0a91fd48b7fb30f9d146c315812647477608bf303a13ee8ef91290e SHA512 18357a2905d6fed98173361c8b574bca5501844d11f3887f913fb9ce0d3dfce1e181188b93d2a21c9a4e24229afe4037a0c3a7877d521d2f43464d94dae1b7d0 WHIRLPOOL 76c441e8ba23e2067e76ed06ad3db061ab9e99647ad124b1f5ebcf14d6ebf6cd82cd11651a5a207ba97f39a00aee44b840deeae1e098e631fac99378008376fb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRPhjBAAoJELp701BxlEWfp14P/idIQ7/BAXzL1qgts32C8dBi -lL8bi7awAXl22BS1/Xpy66dQUaDh66QMCQfBe1sa4sg1ppX1HGXvKxkQlsWvqX1M -S2DDO70GFmf1/0aqi/s+ncmUFO7SEviPL6jaiy/8lTsdIeBWkAk5aa13kG60RUoA -qwWprarIsrjL7pd74FsmmXnu22oLhpayjesRn9cGW77YyDb0XOZjKWG7W4VqAWyd -D81mejZoJU3I47PcujEu2pvmqwBZZ4UW0RSyxnh0TTX/wjrTXDBGGWIQsTu9ba6e -jg0wqQczmVy6EWBlaLj1cM82x5U/fwuNzSskjrx0Rpa+EwUjDsQLLyP9Gz7n2upo -cSB+NX4d9D5R5qOT8iqoIn3tMtKR09HS+fNQ7RV6eTU8TbKzc/U828QRChY4OTJu -Ii8mTm959hm/NWxOUtooyeE4enwQ+AKgmVcX0q0A3ZrIGwq9+lcHlOKi29iSv33i -FiVZP2wK5RCjcm/dCfb5A/pma5PUOsc/YcfQIIdZ3eb66p++H4lbSA05VbOxml8f -BC93IlZgoMZXJM86aPsTHTbhnD/9Ep5elt1/UEBgUc/AsJZ/NtQYRFcMiA3pR/zc -7RSa9yFfUjp3Tqb8DeiN7OOvRdSA4Q3b7kD8T4GQuvZwqP/er8TN1tBxg9kffu97 -UeEvJEJehWBMASJX8q80 -=zbZP +iQIcBAEBCAAGBQJRPsJZAAoJENXLsxwXqFxywl0P/R0yodwfEUy4pbpsCr4xBauJ +dNxNUcok2vlFLJCLdv+D++UgEwPvifbExu8paEngClKF9E2suFOwpWD2dEugfMoT +Ktw/iRyGvpVljkpXWhqCnOX9ITG04jIRg3sVs8OpOhMhzRRpDi8+CcuViZdpt5mh +l2pvOCsQUpiZUT+xsPYxjeN+I7FBRIyxA3SJWOL2BA8JnRhNI6xIML8p2oILFj6q +bhPjw8qflfGKsH/QbtEdoyirNiwBEQcUabaC4POx0Ccfk3O5NSjMcHUJYHI3xDsC +WPN6kc+/TCRJQkvJOu3WqY/+GqaTCy83hbbMn26SaVMXyq+/ormKBU93lOV/iCBd +DOqv8AujXy0/pU6zAYmdjDxAqVQoVXf+GZnzRTmCPZpVWFOZY7poqYj3T1nyI1qr +zR0LpzvHoiyZ3cUPmGMWmVf3Zfy0N+HZLkPx8hJTeSvR/1ZJAiarK/lQhQOLVNsi +mDYpmPRQgzI5oQiflX+UD2BzK2rVm0eqThxvSrqhyY/oZPqXWezfvmZ/BpmV7FCX +IIq96vTTp1TJw/LpfyiTpQRNG22Rd8GjoPRdoHcp3Ktx5S6aKRsW1ed8Xn7OzQOB +aBE3gs+QMNJbWuLdjyZVUe0cZzIXd1nnwXI+wV4w8xiFh0w5AH+vp6YHpXSo+Jl9 +7iPqJ5D2ZPHl7jRG0Df7 +=lsMP -----END PGP SIGNATURE----- diff --git a/dev-qt/qtgui/qtgui-4.8.4.ebuild b/dev-qt/qtgui/qtgui-4.8.4.ebuild deleted file mode 100644 index 166f689a6bf9..000000000000 --- a/dev-qt/qtgui/qtgui-4.8.4.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.4.ebuild,v 1.1 2013/03/02 15:27:36 yngwin Exp $ - -EAPI=4 - -inherit eutils qt4-build - -DESCRIPTION="The GUI module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" - -REQUIRED_USE=" - gtkstyle? ( glib ) -" - -RDEPEND=" - app-admin/eselect-qtgraphicssystem - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0 - sys-libs/zlib - virtual/jpeg - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=] - ~dev-qt/qtscript-${PV}[aqua=,debug=] - !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - cups? ( net-print/cups ) - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) - egl? ( media-libs/mesa[egl] ) - gtkstyle? ( x11-libs/gtk+:2[aqua=] ) - mng? ( >=media-libs/libmng-1.0.9 ) - nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${RDEPEND} - !aqua? ( - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - xv? ( x11-proto/videoproto ) - ) -" -PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )" - -PATCHES=( - "${FILESDIR}/${PN}-4.7.3-cups.patch" -) - -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 dev-qt/qtgui && 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 ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled" - fi - - 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 accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets" - 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 trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace" - - # mac version does not contain qtconfig? - [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_pkg_setup -} - -src_prepare() { - qt4-build_src_prepare - - # Add -xvideo to the list of accepted configure options - sed -i -e 's:|-xinerama|:&-xvideo|:' configure - - # Don't build plugins this go around, because they depend on qt3support lib - sed -i -e 's:CONFIG(shared:# &:g' 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) - $(use gif || echo -no-gif) - $(qt_use glib) - $(qt_use mng libmng system) - $(qt_use nas nas-sound 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) - $(qt_use xv xvideo)" - - myconf+=" - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" - - [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045 - - 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 - sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || die "sed failed" -} - -src_install() { - QCONFIG_ADD=" - mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync - fontconfig gif png system-png jpeg system-jpeg - $(usev accessibility) - $(usev cups) - $(use mng && echo system-mng) - $(usev nas) - $(usev nis) - $(use tiff && echo system-tiff) - $(usev xinerama) - $(use xv && echo xvideo)" - QCONFIG_REMOVE="no-gif no-jpeg no-png" - QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) - $(use cups && echo QT_CUPS) - $(use egl && echo QT_EGL) - QT_FONTCONFIG - $(use gtkstyle && echo QT_STYLE_GTK) - QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG - $(use mng && echo QT_IMAGEFORMAT_MNG) - $(use nas && echo QT_NAS) - $(use nis && echo QT_NIS) - $(use tiff && echo QT_IMAGEFORMAT_TIFF) - QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES - $(use xinerama && echo QT_XINERAMA) - QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC - $(use xv && echo QT_XVIDEO)" - - 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/* - doins "${S}"/tools/designer/src/lib/sdk/* - - # 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 - - # touch the available graphics systems - dodir /usr/share/qt4/graphicssystems - echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die - touch "${ED}"/usr/share/qt4/graphicssystems/native || die - - doicon tools/designer/src/designer/images/designer.png - newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png - newicon tools/qtconfig/images/appicon.png qtconfig.png - use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png - make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' - make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation' - make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' -} - -pkg_postinst() { - qt4-build_pkg_postinst - - # raster is the default graphicssystem, set it on first install - eselect qtgraphicssystem set raster --use-old - - if use gtkstyle; then - # see bug 388551 - elog "For Qt's GTK style to work, you need to either export" - elog "the following variable into your environment:" - elog ' GTK2_RC_FILES="$HOME/.gtkrc-2.0"' - elog "or alternatively install gnome-base/libgnomeui" - fi -} -- cgit v1.2.3-65-gdbad