Fixed QT Dependency. Fixes #9339

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 0d90a61cbfd78bbe8df47227ed61ae32ecb0f251..d8950fb2cee2b0823e04cef34e7103814971eb2f 100644 (file)
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-lang/php
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.22 2002/10/19 22:46:23 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.23 2002/10/27 18:56:50 rphillips Exp $
 
   02 Sep 2002; Daniel Robbins <drobbins@gentoo.org> mod_php-4.2.2-r1.ebuild :
   rphillips' gmp fix broke the ebuild, fixing... (no rev bump)
@@ -11,6 +11,10 @@
 
 *mod_php-4.2.3 (10 Sep 2002)
 
+  27 Oct 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.3.ebuild :
+
+  Fixed QT dep
+
   12 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.3.ebuild :
 
   Added xmlrpc to 'xml' use flag. Fixes #7811
@@ -21,6 +25,10 @@
 
 *mod_php-4.2.2-r1 (18 Aug 2002)
 
+  27 Oct 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild :
+
+  Fixed QT dep
+
   19 Oct 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild :
 
   Is pdflib playing nice now?  Moved the image formats out of the pdflib

diff --git a/dev-php/mod_php/mod_php-4.2.2-r1.ebuild b/dev-php/mod_php/mod_php-4.2.2-r1.ebuild
index f903ce7a84f7ab0f62dde78630211239d4be27de..95713d0098e11ff68eedd6044b76021b5c9007ea 100644 (file)
--- a/dev-php/mod_php/mod_php-4.2.2-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.2.2-r1.ebuild,v 1.15 2002/10/19 22:46:23 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.2.2-r1.ebuild,v 1.16 2002/10/27 18:56:50 rphillips Exp $
 
 IUSE="freetype postgres tiff libwww nls jpeg ssl gd oci8 mysql X gdbm curl imap png xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb firebird pam"
 
@@ -26,7 +26,7 @@ DEPEND="
        png? ( >=media-libs/libpng-1.2.1 )
        gd? ( >=media-libs/libgd-1.8.3 )
        X? ( virtual/x11 )
-       qt? ( =x11-libs/qt-2.3* )
+       qt? ( x11-libs/qt )
        nls? ( sys-devel/gettext )
        pam? ( >=sys-libs/pam-0.75 )
        xml? ( >=net-libs/libwww-5.3.2 >=app-text/sablotron-0.95-r1 )

diff --git a/dev-php/mod_php/mod_php-4.2.3.ebuild b/dev-php/mod_php/mod_php-4.2.3.ebuild
index 6f47198bac7e437b44c29d4ed05e1c161eba4d78..ea0cd51e603404d191d363d6d09cabbdcc92fab9 100644 (file)
--- a/dev-php/mod_php/mod_php-4.2.3.ebuild
+++ b/dev-php/mod_php/mod_php-4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.2.3.ebuild,v 1.5 2002/10/19 22:46:23 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.2.3.ebuild,v 1.6 2002/10/27 18:56:50 rphillips Exp $
 
 IUSE="freetype postgres tiff libwww nls jpeg ssl gd oci8 mysql X gdbm curl imap png xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb freetds firebird pam"
 
@@ -26,7 +26,7 @@ DEPEND="
        png? ( >=media-libs/libpng-1.2.1 )
        gd? ( >=media-libs/libgd-1.8.3 )
        X? ( virtual/x11 )
-       qt? ( =x11-libs/qt-2.3* )
+       qt? ( x11-libs/qt )
        nls? ( sys-devel/gettext )
        pam? ( >=sys-libs/pam-0.75 )
        xml? ( >=net-libs/libwww-5.3.2 >=app-text/sablotron-0.95-r1 )
@@ -53,8 +53,7 @@ DEPEND="
 #      readline? ( >=sys-libs/ncurses-5.1
 #              >=sys-libs/readline-4.1 )"
 
-RDEPEND="${DEPEND}
-       qt? ( >=x11-libs/qt-2.3.0 )
+RDEPEND="qt? ( x11-libs/qt )
        xml? ( >=app-text/sablotron-0.95-r1 )"
 
 src_unpack() {

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index de7b8fe5d6369d92b691ff95669d829e91a969f3..d8f2cd878d27a42f8e6d469474747a809f82c533 100644 (file)
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for dev-lang/php
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.16 2002/10/18 06:21:35 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.17 2002/10/27 18:59:22 rphillips Exp $
 
 *php-4.2.3 (10 Sep 2002)
 
+  27 Oct 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.3.ebuild :
+
+  Fixed QT dep
+
   17 Oct 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.3.ebuild :
 
   Added png support
@@ -18,6 +22,10 @@
 
 *php-4.2.2-r1 (18 Aug 2002)
 
+  27 Oct 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.2-r1.ebuild :
+
+  Fixed QT dep
+
   17 Oct 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.2-r1.ebuild :
 
   Readded png support

diff --git a/dev-php/php/php-4.2.2-r1.ebuild b/dev-php/php/php-4.2.2-r1.ebuild
index 0879063ab8a015c4b72ec5ddb14dcba231341427..5e4834dec06d8322e0b77acdd3c437a52703b408 100644 (file)
--- a/dev-php/php/php-4.2.2-r1.ebuild
+++ b/dev-php/php/php-4.2.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Update: Roman Weber <gentoo@gonzo.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.2.2-r1.ebuild,v 1.16 2002/10/18 06:25:13 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.2.2-r1.ebuild,v 1.17 2002/10/27 18:59:22 rphillips Exp $
 
 IUSE="freetype postgres tiff libwww nls jpeg readline ssl gd #java mysql X gdbm curl imap png xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb firebird pam oci8"
 
@@ -26,7 +26,7 @@ DEPEND="
        png? ( >=media-libs/libpng-1.2.1 )
        gd? ( >=media-libs/libgd-1.8.3 )
        X? ( virtual/x11 )
-       qt? ( =x11-libs/qt-2.3* )
+       qt? ( x11-libs/qt )
        nls? ( sys-devel/gettext )
        pam? ( >=sys-libs/pam-0.75 )
        xml? ( >=net-libs/libwww-5.3.2 >=app-text/sablotron-0.95-r1 )
@@ -50,8 +50,7 @@ DEPEND="
        >=sys-libs/readline-4.1 )"
 #      java? ( virtual/jdk )
 
-RDEPEND="${DEPEND}
-       qt? ( >=x11-libs/qt-2.3.0 )
+RDEPEND="qt? ( x11-libs/qt )
        xml? ( >=app-text/sablotron-0.95-r1 >=net-libs/libwww-5.3.2 )"
 
 src_unpack() {
@@ -109,10 +108,10 @@ src_compile() {
                myconf="${myconf} --enable-pdflib=/usr"
        else
                use gd && myconf="${myconf} --with-gd"
-               use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib"
-               use tiff && myconf="${myconf} --with-tiff-dir=/usr"
-               use png  && myconf="${myconf} --with-png-dir=/usr"
        fi
+       use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib"
+       use tiff && myconf="${myconf} --with-tiff-dir=/usr"
+       use png  && myconf="${myconf} --with-png-dir=/usr"
 
        # optional support for oracle oci8 
        if [ "`use oci8`" ] ; then 

diff --git a/dev-php/php/php-4.2.3.ebuild b/dev-php/php/php-4.2.3.ebuild
index 51b91fde9fc6d5181f94190cdcf3ceb33248d6c4..9023d7afdaba155399310daf7d9c7b92b0da0df5 100644 (file)
--- a/dev-php/php/php-4.2.3.ebuild
+++ b/dev-php/php/php-4.2.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Update: Roman Weber <gentoo@gonzo.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.2.3.ebuild,v 1.7 2002/10/18 06:25:13 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.2.3.ebuild,v 1.8 2002/10/27 18:59:22 rphillips Exp $
 
 IUSE="freetype postgres tiff libwww nls jpeg readline ssl gd oci8 mysql X gdbm curl imap png xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb freetds firebird pam"
 
@@ -26,7 +26,7 @@ DEPEND="
        png? ( >=media-libs/libpng-1.2.1 )
        gd? ( >=media-libs/libgd-1.8.3 )
        X? ( virtual/x11 )
-       qt? ( =x11-libs/qt-2.3* )
+       qt? ( x11-libs/qt )
        nls? ( sys-devel/gettext )
        pam? ( >=sys-libs/pam-0.75 )
        xml? ( >=net-libs/libwww-5.3.2 >=app-text/sablotron-0.95-r1 )
@@ -53,8 +53,7 @@ DEPEND="
 #Removed
 #java? ( virtual/jdk )
 
-RDEPEND="${DEPEND}
-       qt? ( >=x11-libs/qt-2.3.0 )
+RDEPEND="qt? ( x11-libs/qt )
        xml? ( >=app-text/sablotron-0.95-r1 >=net-libs/libwww-5.3.2 )"
 
 src_unpack() {
@@ -113,11 +112,12 @@ src_compile() {
                myconf="${myconf} --enable-pdflib=/usr"
        else
                use gd && myconf="${myconf} --with-gd"
-               use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib"
-               use tiff && myconf="${myconf} --with-tiff-dir=/usr"
-               use png  && myconf="${myconf} --with-png-dir=/usr"
        fi
 
+       use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib"
+       use tiff && myconf="${myconf} --with-tiff-dir=/usr"
+       use png  && myconf="${myconf} --with-png-dir=/usr"
+
        # optional support for oracle oci8 
        if [ "`use oci8`" ] ; then 
                        if [ "$ORACLE_HOME" ] ; then