Imap support now works. Old versions removed.

11 files changed, 23 insertions, 650 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index afb3beb26b18..a131e4603da1 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/php
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.4 2002/02/18 21:01:05 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.5 2002/02/23 20:35:19 g2boojum Exp $
+
+*php-4.0.6-r5 ( 22 Feb 2002 )
+
+  22 Feb 2002; Grant Goodyear <g2boojum@gentoo.org> php-4.1.1-r4.ebuild
+
+  Now imap support should work.  Building php w/ imap support requires
+  the uw-imap library and headers (from uw-imap or pine).  Annoying
+  problem that uw-imap or pine needs to be compiled w/ SSL; otherwise
+  the php build will fail due to header problems.
 
 *php-4.0.6-r5 ( 18 Feb 2002 )
 
diff --git a/dev-lang/php/files/digest-php-4.0.6-r2 b/dev-lang/php/files/digest-php-4.0.6-r2
deleted file mode 100644
index 82f9b239e415..000000000000
--- a/dev-lang/php/files/digest-php-4.0.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f698521cf2b392cf9bfa87fc1a0fe90 php-4.0.6.tar.gz 3157346
diff --git a/dev-lang/php/files/digest-php-4.0.6-r3 b/dev-lang/php/files/digest-php-4.0.6-r3
deleted file mode 100644
index 82f9b239e415..000000000000
--- a/dev-lang/php/files/digest-php-4.0.6-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f698521cf2b392cf9bfa87fc1a0fe90 php-4.0.6.tar.gz 3157346
diff --git a/dev-lang/php/files/digest-php-4.0.6-r4 b/dev-lang/php/files/digest-php-4.0.6-r4
deleted file mode 100644
index 82f9b239e415..000000000000
--- a/dev-lang/php/files/digest-php-4.0.6-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f698521cf2b392cf9bfa87fc1a0fe90 php-4.0.6.tar.gz 3157346
diff --git a/dev-lang/php/files/digest-php-4.0.6-r5 b/dev-lang/php/files/digest-php-4.0.6-r5
deleted file mode 100644
index 82f9b239e415..000000000000
--- a/dev-lang/php/files/digest-php-4.0.6-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f698521cf2b392cf9bfa87fc1a0fe90 php-4.0.6.tar.gz 3157346
diff --git a/dev-lang/php/files/digest-php-4.1.1-r3 b/dev-lang/php/files/digest-php-4.1.1-r4
index d7e8f2b826d9..d7e8f2b826d9 100644
--- a/dev-lang/php/files/digest-php-4.1.1-r3
+++ b/dev-lang/php/files/digest-php-4.1.1-r4
diff --git a/dev-lang/php/php-4.0.6-r2.ebuild b/dev-lang/php/php-4.0.6-r2.ebuild
deleted file mode 100644
index 5450c157d81b..000000000000
--- a/dev-lang/php/php-4.0.6-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.0.6-r2.ebuild,v 1.5 2002/02/03 21:50:06 danarmak Exp $
-
-S=${WORKDIR}/${PN}-4.0.6
-DESCRIPTION="HTML embedded scripting language"
-SRC_URI="http://www.php.net/distributions/${P}.tar.gz"
-HOMEPAGE="http://www.php.net/"
-
-DEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
-        >=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.0.7
-        >=media-libs/libgd-1.8.3
-	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	gettext? ( sys-devel/gettext )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( =x11-libs/qt-x11-2.3* )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imap )
-	flash? ( media-libs/libswf media-libs/ming )
-	xml2? ( dev-libs/libxml2 )"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
- 	>=media-libs/libpng-1.0.7
- 	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( >=x11-libs/qt-x11-2.3.0 )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	xml2? ( dev-libs/libxml2 )
-	imap? ( virtual/imap )"
-
-src_compile() {
-
-    local myconf
-    if [ "`use readline`" ] ; then
-      myconf="--with-readline"
-    fi
-    if [ "`use pam`" ] ; then
-      myconf="$myconf --with-pam"
-    fi
-    if [ "`use gettext`" ] ; then
-      myconf="$myconf --with-gettext"
-    fi
-    if [ "`use gdbm`" ] ; then
-      myconf="$myconf --with-gdbm=/usr"
-    fi
-    if [ "`use berkdb`" ] ; then
-      myconf="$myconf --with-db3=/usr"
-    fi
-    if [ "`use mysql`" ] ; then
-      myconf="$myconf --with-mysql=/usr"
-    fi
-    if [ "`use postgres`" ] ; then
-      myconf="$myconf --with-pgsql=/usr"
-    fi
-    if [ "`use odbc`" ] ; then
-      myconf="$myconf --with-unixODBC=/usr"
-    fi
-    if [ "`use ldap`" ] ; then
-      myconf="$myconf --with-ldap" 
-    fi
-    if [ "`use qt`" ] ; then
-      myconf="$myconf --with-qtdom" 
-    fi
-    if [ "`use imap`" ] ; then
-      myconf="$myconf --with-imap" 
-    fi
-    if [ "`use libwww`" ] ; then
-      myconf="$myconf --with-xml" 
-    else
-      myconf="$myconf --disable-xml"
-    fi
-    if [ "`use flash`" ] ; then
-      myconf="$myconf --with-swf=/usr --with-ming=/usr"
-    fi
-    if [ "`use xml`" ] ; then
-      export LIBS="-lxmlparse -lxmltok"
-      myconf="$myconf --with-sablot=/usr"
-    fi
-    if [ "`use xml2`" ] ; then
-      myconf="$myconf --with-dom"
-    fi
-
-    LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-    if [ "`use X`" ] ; then
-      myconf="$myconf --with-xpm-dir=/usr/X11R6"
-      LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-    fi
-    
-
-    
-    ./configure --enable-safe-mode --enable-ftp --enable-track-vars --with-gmp \
-	--enable-dbase --enable-sysvsem --enable-sysvshm --with-zlib=yes --enable-bcmath \
-	--enable-calendar --enable-versioning --enable-inline-optimization --enable-trans-sid \
-	--with-gd --with-ttf --with-t1lib --with-jpeg-dir=/usr/lib --prefix=/usr \
-	--with-config-file-path=`/usr/sbin/apxs -q SYSCONFDIR` --host=${CHOST} \
-	--with-apxs="/usr/sbin/apxs -ltiff" --with-exec-dir="/usr/lib/apache/bin" $myconf
-    try make
-}
-
-
-src_install() {                 
-  cd ${S}
-  try make INSTALL_ROOT=${D} install-pear
-  dodir /usr/lib/apache
-  cp .libs/libphp4.so ${D}/usr/lib/apache
-
-  dodir /etc/httpd
-  cp php.ini-dist ${D}/etc/httpd/php.ini
-  dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-  dodoc RELEASE_PROCESS README.* TODO NEWS
-  dodoc ChangeLog* *.txt
-}
-
-pkg_config() {
-
-  . ${ROOT}/etc/rc.d/config/functions
-
-  if [ -f "${ROOT}/etc/httpd/httpd.conf" ]
-  then
-
-    # Activate PHP-Extension in httpd.conf
-    echo "Activate PHP in httpd.conf..."
-    cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig
-    sed -e "s/^#LoadModule php4_module/LoadModule php4_module/" \
-      -e "s/^#AddModule mod_php4.c/AddModule mod_php4.c/" \
-      -e "s/#AddType application\/x-httpd-php /AddType application\/x-httpd-php /" \
-      -e "s/#AddType application\/x-httpd-php-/AddType application\/x-httpd-php-/" \
-	${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf
-
-  fi
-}
-
-
-
diff --git a/dev-lang/php/php-4.0.6-r3.ebuild b/dev-lang/php/php-4.0.6-r3.ebuild
deleted file mode 100644
index 0d49ca00fec1..000000000000
--- a/dev-lang/php/php-4.0.6-r3.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Tools Team <tools@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.0.6-r3.ebuild,v 1.8 2002/02/03 21:50:06 danarmak Exp $
-
-A=${PN}-4.0.6.tar.gz
-S=${WORKDIR}/${PN}-4.0.6
-DESCRIPTION="HTML embedded scripting language"
-SRC_URI="http://www.php.net/distributions/${A}"
-HOMEPAGE="http://www.php.net/"
-
-DEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
-        >=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.0.7
-        >=media-libs/libgd-1.8.3
-	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	gettext? ( sys-devel/gettext )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( =x11-libs/qt-2.3* )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imap )
-	flash? ( media-libs/libswf media-libs/ming )
-	xml2? ( dev-libs/libxml2 )
-	"
-#	java? ( virtual/jdk )
-
-RDEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
- 	>=media-libs/libpng-1.0.7
- 	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( >=x11-libs/qt-2.3.0 )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	xml2? ( dev-libs/libxml2 )
-	imap? ( virtual/imap )
-	"
-#	java? ( virtual/jdk )
-
-src_compile() {
-
-    local myconf
-    if [ "`use readline`" ] ; then
-      myconf="--with-readline"
-    fi
-    if [ "`use pam`" ] ; then
-      myconf="$myconf --with-pam"
-    fi
-    if [ "`use gettext`" ] ; then
-      myconf="$myconf --with-gettext"
-    fi
-    if [ "`use gdbm`" ] ; then
-      myconf="$myconf --with-gdbm=/usr"
-    fi
-    if [ "`use berkdb`" ] ; then
-      myconf="$myconf --with-db3=/usr"
-    fi
-    if [ "`use mysql`" ] ; then
-      myconf="$myconf --with-mysql=/usr"
-    fi
-    if [ "`use postgres`" ] ; then
-      myconf="$myconf --with-pgsql=/usr"
-    fi
-    if [ "`use odbc`" ] ; then
-      myconf="$myconf --with-unixODBC=/usr"
-    fi
-    if [ "`use ldap`" ] ; then
-      myconf="$myconf --with-ldap" 
-    fi
-    if [ "`use qt`" ] ; then
-      EXPORT QTDIR=/usr/qt/2 #hope this helps - danarmak
-      myconf="$myconf --with-qtdom" 
-    fi
-    if [ "`use imap`" ] ; then
-      myconf="$myconf --with-imap" 
-    fi
-    if [ "`use libwww`" ] ; then
-      myconf="$myconf --with-xml" 
-    else
-      myconf="$myconf --disable-xml"
-    fi
-    if [ "`use flash`" ] ; then
-      myconf="$myconf --with-swf=/usr --with-ming=/usr"
-    fi
-    if [ "`use xml`" ] ; then
-      export LIBS="-lxmlparse -lxmltok"
-      myconf="$myconf --with-sablot=/usr"
-    fi
-    if [ "`use xml2`" ] ; then
-      myconf="$myconf --with-dom"
-    fi
-#	The PHP build system does not support Blackdown
-#    if [ "`use java`" ] ; then
-#      myconf="$myconf --with-java=${JAVA_HOME}"
-#    fi
-
-    LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-    if [ "`use X`" ] ; then
-      myconf="$myconf --with-xpm-dir=/usr/X11R6"
-      LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-    fi
-    
-
-    
-    ./configure --enable-safe-mode --enable-ftp --enable-track-vars --with-gmp \
-	--enable-dbase --enable-sysvsem --enable-sysvshm --with-zlib=yes --enable-bcmath \
-	--enable-calendar --enable-versioning --enable-inline-optimization --enable-trans-sid \
-	--with-gd --with-ttf --with-t1lib --with-jpeg-dir=/usr/lib --prefix=/usr \
-	--with-config-file-path=`/usr/sbin/apxs -q SYSCONFDIR` --host=${CHOST} \
-	--with-apxs="/usr/sbin/apxs -ltiff" --with-exec-dir="/usr/lib/apache/bin" $myconf || die
-    make || die
-}
-
-
-src_install() {                 
- 
-  make INSTALL_ROOT=${D} install-pear || die
-  dodir /usr/lib/apache
-  cp .libs/libphp4.so ${D}/usr/lib/apache
-
-  dodir /etc/httpd
-  cp php.ini-dist ${D}/etc/httpd/php.ini
-  dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-  dodoc RELEASE_PROCESS README.* TODO NEWS
-  dodoc ChangeLog* *.txt
-}
-
-pkg_config() {
-
-  . ${ROOT}/etc/rc.d/config/functions
-
-  if [ -f "${ROOT}/etc/httpd/httpd.conf" ]
-  then
-
-    # Activate PHP-Extension in httpd.conf
-    echo "Activate PHP in httpd.conf..."
-    cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig
-    sed -e "s/^#LoadModule php4_module/LoadModule php4_module/" \
-      -e "s/^#AddModule mod_php4.c/AddModule mod_php4.c/" \
-      -e "s/#AddType application\/x-httpd-php /AddType application\/x-httpd-php /" \
-      -e "s/#AddType application\/x-httpd-php-/AddType application\/x-httpd-php-/" \
-	${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf
-
-  fi
-}
-
-
-
diff --git a/dev-lang/php/php-4.0.6-r4.ebuild b/dev-lang/php/php-4.0.6-r4.ebuild
deleted file mode 100644
index 3784de7a5ed9..000000000000
--- a/dev-lang/php/php-4.0.6-r4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Tools Team <tools@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.0.6-r4.ebuild,v 1.1 2002/02/12 17:44:44 karltk Exp $
-
-A=${PN}-4.0.6.tar.gz
-S=${WORKDIR}/${PN}-4.0.6
-DESCRIPTION="HTML embedded scripting language"
-SRC_URI="http://www.php.net/distributions/${A}"
-HOMEPAGE="http://www.php.net/"
-
-DEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
-        >=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.0.7
-        >=media-libs/libgd-1.8.3
-	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	gettext? ( sys-devel/gettext )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( =x11-libs/qt-2.3* )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imap )
-	flash? ( media-libs/libswf media-libs/ming )
-	xml2? ( dev-libs/libxml2 )
-	java? ( virtual/jdk )
-	"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
- 	>=media-libs/libpng-1.0.7
- 	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( >=x11-libs/qt-2.3.0 )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	xml2? ( dev-libs/libxml2 )
-	imap? ( virtual/imap )
-	java? ( virtual/jdk )
-	"
-
-src_compile() {
-
-	local myconf
-
-	use readline && myconf="${myconf} --with-readline"
-	use pam && myconf="${myconf} --with-pam"
-	use gettext && myconf="${myconf} --with-gettext"
-	use gdbm && myconf="${myconf} --with-gdbm=/usr"
-	use berkdb && myconf="${myconf} --with-db3=/usr"
-	use mysql && myconf="${myconf} --with-mysql=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use odbc && myconf="${myconf} --with-unixODBC=/usr"
-	use ldap && myconf="${myconf} --with-ldap"
-	use imap && myconf="${myconf} --with-imap"
-	
-	if [ "`use qt`" ] ; then
-		EXPORT QTDIR=/usr/qt/2 #hope this helps - danarmak
-		myconf="$myconf --with-qtdom" 
-	fi
-	
-	use libwww && myconf="${myconf} --with-xml" || myconf="${myconf} --disable-xml"
-	use flash && myconf="${myconf} --with-swf=/usr --with-ming=/usr"
-	
-	if [ "`use xml`" ] ; then
-		export LIBS="-lxmlparse -lxmltok"
-		myconf="$myconf --with-sablot=/usr"
-	fi
-
-	use xml2 && myconf="${myconf} --with-dom"
-	use java && myconf="${myconf} --with-java=${JDK_HOME}"
-
-	LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-	if [ "`use X`" ] ; then
-		myconf="$myconf --with-xpm-dir=/usr/X11R6"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-	fi
-    
-
-    
-	./configure --enable-safe-mode --enable-ftp --enable-track-vars --with-gmp \
-		--enable-dbase --enable-sysvsem --enable-sysvshm --with-zlib=yes --enable-bcmath \
-		--enable-calendar --enable-versioning --enable-inline-optimization --enable-trans-sid \
-		--with-gd --with-ttf --with-t1lib --with-jpeg-dir=/usr/lib --prefix=/usr \
-		--with-config-file-path=`/usr/sbin/apxs -q SYSCONFDIR` --host=${CHOST} \
-		--with-apxs="/usr/sbin/apxs -ltiff" --with-exec-dir="/usr/lib/apache/bin" $myconf || die
-
-	make || die
-}
-
-
-src_install() {                 
- 
-	make INSTALL_ROOT=${D} install-pear || die
-	dodir /usr/lib/apache
-	cp .libs/libphp4.so ${D}/usr/lib/apache
-
-	dodir /etc/httpd
-	cp php.ini-dist ${D}/etc/httpd/php.ini
-	dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-	dodoc RELEASE_PROCESS README.* TODO NEWS
-	dodoc ChangeLog* *.txt
-}
-
-pkg_config() {
-
-	. ${ROOT}/etc/rc.d/config/functions
-
-	if [ -f "${ROOT}/etc/httpd/httpd.conf" ] ; then
-
-		# Activate PHP-Extension in httpd.conf
-		einfo "Activate PHP in httpd.conf..."
-		cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig
-		sed -e "s/^#LoadModule php4_module/LoadModule php4_module/" \
-			-e "s/^#AddModule mod_php4.c/AddModule mod_php4.c/" \
-			-e "s/#AddType application\/x-httpd-php /AddType application\/x-httpd-php /" \
-			-e "s/#AddType application\/x-httpd-php-/AddType application\/x-httpd-php-/" \
-			${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf
-	fi
-}
-
-
-
diff --git a/dev-lang/php/php-4.0.6-r5.ebuild b/dev-lang/php/php-4.0.6-r5.ebuild
deleted file mode 100644
index 0060675e2e3e..000000000000
--- a/dev-lang/php/php-4.0.6-r5.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Tools Team <tools@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.0.6-r5.ebuild,v 1.1 2002/02/18 21:01:05 karltk Exp $
-
-A=${PN}-4.0.6.tar.gz
-S=${WORKDIR}/${PN}-4.0.6
-DESCRIPTION="HTML embedded scripting language"
-SRC_URI="http://www.php.net/distributions/${A}"
-HOMEPAGE="http://www.php.net/"
-
-DEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
-        >=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.0.7
-        >=media-libs/libgd-1.8.3
-	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	gettext? ( sys-devel/gettext )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( =x11-libs/qt-2.3* )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imap )
-	flash? ( media-libs/libswf media-libs/ming )
-	xml2? ( dev-libs/libxml2 )
-	java? ( virtual/jdk )
-	"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
- 	>=media-libs/libpng-1.0.7
- 	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( >=x11-libs/qt-2.3.0 )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	xml2? ( dev-libs/libxml2 )
-	imap? ( virtual/imap )
-	"
-src_compile() {
-
-	local myconf
-
-	use readline && myconf="${myconf} --with-readline"
-	use pam && myconf="${myconf} --with-pam"
-	use gettext && myconf="${myconf} --with-gettext"
-	use gdbm && myconf="${myconf} --with-gdbm=/usr"
-	use berkdb && myconf="${myconf} --with-db3=/usr"
-	use mysql && myconf="${myconf} --with-mysql=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use odbc && myconf="${myconf} --with-unixODBC=/usr"
-	use ldap && myconf="${myconf} --with-ldap"
-	use imap && myconf="${myconf} --with-imap"
-	
-	if [ "`use qt`" ] ; then
-		EXPORT QTDIR=/usr/qt/2 #hope this helps - danarmak
-		myconf="$myconf --with-qtdom" 
-	fi
-	
-	use libwww && myconf="${myconf} --with-xml" || myconf="${myconf} --disable-xml"
-	use flash && myconf="${myconf} --with-swf=/usr --with-ming=/usr"
-	
-	if [ "`use xml`" ] ; then
-		export LIBS="-lxmlparse -lxmltok"
-		myconf="$myconf --with-sablot=/usr"
-	fi
-
-	use xml2 && myconf="${myconf} --with-dom"
-
-	LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-	if [ "`use X`" ] ; then
-		myconf="$myconf --with-xpm-dir=/usr/X11R6"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-	fi
-    
-
-    
-	./configure --enable-safe-mode \
-		--enable-ftp \
-		--enable-track-vars \
-		--with-gmp \
-		--enable-dbase \
-		--enable-sysvsem \
-		--enable-sysvshm \
-		--with-zlib=yes \
-		--enable-bcmath \
-		--enable-calendar \
-		--enable-versioning \
-		--enable-inline-optimization \
-		--enable-trans-sid \
-		--with-gd \
-		--with-ttf \
-		--with-t1lib \
-		--with-jpeg-dir=/usr/lib \
-		--prefix=/usr \
-		--with-config-file-path=`/usr/sbin/apxs -q SYSCONFDIR` \
-		--host=${CHOST} \
-		--with-apxs="/usr/sbin/apxs -ltiff" \
-		--with-exec-dir="/usr/lib/apache/bin" \
-		$myconf || die "./configure failed"
-
-	make || die
-}
-
-
-src_install() {                 
- 
-	make INSTALL_ROOT=${D} install-pear || die
-	dodir /usr/lib/apache
-	cp .libs/libphp4.so ${D}/usr/lib/apache
-
-	dodir /etc/httpd
-	cp php.ini-dist ${D}/etc/httpd/php.ini
-	dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-	dodoc RELEASE_PROCESS README.* TODO NEWS
-	dodoc ChangeLog* *.txt
-}
-
-pkg_config() {
-
-	. ${ROOT}/etc/rc.d/config/functions
-
-	if [ -f "${ROOT}/etc/httpd/httpd.conf" ] ; then
-
-		# Activate PHP-Extension in httpd.conf
-		einfo "Activate PHP in httpd.conf..."
-		cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig
-		sed -e "s/^#LoadModule php4_module/LoadModule php4_module/" \
-			-e "s/^#AddModule mod_php4.c/AddModule mod_php4.c/" \
-			-e "s/#AddType application\/x-httpd-php /AddType application\/x-httpd-php /" \
-			-e "s/#AddType application\/x-httpd-php-/AddType application\/x-httpd-php-/" \
-			${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf
-	fi
-}
-
-
-
diff --git a/dev-lang/php/php-4.1.1-r3.ebuild b/dev-lang/php/php-4.1.1-r4.ebuild
index 0204800fd202..7705e3de3356 100644
--- a/dev-lang/php/php-4.1.1-r3.ebuild
+++ b/dev-lang/php/php-4.1.1-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.1.1-r3.ebuild,v 1.1 2002/02/18 21:01:05 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.1.1-r4.ebuild,v 1.1 2002/02/23 20:35:19 g2boojum Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="HTML embedded scripting language"
@@ -33,7 +33,7 @@ DEPEND="virtual/glibc
 	qt? ( =x11-libs/qt-2.3* )
 	xml? ( >=app-text/sablotron-0.44 )
 	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imap )
+	imap? ( virtual/imapUW )
 	flash? ( media-libs/libswf media-libs/ming )
 	xml2? ( dev-libs/libxml2 )
 	java? ( virtual/jdk )
@@ -58,7 +58,6 @@ RDEPEND="virtual/glibc
 	xml? ( >=app-text/sablotron-0.44 )
 	libwww? ( >=net-libs/libwww-5.3.2 )
 	xml2? ( dev-libs/libxml2 )
-	imap? ( virtual/imap )
 	java? ( virtual/jdk )
 	"
 
@@ -104,7 +103,17 @@ src_compile() {
 		myconf="$myconf --with-qtdom" 
 	fi
 
-	use imap && myconf="$myconf --with-imap" 
+	if [ "`use imap`" ] ; then
+		# need to see if imap was built w/ ssl support
+		local pkg=`tail -n 1 /var/db/pkg/virtual/imapUW/VIRTUAL`
+		if [ "`grep ssl /var/db/pkg/${pkg}/USE`" ] ; then
+			echo "imap compiled with SSL"
+			myconf="$myconf --with-imap-ssl"
+		else
+			echo "imap compiled w/o SSL"
+			myconf="$myconf --with-imap"
+		fi
+	fi
 	use libwww && myconf="$myconf --with-xml" || myconf="$myconf --disable-xml"
 	use flash && myconf="$myconf --with-swf=/usr --with-ming=/usr"