diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-12-13 01:15:31 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-13 01:15:31 +0000 |
| commit | 0fb75a12a27511e6810765d0369565146e7fef6a (patch) | |
| tree | a61ba9e6c5a4ea3a0ff98c76a96f4148a06a6965 /x11-libs | |
| parent | Add libXinerama to modular deps. (diff) | |
| download | gentoo-2-0fb75a12a27511e6810765d0369565146e7fef6a.tar.gz gentoo-2-0fb75a12a27511e6810765d0369565146e7fef6a.tar.bz2 gentoo-2-0fb75a12a27511e6810765d0369565146e7fef6a.zip | |
Fix modular X xinerama.
(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-4.0.1.ebuild | 9 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.1.0_rc1.ebuild | 9 |
3 files changed, 19 insertions, 5 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 70bf119f7efd..6707b3488b17 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.268 2005/12/11 08:06:57 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.269 2005/12/13 01:15:31 spyderous Exp $ + + 13 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; qt-4.0.1.ebuild, + qt-4.1.0_rc1.ebuild: + Fix modular X xinerama. 11 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-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild index 61b6982edb70..76c9807320a5 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.12 2005/12/11 08:06:57 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.13 2005/12/13 01:15:31 spyderous Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -23,11 +23,16 @@ DEPEND="|| ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXfont x11-proto/xextproto - x11-proto/xineramaproto x11-proto/inputproto ) virtual/x11 ) + xinerama? ( || ( ( x11-proto/xineramaproto + x11-libs/libXinerama + ) + virtual/x11 + ) + ) virtual/xft >=media-libs/freetype-2 png? ( media-libs/libpng ) diff --git a/x11-libs/qt/qt-4.1.0_rc1.ebuild b/x11-libs/qt/qt-4.1.0_rc1.ebuild index 9db29486ec35..cfebc23ea127 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.4 2005/12/11 08:06:57 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0_rc1.ebuild,v 1.5 2005/12/13 01:15:31 spyderous Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -24,11 +24,16 @@ DEPEND="|| ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXfont x11-proto/xextproto - x11-proto/xineramaproto x11-proto/inputproto ) virtual/x11 ) + xinerama? ( || ( ( x11-proto/xineramaproto + x11-libs/libXinerama + ) + virtual/x11 + ) + ) virtual/xft >=media-libs/freetype-2 png? ( media-libs/libpng ) |