use HORDE_PHP_FEATURES from new eclass

9 files changed, 20 insertions, 97 deletions

diff --git a/net-www/horde-imp/files/digest-horde-imp-3.2.2 b/net-www/horde-imp/files/digest-horde-imp-3.2.2
deleted file mode 100644
index 1aa7a2eca15e..000000000000
--- a/net-www/horde-imp/files/digest-horde-imp-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 757e4d3b6b1b7137712ed4c4a358e822 imp-3.2.2.tar.gz 1489544
diff --git a/net-www/horde-imp/horde-imp-3.2.2.ebuild b/net-www/horde-imp/horde-imp-3.2.2.ebuild
deleted file mode 100644
index a7d3fccc511c..000000000000
--- a/net-www/horde-imp/horde-imp-3.2.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/horde-imp-3.2.2.ebuild,v 1.10 2004/01/27 00:57:20 vapier Exp $
-
-inherit horde
-
-DESCRIPTION="Horde IMP provides webmail access to IMAP/POP3 mailboxes"
-
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-
-DEPEND=""
-RDEPEND=">=net-www/horde-2.2.4"
-
-pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep imap /var/db/pkg/dev-php/mod_php*/USE`
-	if [ "${GREP}" != "" ]; then
-		return 0
-	else
-		eerror "Missing IMAP support in mod_php !"
-		die "aborting..."
-	fi
-	horde_pkg_setup
-}
diff --git a/net-www/horde-imp/horde-imp-3.2.3.ebuild b/net-www/horde-imp/horde-imp-3.2.3.ebuild
index 03a0dadddb84..9de0c28c5036 100644
--- a/net-www/horde-imp/horde-imp-3.2.3.ebuild
+++ b/net-www/horde-imp/horde-imp-3.2.3.ebuild
@@ -1,24 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/horde-imp-3.2.3.ebuild,v 1.3 2004/03/29 01:34:14 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/horde-imp-3.2.3.ebuild,v 1.4 2004/04/06 00:36:58 vapier Exp $
 
+HORDE_PHP_FEATURES="imap"
 inherit horde
 
 DESCRIPTION="Horde IMP provides webmail access to IMAP/POP3 mailboxes"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.5"
-
-pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep imap /var/db/pkg/dev-php/mod_php*/USE`
-	if [ "${GREP}" != "" ]; then
-		return 0
-	else
-		eerror "Missing IMAP support in mod_php !"
-		die "aborting..."
-	fi
-	horde_pkg_setup
-}
diff --git a/net-www/horde-kronolith/horde-kronolith-1.1.2.ebuild b/net-www/horde-kronolith/horde-kronolith-1.1.2.ebuild
index 51d6b721d0fb..c7c30ec8486a 100644
--- a/net-www/horde-kronolith/horde-kronolith-1.1.2.ebuild
+++ b/net-www/horde-kronolith/horde-kronolith-1.1.2.ebuild
@@ -1,21 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-kronolith/horde-kronolith-1.1.2.ebuild,v 1.2 2004/03/29 01:36:45 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-kronolith/horde-kronolith-1.1.2.ebuild,v 1.3 2004/04/06 00:37:48 vapier Exp $
 
+HORDE_PHP_FEATURES="mysql odbc postgres ldap"
 inherit horde
 
 DESCRIPTION="Kronolith is the Horde calendar application"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.5"
-
-pkg_setup() {
-	GREPBACKEND=`egrep 'sql|odbc|postgres|ldap' /var/db/pkg/dev-php/mod_php*/USE`
-	if [ -z "${GREPBACKEND}" ] ; then
-		eerror "Missing SQL or LDAP support in mod_php !"
-		die "aborting..."
-	fi
-	horde_pkg_setup
-}
diff --git a/net-www/horde-mnemo/horde-mnemo-1.1.1.ebuild b/net-www/horde-mnemo/horde-mnemo-1.1.1.ebuild
index 5d2604a72daf..6651cb2f4d86 100644
--- a/net-www/horde-mnemo/horde-mnemo-1.1.1.ebuild
+++ b/net-www/horde-mnemo/horde-mnemo-1.1.1.ebuild
@@ -1,21 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-mnemo/horde-mnemo-1.1.1.ebuild,v 1.3 2004/03/29 01:37:44 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-mnemo/horde-mnemo-1.1.1.ebuild,v 1.4 2004/04/06 00:38:13 vapier Exp $
 
+HORDE_PHP_FEATURES="mysql odbc postgres ldap"
 inherit horde
 
 DESCRIPTION="Mnemo is the Horde note manager"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.5"
-
-pkg_setup() {
-	GREPBACKEND=`egrep 'sql|odbc|postgres|ldap' /var/db/pkg/dev-php/mod_php*/USE`
-	if [ -z "${GREPBACKEND}" ] ; then
-		eerror "Missing SQL or LDAP support in mod_php !"
-		die "aborting..."
-	fi
-	horde_pkg_setup
-}
diff --git a/net-www/horde-nag/horde-nag-1.1.1.ebuild b/net-www/horde-nag/horde-nag-1.1.1.ebuild
index 397ea095610d..2ce490796527 100644
--- a/net-www/horde-nag/horde-nag-1.1.1.ebuild
+++ b/net-www/horde-nag/horde-nag-1.1.1.ebuild
@@ -1,21 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-nag/horde-nag-1.1.1.ebuild,v 1.3 2004/03/29 01:38:44 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-nag/horde-nag-1.1.1.ebuild,v 1.4 2004/04/06 00:38:52 vapier Exp $
 
+HORDE_PHP_FEATURES="mysql odbc postgres ldap"
 inherit horde
 
 DESCRIPTION="Nag is the Horde multiuser task list manager"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.5"
-
-pkg_setup() {
-	GREPBACKEND=`egrep 'sql|odbc|postgres|ldap' /var/db/pkg/dev-php/mod_php*/USE`
-	if [ -z "${GREPBACKEND}" ] ; then
-		eerror "Missing SQL or LDAP support in mod_php !"
-		die "aborting..."
-	fi
-	horde_pkg_setup
-}
diff --git a/net-www/horde-pear/horde-pear-1.3-r1.ebuild b/net-www/horde-pear/horde-pear-1.3-r1.ebuild
index 874f76733c6f..68ca08555cb0 100644
--- a/net-www/horde-pear/horde-pear-1.3-r1.ebuild
+++ b/net-www/horde-pear/horde-pear-1.3-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-pear/horde-pear-1.3-r1.ebuild,v 1.2 2004/03/28 17:22:57 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-pear/horde-pear-1.3-r1.ebuild,v 1.3 2004/04/06 00:39:17 vapier Exp $
 
 inherit horde
 
 DESCRIPTION="Horde Application Framework PHP PEAR files"
 HOMEPAGE="http://www.horde.org/"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
 DEPEND=""
 RDEPEND=">=dev-php/mod_php-4.1.0
diff --git a/net-www/horde-turba/horde-turba-1.2.2.ebuild b/net-www/horde-turba/horde-turba-1.2.2.ebuild
index 3fcab8a21a2a..7bf10ae97f8e 100644
--- a/net-www/horde-turba/horde-turba-1.2.2.ebuild
+++ b/net-www/horde-turba/horde-turba-1.2.2.ebuild
@@ -1,21 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-turba/horde-turba-1.2.2.ebuild,v 1.3 2004/03/29 01:41:35 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-turba/horde-turba-1.2.2.ebuild,v 1.4 2004/04/06 00:39:55 vapier Exp $
 
+HORDE_PHP_FEATURES="mysql odbc postgres ldap"
 inherit horde
 
 DESCRIPTION="Turba is the Horde address book / contact management program"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.5"
-
-pkg_setup() {
-	GREPBACKEND=`egrep 'sql|odbc|postgres|ldap' /var/db/pkg/dev-php/mod_php*/USE`
-	if [ -z "${GREPBACKEND}" ] ; then
-		eerror "Missing SQL or LDAP support in mod_php !"
-		die "aborting..."
-	fi
-	horde_pkg_setup
-}
diff --git a/net-www/horde/horde-2.2.5.ebuild b/net-www/horde/horde-2.2.5.ebuild
index 6e4d74dca3ca..350d026366c8 100644
--- a/net-www/horde/horde-2.2.5.ebuild
+++ b/net-www/horde/horde-2.2.5.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde/horde-2.2.5.ebuild,v 1.3 2004/03/28 17:23:50 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde/horde-2.2.5.ebuild,v 1.4 2004/04/06 00:35:24 vapier Exp $
 
+HORDE_PHP_FEATURES="nls"
 inherit horde
 
 DESCRIPTION="Horde Application Framework"
 HOMEPAGE="http://www.horde.org/"
 
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
 DEPEND=""
 RDEPEND=">=dev-php/mod_php-4.1.0
@@ -15,16 +16,6 @@ RDEPEND=">=dev-php/mod_php-4.1.0
 	>=dev-libs/libxml2-2.4.21
 	>=net-www/horde-pear-1.3"
 
-pkg_setup() {
-	if [ -L ${ROOT}/${HTTPD_ROOT}/horde ] ; then
-		ewarn "You need to unmerge your old Horde version first."
-		ewarn "Horde will be installed into ${HTTPD_ROOT}/horde"
-		ewarn "directly instead of a version-dependant directory."
-		die "need to unmerge old version first"
-	fi
-	horde_pkg_setup
-}
-
 src_install() {
 	horde_src_install
 	chmod 0000 test.php