From: Davide Pesavento Date: Sun, 20 Nov 2011 20:23:41 +0000 (+0000) Subject: Drop redundant dep on dev-util/pkgconfig; remove unused files. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=439ad032634d6fc5a4fc5509d32eaa094c1cffa1;p=gentoo.git Drop redundant dep on dev-util/pkgconfig; remove unused files. Package-Manager: portage-2.2.0_alpha76/cvs/Linux x86_64 --- diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 722747f649ae..0d57b78e0f23 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.152 2011/11/12 12:16:34 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.153 2011/11/20 20:23:41 pesa Exp $ + + 20 Nov 2011; Davide Pesavento qt-gui-4.6.3.ebuild, + qt-gui-4.6.3-r2.ebuild, -files/qt-gui-4.7.0-qtreeview-regression-fix.patch, + qt-gui-4.7.2.ebuild, qt-gui-4.7.4.ebuild, -files/hardcoded_fonts.patch: + Drop redundant dep on dev-util/pkgconfig; remove unused files. 12 Nov 2011; Justin Lecher qt-gui-4.6.2.ebuild, qt-gui-4.6.2-r1.ebuild, qt-gui-4.6.3.ebuild, qt-gui-4.6.3-r2.ebuild, diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest index 3b9fab2df51a..5bd8fe929d99 100644 --- a/x11-libs/qt-gui/Manifest +++ b/x11-libs/qt-gui/Manifest @@ -1,8 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -AUX hardcoded_fonts.patch 520 RMD160 cdc8f5b4db20b4eede5eabad61ea7893e7b2fc8f SHA1 e23e2731074170585165d89822b83215ba0e3bea SHA256 0d428c620f995d1e96e649b3e49e9ce591b2882a38e600b485c6c8b509504c51 -AUX qt-gui-4.7.0-qtreeview-regression-fix.patch 490 RMD160 b3b5e806d6662c1216ca739c5f4c9655508e4811 SHA1 45a3cab07b1ba8a267efd9c7984d69e080798905 SHA256 aa1b9ac7ad0ff9b6bf715507dbf8bcf15cec1ed1e2f4da893598553de3f34340 AUX qt-gui-4.7.3-cups.patch 3297 RMD160 fc99e57ccfa8db47a1df799186d6daedcbdf744d SHA1 d712b9b570101de5c996692551ba5a3ae4a410e9 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 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 @@ -11,18 +9,28 @@ DIST qt-everywhere-opensource-src-4.7.3.tar.gz 213659173 RMD160 ab9c11c85898430f DIST qt-everywhere-opensource-src-4.7.4.tar.gz 219424772 RMD160 347ba2c4f855b40bf3ce90adb19c1a87925e6c61 SHA1 ac7b4df34adaa6e9d1fb41743d1f15f5aac481db SHA256 321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf EBUILD qt-gui-4.6.2-r1.ebuild 5393 RMD160 ea873072a18b5e9f320dac0d5c74036bda34b058 SHA1 10af63288b9b4e44bbfae36d9204674f287c6ab5 SHA256 d50b6f78971d2d9b9f638ca3f8d36e04b6c76ab2c0ecbe8fc54f679f00580620 EBUILD qt-gui-4.6.2.ebuild 5299 RMD160 f957942dfae65dffe841074af5ecc1209098d1c4 SHA1 88b378000bd1b1c11cf9bbf872e31b67627ebed6 SHA256 16dae674a5f68af5746c00e36360209430256fa9d46573f298b2bcc59eddb154 -EBUILD qt-gui-4.6.3-r2.ebuild 5471 RMD160 2927aed151d4c8a9d80deb3feaf3148cd54763e7 SHA1 cf66e53eecf115f5ca461c2f6cb303309eec71d7 SHA256 0b21bad83248f21fbf827610be45b12d7d457b4fb76a9e069c76758c319c0bfe -EBUILD qt-gui-4.6.3.ebuild 5447 RMD160 2510dc3306bddaba4275ef17a2edc42149bd4ecd SHA1 d49e8911391ce23e8fd56c80300e8c21bb171283 SHA256 cd98fa4a6685e384f209adf698def9aabbd09c006c5e83d50f3ee7c2d23d5996 -EBUILD qt-gui-4.7.2.ebuild 6370 RMD160 6ae0bf8870f276436e7e8d2633d62eff58f13227 SHA1 512af8e106ac38b64ec72867ae049b5889e53d2d SHA256 8edc47050ad887879331cc3fd96a3d01e811de2afb2d416546743c170fc4c975 +EBUILD qt-gui-4.6.3-r2.ebuild 5449 RMD160 6a70e48b4de30ce123aae5a7c7894572acc00844 SHA1 3d6a2538e89a6e783a6855f0db35c74620384ed2 SHA256 d6b41a13907801c59a18cfbb512f78daf24c6e2782595fbda32d26bc0aeaddb3 +EBUILD qt-gui-4.6.3.ebuild 5425 RMD160 5a00504271c422b716580984ef70db235c5cadeb SHA1 60020e6eb373af2b6286ede272f8b9f84c2912a4 SHA256 f06ec00a93c7c9126389ad00aed369ed1daf45564c7e02dd234e60fed3053c40 +EBUILD qt-gui-4.7.2.ebuild 6350 RMD160 a47834c6bc9471eeb188fd26ca1394083b08225a SHA1 8e34ec70e3a1a10a7302171629f8754ea13eabdf SHA256 43e21b9cea2aac8d8ee82d46585168436bfad570e3e0695244eb300d41c02110 EBUILD qt-gui-4.7.3-r1.ebuild 6427 RMD160 c1d4cd7af792f651fd5069e17726cc3a385ea771 SHA1 da17d96980cd6eac27d2455ecb7143320d7f066a SHA256 3a1ef0d23c057e050145495d387858ca5cdbe855e9dc6211aae1f6547379dc98 EBUILD qt-gui-4.7.3.ebuild 6374 RMD160 9f7ae199e8b8b3b0fbd228c2d9f388e644136775 SHA1 43461e8c0d2326f3569212576c2c50bd3862a73f SHA256 84567f427bf5279606a316b8003b3518b2a4a116c09624d384d983a415299205 -EBUILD qt-gui-4.7.4.ebuild 6424 RMD160 9372ef4732d6143573a2a322beda80111624ddbe SHA1 6910484ba6b0cbb6548d07fb016f920a70457cd4 SHA256 6f4ef078475c3938618f6b3147a1004acd0c9e5d90ad37622ec67c8dd1d689f6 -MISC ChangeLog 22829 RMD160 ba65d0f9e9c52a244f09e411a85ead81a6d0af61 SHA1 f33238ec9df8cf32bdbba018c7fc032acaa2dea7 SHA256 688336e48a5f2edd6a88995bd3862a2f2ac569d7994b55a8dcbaae4552bf7159 +EBUILD qt-gui-4.7.4.ebuild 6404 RMD160 bc0105c42260dac1d640200a5450e5bc6ad2eda0 SHA1 751ad3bb38b8a0ab25430b9e206f7bfeda38a1a9 SHA256 f9c066760a312306e8da2973a35f2467fc8a86662a8e5a88b5442ae387d5773d +MISC ChangeLog 23118 RMD160 cb25c3d5db047a40f46644fd2390d29f6352491e SHA1 3f7489e5cb2a62c64e3103f79ae9deb78c0c75d1 SHA256 a5e601ffbc481e88e86a0b2d0a13724be429a4b1d11cc3e58d7a341a00c17171 MISC metadata.xml 1181 RMD160 74e177f4c687acb1df2637f28ac36cc80b4f224e SHA1 3ea8a8aba7d077d6a008b8360811f4e43538232b SHA256 49515885af0ad4b13d4f93911c0b8b84e25abcda3fdc8e5715b1aa956b18af15 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk6+Y7AACgkQgAnW8HDreRb00gCdEifot0hZgK/Eh7AbDu/Y14Ki -4/wAn0MQYm2sXdokwzEv3BcOBIPQZYjn -=i4be +iQIcBAEBCgAGBQJOyWHUAAoJENXLsxwXqFxyzq0P/1n0odbHs7iADSd/pHUvK6H7 +Ozow7kSs3Fx2FVuVgdKY/9cqvMZffvFMc6l2Vtiz0n+Pamo+OsAKF7P9JPBFY6ED +JaJYQQpYn9TS8UcyLCQHxfZirXuztr8t61mW5nhacD6Bw7N2pAruRfw7JY/KzDc8 +DlIebaY91O23NyK+NBpDSDJ36osrm5BUQFSvxlAIE5oEbAMwVqsMvDk4foiWPala +eqou3lekf6W/PW7r9B93oJ5cCW/EOR84A+2dHXzZq8TpoeQIyjtZA2T+3/BtLNCi +SaxZ80smia+EjDU77RRPCbyytFDfA+31EPqU0upjnwVF/jpq1mjuOWzuozLJEh/y +KVqDUltCQbQv0H4KFhVx/kAlSO/uenkgC30YpDhjDO209ZhZg3dVWeJ9SihBZfoy +X7JlSsWEEf0dMVHSuKGLf5cZQDIZTIgZHj6dBzRY4tOf51U1dxUxt1ytETkjDbFR +2vbdatU+pVWbyMF0bJuL7NAeGURMp4XsxiMP/m84BT5HVFK8OMQn2Kd2VUkWdng2 +iyCNTxwkU7ep6NJvM0WprthRxvdg/6KmKc3iehgHeslOwLtfVSSK8blEHiQxUt3d +K5tBrRzB4I7jItbnv/LhPBA7jOy8rGFpGwoO/wz6tOuFw+TB8G45if97+R0ssnCg +wPA3xq6COXeXGAT84SNg +=0pEe -----END PGP SIGNATURE----- diff --git a/x11-libs/qt-gui/files/hardcoded_fonts.patch b/x11-libs/qt-gui/files/hardcoded_fonts.patch deleted file mode 100644 index 65706e0d3169..000000000000 --- a/x11-libs/qt-gui/files/hardcoded_fonts.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qt-x11-opensource-src-4.5.0-beta1/src/gui/text/qfont.cpp -=================================================================== ---- qt-x11-opensource-src-4.5.0-beta1.orig/src/gui/text/qfont.cpp -+++ qt-x11-opensource-src-4.5.0-beta1/src/gui/text/qfont.cpp -@@ -1767,7 +1767,7 @@ static void initFontSubst() - // default substitutions - static const char *initTbl[] = { - --#if defined(Q_WS_X11) -+#if 0 - "arial", "helvetica", - "times new roman", "times", - "courier new", "courier", diff --git a/x11-libs/qt-gui/files/qt-gui-4.7.0-qtreeview-regression-fix.patch b/x11-libs/qt-gui/files/qt-gui-4.7.0-qtreeview-regression-fix.patch deleted file mode 100644 index 711850aba8ea..000000000000 --- a/x11-libs/qt-gui/files/qt-gui-4.7.0-qtreeview-regression-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index b797776..40b51fe 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() - if (!viewportSize.isValid()) - viewportSize = QSize(0, 0); - -+ if (viewItems.isEmpty()) { -+ q->doItemsLayout(); -+ } -+ - int itemsInViewport = 0; - if (uniformRowHeights) { - if (defaultItemHeight <= 0) diff --git a/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild index e0ebad43ffbc..d223bb829cd4 100644 --- a/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild,v 1.4 2011/11/12 12:16:34 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild,v 1.5 2011/11/20 20:23:41 pesa Exp $ EAPI="2" inherit confutils eutils qt4-build @@ -11,10 +11,10 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3support xinerama" RDEPEND="media-libs/fontconfig - >=media-libs/freetype-2 - virtual/jpeg + media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib + virtual/jpeg ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] !aqua? ( @@ -34,7 +34,6 @@ RDEPEND="media-libs/fontconfig tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - dev-util/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/inputproto diff --git a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3.ebuild index 66ed9ddda174..6cf8a3f0bde0 100644 --- a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.12 2011/11/12 12:16:34 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.13 2011/11/20 20:23:41 pesa Exp $ EAPI="2" inherit confutils eutils qt4-build @@ -11,10 +11,10 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-fre IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3support xinerama" RDEPEND="media-libs/fontconfig - >=media-libs/freetype-2 - virtual/jpeg + media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib + virtual/jpeg ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] !aqua? ( @@ -34,7 +34,6 @@ RDEPEND="media-libs/fontconfig tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - dev-util/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/inputproto diff --git a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild b/x11-libs/qt-gui/qt-gui-4.7.2.ebuild index 1d7e0aff4b22..2638138564f3 100644 --- a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.2.ebuild,v 1.10 2011/11/12 12:16:34 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild,v 1.11 2011/11/20 20:23:41 pesa Exp $ EAPI="3" inherit confutils qt4-build @@ -12,9 +12,9 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt RDEPEND="media-libs/fontconfig media-libs/freetype:2 - virtual/jpeg media-libs/libpng:0 sys-libs/zlib + virtual/jpeg ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] !aqua? ( @@ -34,7 +34,6 @@ RDEPEND="media-libs/fontconfig tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - dev-util/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/inputproto diff --git a/x11-libs/qt-gui/qt-gui-4.7.4.ebuild b/x11-libs/qt-gui/qt-gui-4.7.4.ebuild index 7fecb6e774db..e67e6fbf44bb 100644 --- a/x11-libs/qt-gui/qt-gui-4.7.4.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.4.ebuild,v 1.2 2011/11/12 12:16:34 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild,v 1.3 2011/11/20 20:23:41 pesa Exp $ EAPI="3" inherit confutils qt4-build @@ -12,9 +12,9 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt RDEPEND="media-libs/fontconfig media-libs/freetype:2 - virtual/jpeg media-libs/libpng:0 sys-libs/zlib + virtual/jpeg ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] ~x11-libs/qt-script-${PV}[aqua=,debug=] !aqua? ( @@ -34,7 +34,6 @@ RDEPEND="media-libs/fontconfig tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - dev-util/pkgconfig !aqua? ( x11-proto/xextproto x11-proto/inputproto