diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-12-14 05:54:01 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-14 05:54:01 +0000 |
| commit | cfc46f0fb3315e0b7034e76ba877a7e1522166ce (patch) | |
| tree | 7f4ecfbd0dd99ad66a17f3d142c67edd1dff9b96 /x11-libs | |
| parent | (#115225) Add modular X dependencies. (diff) | |
| download | gentoo-2-cfc46f0fb3315e0b7034e76ba877a7e1522166ce.tar.gz gentoo-2-cfc46f0fb3315e0b7034e76ba877a7e1522166ce.tar.bz2 gentoo-2-cfc46f0fb3315e0b7034e76ba877a7e1522166ce.zip | |
Add modular X dependencies to qt-3. Remove redundant modular deps from qt-4.
(Portage version: 2.0.53)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.4-r8.ebuild | 13 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.5.ebuild | 14 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.0.1.ebuild | 4 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.1.0_rc1.ebuild | 4 |
5 files changed, 30 insertions, 11 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index d37b416eaf38..d3c496de2049 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.270 2005/12/13 01:17:48 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.271 2005/12/14 05:54:01 spyderous Exp $ + + 14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; qt-3.3.4-r8.ebuild, + qt-3.3.5.ebuild, qt-4.0.1.ebuild, qt-4.1.0_rc1.ebuild: + Add modular X dependencies to qt-3. Remove redundant modular deps from qt-4. 13 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; qt-4.0.1.ebuild, qt-4.1.0_rc1.ebuild: diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild index 00e4b864859a..81379ed7a490 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-2005 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.10 2005/10/07 14:49:27 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.11 2005/12/14 05:54:01 spyderous Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -19,7 +19,16 @@ SLOT="3" KEYWORDS="alpha amd64 hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86" IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc" -DEPEND="virtual/x11 virtual/xft +DEPEND="|| ( ( x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXrandr + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) + ) + virtual/x11 + ) + virtual/xft media-libs/libpng media-libs/jpeg media-libs/libmng diff --git a/x11-libs/qt/qt-3.3.5.ebuild b/x11-libs/qt/qt-3.3.5.ebuild index f1a9e0971859..51f64063dbc4 100644 --- a/x11-libs/qt/qt-3.3.5.ebuild +++ b/x11-libs/qt/qt-3.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.5.ebuild,v 1.4 2005/12/04 03:56:28 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.5.ebuild,v 1.5 2005/12/14 05:54:01 spyderous Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -19,7 +19,17 @@ SLOT="3" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86" IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc" -DEPEND="virtual/x11 virtual/xft +DEPEND="|| ( ( x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXrandr + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) + + ) + virtual/x11 + ) + virtual/xft media-libs/libpng media-libs/jpeg media-libs/libmng diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild index 71fea5f88e14..88dc7eed9706 100644 --- a/x11-libs/qt/qt-4.0.1.ebuild +++ b/x11-libs/qt/qt-4.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.14 2005/12/13 01:17:48 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.15 2005/12/14 05:54:01 spyderous Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -17,8 +17,6 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib" DEPEND="|| ( ( x11-libs/libXrandr - x11-libs/libICE - x11-libs/libSM x11-libs/libXcursor x11-libs/libXi x11-libs/libXfont diff --git a/x11-libs/qt/qt-4.1.0_rc1.ebuild b/x11-libs/qt/qt-4.1.0_rc1.ebuild index db9ec4df9c51..62fdd87e5fef 100644 --- a/x11-libs/qt/qt-4.1.0_rc1.ebuild +++ b/x11-libs/qt/qt-4.1.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0_rc1.ebuild,v 1.6 2005/12/13 01:17:48 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0_rc1.ebuild,v 1.7 2005/12/14 05:54:01 spyderous Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -18,8 +18,6 @@ KEYWORDS="-*" IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib" DEPEND="|| ( ( x11-libs/libXrandr - x11-libs/libICE - x11-libs/libSM x11-libs/libXcursor x11-libs/libXi x11-libs/libXfont |