From: Ingmar Vanhassel Date: Sat, 23 Feb 2008 15:42:39 +0000 (+0000) Subject: Move x11-proto/* out of RDEPEND, bug 204781. mips ->~mips to fix deps. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9edbd6fee41018f5d1e4e2dbd2d19df21504316b;p=gentoo.git Move x11-proto/* out of RDEPEND, bug 204781. mips ->~mips to fix deps. Package-Manager: portage-2.1.4.4 --- diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 75a60cbc59c5..c14c7146a8a6 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.512 2008/01/07 13:25:54 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.513 2008/02/23 15:42:39 ingmar Exp $ + + 23 Feb 2008; Ingmar Vanhassel qt-3.3.4-r8.ebuild, + qt-3.3.8-r4.ebuild: + Move x11-proto/* out of RDEPEND, bug 204781. mips -> ~mips to fix deps. 07 Jan 2008; Caleb Tennis qt-4.3.3.ebuild: PV -> P diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 0934320bd29f..792de8e35139 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1 AUX 0037-dnd-timestamp-fix.patch 2138 RMD160 c11fffd7801fb357beb2d489e6e7cc4edefc3030 SHA1 cda25e150541c3a2ba56ec6974e2771b8aaad0de SHA256 490eb5c21dc30e0beac0aac8a4b6159d56a5e3e7fe40daad39f0c0823648917d @@ -34,12 +37,19 @@ DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f DIST qt-x11-opensource-src-4.3.1.tar.gz 43118858 RMD160 134c1f1a9e685a9519ff88a3afc59e7b8329a270 SHA1 ca59cfdcfc390cf16c6e6b503546e8bb2cc8e1e2 SHA256 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 DIST qt-x11-opensource-src-4.3.2.tar.gz 43462686 RMD160 b73a3d7a1edd11987544291cce80b56f5a499969 SHA1 265fb56ded2e7ff101ebd722bd2bc1638f96057d SHA256 70198d61d038007c787bab62700d35cbd3fc925b53fe920672f2a0afbae7e276 DIST qt-x11-opensource-src-4.3.3.tar.gz 42341802 RMD160 410daca03b6802ba5cc6662219c2ba7a190bd292 SHA1 77d00e2438efa793f6c16c54b64c8ba440ee3228 SHA256 89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 -EBUILD qt-3.3.4-r8.ebuild 10564 RMD160 ba215a278663c0a3eaa811c058eead8a684c5c95 SHA1 8791161e25b66d01d472c114f736d98818fbf0b3 SHA256 b40fc51531c3ed49487015fb3df92e2ab6982ceb76f1d742f5fb16f4dca35bf9 -EBUILD qt-3.3.8-r4.ebuild 11670 RMD160 04113bb204e882033811ef88cc3a915f4484af4d SHA1 bf30b23b414f655b9c7445b9aeed64b2e35128af SHA256 9689b7a0908d85d2e93077e6167a39d4aa38d2b8b63ff51ecf77f1a19488eb98 +EBUILD qt-3.3.4-r8.ebuild 10576 RMD160 24e821e4e3c0afa1945e3846e73065c7ac2f5e98 SHA1 d45683c76591d3ee2507a001a2caaf51449ae00d SHA256 843f2eb691d9403f4953b81eda236b5e994b70494b70f622813dc17a9b1f2113 +EBUILD qt-3.3.8-r4.ebuild 11708 RMD160 6724bae8c4014075ff1a1ed7bbedbd381b1b00e7 SHA1 b9e14b41cbdd16afec4f16705fe2960a96541b68 SHA256 13f055f2f2aba0b4b7d97fdad5d0ad77fefa3998b9ffd508b40341c1887c3a14 EBUILD qt-4.3.1-r1.ebuild 8793 RMD160 f5f90f333f97672d1f5b09352d93601d06202384 SHA1 d8a8a9477901f9a9ebcb0b251ccc8425c4653e62 SHA256 e555dd997aef10f12afa9949ae6d516a5a0dfbb3c52ef54edd7371b20a995a1f EBUILD qt-4.3.2-r1.ebuild 8764 RMD160 cb19ddd7a1899fa40ea7c94de2f57a807bbd00e5 SHA1 5d6a61498e9c943123a0a956737483094547b5c6 SHA256 48d72dea51fc12744d480b1bf898540bacc345fa7db4fb747d5875c790383532 EBUILD qt-4.3.2.ebuild 8719 RMD160 392de20ba58716d70d4565f6c93794aaadc1e4a7 SHA1 d556acae2869c9c800fa7d5de9c615ffe100e922 SHA256 c1ac6de4acf5bc6c3b5bc864bf203cf4a2e50ed5eee4a84b2ebd0739f8301e7d EBUILD qt-4.3.3.ebuild 8698 RMD160 c70d1135506a270c0b19028f6466fe8384b266ce SHA1 8ddb314a28b8f06a23ae2fc892d5849d62ba1337 SHA256 4ab24199d787868d0f271bf7625e1b69b26d68fbe3324f7356bae3fe35080c20 EBUILD qt-4.4.0_rc1.ebuild 725 RMD160 c8b939f143144a759c8d45a49ffc53567deda8a1 SHA1 094b42340e8aa448d26ad4cdcd4b6527aa079167 SHA256 5ac5dee55711c2ed4dfd91cae52fab9d6bf2b91d32add886b90a11f2a88f6c4f -MISC ChangeLog 37578 RMD160 767a07fd3c32f95c80c3a23d822539ac58b9b7f2 SHA1 c263d93f81dcbf9c7e37a23c24ac78fbe8ab1cca SHA256 f362aba5b27d63f7f95a19a72985065b0b6510189b846bf75755e4dce8cca7ff +MISC ChangeLog 37748 RMD160 e83823ae77fb2c370c92ab6cd350b05beb71384f SHA1 6eacf038369b8967b0470fb9c80c69d2fe790922 SHA256 b188a79576fbdbaf946c1cd5f2835c8ddfc5087f7ff335720faaf234ad28d996 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHwD7SB18eXLOpYdkRAgNBAJwOCWqzAhYb8iOBvtLUDG8GWy4kfwCffoa6 +s1GnDk32oG4N6A29OVusQkk= +=k5JP +-----END PGP SIGNATURE----- diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild index baa9297c4a1d..fc312b2017ca 100644 --- a/x11-libs/qt/qt-3.3.4-r8.ebuild +++ b/x11-libs/qt/qt-3.3.4-r8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.28 2007/11/10 08:49:05 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.29 2008/02/23 15:42:39 ingmar Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -16,29 +16,30 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2 LICENSE="|| ( QPL-1.0 GPL-2 )" SLOT="3" -KEYWORDS="amd64 mips x86" +KEYWORDS="amd64 ~mips x86" IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc" -DEPEND="x11-libs/libXcursor +RDEPEND="x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr x11-libs/libSM - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) + xinerama? ( x11-libs/libXinerama ) virtual/xft media-libs/libpng media-libs/jpeg media-libs/libmng =media-libs/freetype-2.1* nas? ( >=media-libs/nas-1.5 ) + opengl? ( virtual/opengl virtual/glu ) mysql? ( virtual/mysql ) firebird? ( dev-db/firebird ) - opengl? ( virtual/opengl virtual/glu ) postgres? ( dev-db/postgresql ) cups? ( net-print/cups )" -# zlib? ( sys-libs/zlib )" -PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" +DEPEND="${RDEPEND} + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto )" +PDEPEND="odbc? ( ~dev-db/qt-unixODBC-${PV} )" S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} diff --git a/x11-libs/qt/qt-3.3.8-r4.ebuild b/x11-libs/qt/qt-3.3.8-r4.ebuild index 4148f11d3b59..22fe2457cd5a 100644 --- a/x11-libs/qt/qt-3.3.8-r4.ebuild +++ b/x11-libs/qt/qt-3.3.8-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.3 2007/11/10 08:49:05 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.4 2008/02/23 15:42:39 ingmar Exp $ # *** Please remember to update qt3.eclass when revbumping this *** @@ -21,27 +21,30 @@ SLOT="3" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc" -DEPEND="x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libSM - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) - immqt? ( x11-proto/xineramaproto ) - immqt-bc? ( x11-proto/xineramaproto ) - virtual/xft - media-libs/libpng +RDEPEND=" media-libs/jpeg - >=media-libs/libmng-1.0.9 >=media-libs/freetype-2 + >=media-libs/libmng-1.0.9 + media-libs/libpng sys-libs/zlib - nas? ( >=media-libs/nas-1.5 ) - mysql? ( virtual/mysql ) + virtual/xft + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libSM + cups? ( net-print/cups ) firebird? ( dev-db/firebird ) + mysql? ( virtual/mysql ) + nas? ( >=media-libs/nas-1.5 ) opengl? ( virtual/opengl virtual/glu ) postgres? ( dev-db/libpq ) - cups? ( net-print/cups )" + xinerama? ( x11-libs/libXinerama )" +DEPEND="${RDEPEND} + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) + immqt? ( x11-proto/xineramaproto ) + immqt-bc? ( x11-proto/xineramaproto )" PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}