diff options
author | Caleb Tennis <caleb@gentoo.org> | 2007-07-31 23:11:10 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2007-07-31 23:11:10 +0000 |
commit | 7950328f28c6a505c9218ce83bcfc35d98fd5a2a (patch) | |
tree | 7e61f939c1b51c3798c2c175ea9f53b50758f1c1 /x11-libs | |
parent | Version bump, bug #187161 (diff) | |
download | historical-7950328f28c6a505c9218ce83bcfc35d98fd5a2a.tar.gz historical-7950328f28c6a505c9218ce83bcfc35d98fd5a2a.tar.bz2 historical-7950328f28c6a505c9218ce83bcfc35d98fd5a2a.zip |
Incorporate dep changes from flameeyes at bug #181199
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
-rw-r--r-- | x11-libs/qt/Manifest | 16 | ||||
-rw-r--r-- | x11-libs/qt/qt-4.3.0.ebuild | 20 |
3 files changed, 23 insertions, 18 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 25394dcd1c6d..6020bdd65130 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.460 2007/07/26 16:20:54 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.461 2007/07/31 23:11:10 caleb Exp $ + + 31 Jul 2007; Caleb Tennis <caleb@gentoo.org> qt-4.3.0.ebuild: + Incorporate dep changes from flameeyes at bug #181199 26 Jul 2007; Jeroen Roovers <jer@gentoo.org> qt-4.3.0.ebuild: Stable for HPPA (bug #186670). diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index b3a4fe74f017..1ceed58ef9c0 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -132,14 +132,14 @@ EBUILD qt-4.2.3-r1.ebuild 7851 RMD160 120c059c69277e0b86e06cc1dd8d669d17b50981 S MD5 f43c53e05ee8c1f1bd1b0a465adf0a0b qt-4.2.3-r1.ebuild 7851 RMD160 120c059c69277e0b86e06cc1dd8d669d17b50981 qt-4.2.3-r1.ebuild 7851 SHA256 73d49b40bd1f533358269b68e4fac42553477b6b06ea054629bb3d5bef35ea20 qt-4.2.3-r1.ebuild 7851 -EBUILD qt-4.3.0.ebuild 8533 RMD160 6efbd899b8f6f74b6100b8bf8426dba0e053f5d0 SHA1 e2e47808bfdff6045885013160ae75f4e5c8cd4c SHA256 95c2ab91cbe49924376a9007dd71482446f37802d06da293886f1b590dff525d -MD5 4b896089c265c41be39b349d1d4422ec qt-4.3.0.ebuild 8533 -RMD160 6efbd899b8f6f74b6100b8bf8426dba0e053f5d0 qt-4.3.0.ebuild 8533 -SHA256 95c2ab91cbe49924376a9007dd71482446f37802d06da293886f1b590dff525d qt-4.3.0.ebuild 8533 -MISC ChangeLog 30982 RMD160 448a3b13e7d35760604d29472fd585d6d0982552 SHA1 83b8fee243a492d28af3e63e7f414a47199ce4ab SHA256 7d0eea09f5874e511c2e351a30f0bb9932a5b3ba4de620979930098d734c6726 -MD5 267d5256969ab5a3093ad5bbdb264726 ChangeLog 30982 -RMD160 448a3b13e7d35760604d29472fd585d6d0982552 ChangeLog 30982 -SHA256 7d0eea09f5874e511c2e351a30f0bb9932a5b3ba4de620979930098d734c6726 ChangeLog 30982 +EBUILD qt-4.3.0.ebuild 8605 RMD160 9b0e51d288717b6dc0b4c7fb2534d7b36f87769b SHA1 853bfb509e4878dab724e6717ca01e2d43dfe60c SHA256 69eb26b4f0fdf3078731d31e3917bc65de0d133b02538b0145c9ca2312331386 +MD5 2ee048a7ac8a6ccdd657c80315b0e4ff qt-4.3.0.ebuild 8605 +RMD160 9b0e51d288717b6dc0b4c7fb2534d7b36f87769b qt-4.3.0.ebuild 8605 +SHA256 69eb26b4f0fdf3078731d31e3917bc65de0d133b02538b0145c9ca2312331386 qt-4.3.0.ebuild 8605 +MISC ChangeLog 31105 RMD160 c3ed5eee07358d534275b9840e8f7702d543a2b7 SHA1 28221a115ddc7b67d34b906074574f8d439934a9 SHA256 75870e542846b9d212f9056d2e267b6fc98eb917dfbdb10a9f9370f5d181adf8 +MD5 e921f5212ceaa33e41a91c2760d15139 ChangeLog 31105 +RMD160 c3ed5eee07358d534275b9840e8f7702d543a2b7 ChangeLog 31105 +SHA256 75870e542846b9d212f9056d2e267b6fc98eb917dfbdb10a9f9370f5d181adf8 ChangeLog 31105 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 diff --git a/x11-libs/qt/qt-4.3.0.ebuild b/x11-libs/qt/qt-4.3.0.ebuild index 37becb40bf3f..007fe8e0870f 100644 --- a/x11-libs/qt/qt-4.3.0.ebuild +++ b/x11-libs/qt/qt-4.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.0.ebuild,v 1.14 2007/07/26 16:20:54 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.0.ebuild,v 1.15 2007/07/31 23:11:10 caleb Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -19,16 +19,12 @@ IUSE_INPUT_DEVICES="input_devices_wacom" IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}" -DEPEND="x11-libs/libXrandr +RDEPEND="x11-libs/libXrandr x11-libs/libXcursor - x11-libs/libXi x11-libs/libXfont x11-libs/libSM - x11-proto/xextproto - x11-proto/inputproto - dev-util/pkgconfig - xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) - virtual/xft + xinerama? ( x11-libs/libXinerama ) + media-libs/fontconfig >=media-libs/freetype-2 png? ( media-libs/libpng ) jpeg? ( media-libs/jpeg ) @@ -47,7 +43,13 @@ DEPEND="x11-libs/libXrandr glib? ( dev-libs/glib ) dbus? ( >=sys-apps/dbus-1.0.2 ) ssl? ( dev-libs/openssl ) - input_devices_wacom? ( x11-drivers/linuxwacom )" + input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" + +DEPEND="${RDEPEND} + xinerama? ( x11-proto/xineramaproto ) + x11-proto/xextproto + input_device_wacom? ( x11-proto/inputproto ) + dev-util/pkgconfig" pkg_setup() { QTBASEDIR=/usr/$(get_libdir)/qt4 |