summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-12-13 01:15:31 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-12-13 01:15:31 +0000
commiteac8b00d1e4c6bc7e6c82d6c1850fe0249c9736e (patch)
treedad057a34207a2b21039cb2db77244a3814b5e33 /x11-libs/qt
parentAdd libXinerama to modular deps. (diff)
downloadhistorical-eac8b00d1e4c6bc7e6c82d6c1850fe0249c9736e.tar.gz
historical-eac8b00d1e4c6bc7e6c82d6c1850fe0249c9736e.tar.bz2
historical-eac8b00d1e4c6bc7e6c82d6c1850fe0249c9736e.zip
Fix modular X xinerama.
Package-Manager: portage-2.0.53
Diffstat (limited to 'x11-libs/qt')
-rw-r--r--x11-libs/qt/ChangeLog6
-rw-r--r--x11-libs/qt/Manifest6
-rw-r--r--x11-libs/qt/qt-4.0.1.ebuild9
-rw-r--r--x11-libs/qt/qt-4.1.0_rc1.ebuild9
4 files changed, 22 insertions, 8 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/Manifest b/x11-libs/qt/Manifest
index 28360d951870..1db7d57eb23d 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,4 +1,4 @@
-MD5 c91217d6b98cf91e02f9d21c21d041ae ChangeLog 3463
+MD5 ea2b3082710dbd40f1a58ede651d79e7 ChangeLog 3585
MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
@@ -21,5 +21,5 @@ MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
MD5 c2589d23d5f129c79f4c9e603ab09fb9 qt-3.3.4-r8.ebuild 10045
MD5 444d3e2808bd881191e77cadd7c646aa qt-3.3.5.ebuild 9960
-MD5 e5670b3c7deb60be019b8cdec3f088a7 qt-4.0.1.ebuild 5938
-MD5 5ad5332e8f1e6c0c63b9c05ab6480333 qt-4.1.0_rc1.ebuild 6090
+MD5 978210039acb8eee8248a450a086fa4e qt-4.0.1.ebuild 6007
+MD5 e6bc0b47aca9300369a7882ac39aeaca qt-4.1.0_rc1.ebuild 6159
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 )