diff options
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.4-r8.ebuild | 21 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.8-r4.ebuild | 37 |
3 files changed, 36 insertions, 28 deletions
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 <ingmar@gentoo.org> 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 <caleb@gentoo.org> qt-4.3.3.ebuild: PV -> P 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} |