use horde eclass

26 files changed, 63 insertions, 297 deletions

diff --git a/net-www/horde-chora/ChangeLog b/net-www/horde-chora/ChangeLog
index 2d4f67f1fa3a..044558776d5d 100644
--- a/net-www/horde-chora/ChangeLog
+++ b/net-www/horde-chora/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-www/horde-chora
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/ChangeLog,v 1.11 2003/12/15 20:46:02 stuart Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/ChangeLog,v 1.12 2004/01/27 00:57:05 vapier Exp $
 
   15 Dec 2003; Stuart Herbert <stuart@gentoo.org> horde-chora-1.2-r1.ebuild:
   Fix for bug #32636
diff --git a/net-www/horde-chora/Manifest b/net-www/horde-chora/Manifest
index be6d3b6403ed..974b7b1bc9fe 100644
--- a/net-www/horde-chora/Manifest
+++ b/net-www/horde-chora/Manifest
@@ -1,4 +1,4 @@
-MD5 ea5beb61164ca50e33569bd8b589a6ea horde-chora-1.2-r1.ebuild 1222
 MD5 66ebb42becedf18be1941033104d5ae9 ChangeLog 1301
+MD5 913f45b608425b2e1d0f534732e51d55 horde-chora-1.2-r1.ebuild 421
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 4e7d3aeb55f6a66a360f0c4571a7804b files/digest-horde-chora-1.2-r1 61
diff --git a/net-www/horde-chora/horde-chora-1.2-r1.ebuild b/net-www/horde-chora/horde-chora-1.2-r1.ebuild
index 9fd4d7979270..4571bfd8811d 100644
--- a/net-www/horde-chora/horde-chora-1.2-r1.ebuild
+++ b/net-www/horde-chora/horde-chora-1.2-r1.ebuild
@@ -1,51 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-chora/horde-chora-1.2-r1.ebuild,v 1.10 2004/01/19 06:45:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/horde-chora-1.2-r1.ebuild,v 1.11 2004/01/27 00:57:05 vapier Exp $
 
-inherit webapp-apache
+inherit horde
 
-MY_P=${P/horde-/}
 DESCRIPTION="Chora is the Horde CVS viewer"
-HOMEPAGE="http://www.horde.org/chora/"
-SRC_URI="ftp://ftp.horde.org/pub/chora/tarballs/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.4
 	>=app-text/rcs-5.7-r1
 	>=dev-util/cvs-1.11.2"
-
-S=${WORKDIR}/${MY_P}
-
-webapp-detect || NO_WEBSERVER=1
-
-pkg_setup() {
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/horde/chora
-
-	dodoc COPYING README docs/*
-	rm -rf COPYING README docs
-
-	dodir ${destdir}
-	cp -r . ${D}${destdir}
-	cd ${D}/${HTTPD_ROOT}/horde
-
-	# protecting files
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} chora
-	find ${D}/${destdir} -type f -exec chmod 0640 {} \;
-	find ${D}/${destdir} -type d -exec chmod 0750 {} \;
-}
-
-pkg_postinst() {
-	einfo "Please read /usr/share/doc/${PF}/INSTALL.gz"
-}
diff --git a/net-www/horde-chora/metadata.xml b/net-www/horde-chora/metadata.xml
index 13bc126c7d91..68c78dd23817 100644
--- a/net-www/horde-chora/metadata.xml
+++ b/net-www/horde-chora/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
+<email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-www/horde-imp/ChangeLog b/net-www/horde-imp/ChangeLog
index 89f5c6d643c6..90579f7438af 100644
--- a/net-www/horde-imp/ChangeLog
+++ b/net-www/horde-imp/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-www/horde-imp
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/ChangeLog,v 1.14 2003/12/15 20:53:08 stuart Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/ChangeLog,v 1.15 2004/01/27 00:57:20 vapier Exp $
 
   15 Dec 2003; Stuart Herbert <stuart@gentoo.org> horde-imp-3.2.2.ebuild:
   Fix for bug #32636
diff --git a/net-www/horde-imp/Manifest b/net-www/horde-imp/Manifest
index 673eb2ef2282..f6022b16a2d7 100644
--- a/net-www/horde-imp/Manifest
+++ b/net-www/horde-imp/Manifest
@@ -1,4 +1,4 @@
 MD5 f3cf71f6653a3a4350f8c810c2c9702a ChangeLog 2013
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 0820c07216c4c4ee92f3172af56ce636 horde-imp-3.2.2.ebuild 1373
+MD5 89c965321016bc6512ab1e89d8d4c5b7 horde-imp-3.2.2.ebuild 647
 MD5 3c27fa2d766fcde19cc8a601915f4d0b files/digest-horde-imp-3.2.2 62
diff --git a/net-www/horde-imp/horde-imp-3.2.2.ebuild b/net-www/horde-imp/horde-imp-3.2.2.ebuild
index f2f75a688d05..a7d3fccc511c 100644
--- a/net-www/horde-imp/horde-imp-3.2.2.ebuild
+++ b/net-www/horde-imp/horde-imp-3.2.2.ebuild
@@ -1,25 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.9 2004/01/19 06:45:34 vapier Exp $
+# $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 webapp-apache
+inherit horde
 
-MY_P=${P/horde-/}
 DESCRIPTION="Horde IMP provides webmail access to IMAP/POP3 mailboxes"
-HOMEPAGE="http://www.horde.org/imp/"
-SRC_URI="ftp://ftp.horde.org/pub/imp/tarballs/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.4"
 
-S=${WORKDIR}/${MY_P}
-
-webapp-detect || NO_WEBSERVER=1
-
 pkg_setup() {
 	# FIXME: Is this really how we want to do this ?
 	GREP=`grep imap /var/db/pkg/dev-php/mod_php*/USE`
@@ -29,29 +20,5 @@ pkg_setup() {
 		eerror "Missing IMAP support in mod_php !"
 		die "aborting..."
 	fi
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/horde/imp
-
-	dodoc COPYING README docs/*
-	rm -rf COPYING README docs
-
-	dodir ${destdir}
-	cp -r . ${D}${destdir}
-	cd ${D}/${HTTPD_ROOT}/horde
-
-	# protecting files
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} imp
-	find ${D}/${destdir} -type f -exec chmod 0640 {} \;
-	find ${D}/${destdir} -type d -exec chmod 0750 {} \;
-}
-
-pkg_postinst() {
-	einfo "Please read /usr/share/doc/${PF}/INSTALL.gz !"
+	horde_pkg_setup
 }
diff --git a/net-www/horde-imp/metadata.xml b/net-www/horde-imp/metadata.xml
index 13bc126c7d91..68c78dd23817 100644
--- a/net-www/horde-imp/metadata.xml
+++ b/net-www/horde-imp/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
+<email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-www/horde-kronolith/Manifest b/net-www/horde-kronolith/Manifest
index bfd0c873fded..ddc87217de30 100644
--- a/net-www/horde-kronolith/Manifest
+++ b/net-www/horde-kronolith/Manifest
@@ -1,4 +1,4 @@
-MD5 f09bb55eca7a247b6b728c8f88648705 files/digest-horde-kronolith-1.1 65
 MD5 67117e3acb58b04f958a63f46b8252d6 ChangeLog 1391
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 2beb5ca19febd4137dd6873e54a2a195 horde-kronolith-1.1.ebuild 1388
+MD5 36719d96179dc880bca552baa8ee783f horde-kronolith-1.1.ebuild 618
+MD5 f09bb55eca7a247b6b728c8f88648705 files/digest-horde-kronolith-1.1 65
diff --git a/net-www/horde-kronolith/horde-kronolith-1.1.ebuild b/net-www/horde-kronolith/horde-kronolith-1.1.ebuild
index 848af5da7b36..5d0bfd09075a 100644
--- a/net-www/horde-kronolith/horde-kronolith-1.1.ebuild
+++ b/net-www/horde-kronolith/horde-kronolith-1.1.ebuild
@@ -1,54 +1,21 @@
 # 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.ebuild,v 1.10 2004/01/19 06:45:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-kronolith/horde-kronolith-1.1.ebuild,v 1.11 2004/01/27 00:57:47 vapier Exp $
 
-inherit webapp-apache
+inherit horde
 
-MY_P=${P/horde-/}
 DESCRIPTION="Kronolith is the Horde calendar application"
-HOMEPAGE="http://www.horde.org/kronolith/"
-SRC_URI="ftp://ftp.horde.org/pub/kronolith/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.4"
 
-S=${WORKDIR}/${MY_P}
-
-webapp-detect || NO_WEBSERVER=1
-
 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
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/horde/kronolith
-
-	dodoc COPYING README docs/*
-	rm -rf COPYING README docs
-
-	dodir ${destdir}
-	cp -r . ${D}${destdir}
-	cd ${D}/${HTTPD_ROOT}/horde
-
-	# protecting files
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} kronolith
-	find ${D}/${destdir} -type f -exec chmod 0640 {} \;
-	find ${D}/${destdir} -type d -exec chmod 0750 {} \;
-}
-
-pkg_postinst() {
-	einfo "Please read /usr/share/doc/${PF}/INSTALL.gz"
+	horde_pkg_setup
 }
diff --git a/net-www/horde-kronolith/metadata.xml b/net-www/horde-kronolith/metadata.xml
index 13bc126c7d91..68c78dd23817 100644
--- a/net-www/horde-kronolith/metadata.xml
+++ b/net-www/horde-kronolith/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
+<email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-www/horde-mnemo/ChangeLog b/net-www/horde-mnemo/ChangeLog
index 5caa62a783af..9831f6986f29 100644
--- a/net-www/horde-mnemo/ChangeLog
+++ b/net-www/horde-mnemo/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-www/horde-mnemo
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-mnemo/ChangeLog,v 1.2 2004/01/19 09:43:34 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-mnemo/ChangeLog,v 1.3 2004/01/27 00:58:29 vapier Exp $
 
 *horde-mnemo-1.1 (19 Jan 2004)
 
diff --git a/net-www/horde-mnemo/horde-mnemo-1.1.ebuild b/net-www/horde-mnemo/horde-mnemo-1.1.ebuild
index 152f369c95a1..16309f656671 100644
--- a/net-www/horde-mnemo/horde-mnemo-1.1.ebuild
+++ b/net-www/horde-mnemo/horde-mnemo-1.1.ebuild
@@ -1,54 +1,21 @@
 # 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.ebuild,v 1.1 2004/01/19 07:09:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-mnemo/horde-mnemo-1.1.ebuild,v 1.2 2004/01/27 00:58:29 vapier Exp $
 
-inherit webapp-apache
+inherit horde
 
-MY_P=${P/horde-/}
 DESCRIPTION="Mnemo is the Horde note manager"
-HOMEPAGE="http://www.horde.org/mnemo/"
-SRC_URI="ftp://ftp.horde.org/pub/mnemo/tarballs/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.4"
 
-S=${WORKDIR}/${MY_P}
-
-webapp-detect || NO_WEBSERVER=1
-
 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
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/horde/mnemo
-
-	dodoc README docs/*
-	rm -rf LICENSE README docs
-
-	dodir ${destdir}
-	cp -r . ${D}${destdir}
-	cd ${D}/${HTTPD_ROOT}/horde
-
-	# protecting files
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} mnemo
-	find ${D}/${destdir} -type f -exec chmod 0640 {} \;
-	find ${D}/${destdir} -type d -exec chmod 0750 {} \;
-}
-
-pkg_postinst() {
-	einfo "Please read /usr/share/doc/${PF}/INSTALL.gz !"
+	horde_pkg_setup
 }
diff --git a/net-www/horde-mnemo/metadata.xml b/net-www/horde-mnemo/metadata.xml
index 13bc126c7d91..68c78dd23817 100644
--- a/net-www/horde-mnemo/metadata.xml
+++ b/net-www/horde-mnemo/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
+<email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-www/horde-nag/ChangeLog b/net-www/horde-nag/ChangeLog
index 1b35dbb05da8..f425f167f653 100644
--- a/net-www/horde-nag/ChangeLog
+++ b/net-www/horde-nag/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-www/horde-nag
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-nag/ChangeLog,v 1.1 2004/01/19 09:44:10 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-nag/ChangeLog,v 1.2 2004/01/27 00:58:51 vapier Exp $
 
 *horde-nag-1.1 (19 Jan 2004)
 
diff --git a/net-www/horde-nag/horde-nag-1.1.ebuild b/net-www/horde-nag/horde-nag-1.1.ebuild
index c3b2f64bed42..4a9a73139f14 100644
--- a/net-www/horde-nag/horde-nag-1.1.ebuild
+++ b/net-www/horde-nag/horde-nag-1.1.ebuild
@@ -1,54 +1,21 @@
 # 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.ebuild,v 1.1 2004/01/19 09:44:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-nag/horde-nag-1.1.ebuild,v 1.2 2004/01/27 00:58:51 vapier Exp $
 
-inherit webapp-apache
+inherit horde
 
-MY_P=${P/horde-/}
 DESCRIPTION="Nag is the Horde multiuser task list manager"
-HOMEPAGE="http://www.horde.org/nag/"
-SRC_URI="ftp://ftp.horde.org/pub/nag/tarballs/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.4"
 
-S=${WORKDIR}/${MY_P}
-
-webapp-detect || NO_WEBSERVER=1
-
 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
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/horde/nag
-
-	dodoc README docs/*
-	rm -rf COPYING README docs
-
-	dodir ${destdir}
-	cp -r . ${D}${destdir}
-	cd ${D}/${HTTPD_ROOT}/horde
-
-	# protecting files
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} nag
-	find ${D}/${destdir} -type f -exec chmod 0640 {} \;
-	find ${D}/${destdir} -type d -exec chmod 0750 {} \;
-}
-
-pkg_postinst() {
-	einfo "Please read /usr/share/doc/${PF}/INSTALL.gz !"
+	horde_pkg_setup
 }
diff --git a/net-www/horde-nag/metadata.xml b/net-www/horde-nag/metadata.xml
index 13bc126c7d91..68c78dd23817 100644
--- a/net-www/horde-nag/metadata.xml
+++ b/net-www/horde-nag/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
+<email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-www/horde-pear/ChangeLog b/net-www/horde-pear/ChangeLog
index c3f2f9797f11..c4b68a9a4e6a 100644
--- a/net-www/horde-pear/ChangeLog
+++ b/net-www/horde-pear/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-www/horde-pear
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-pear/ChangeLog,v 1.4 2003/09/11 18:58:52 mholzer Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-pear/ChangeLog,v 1.5 2004/01/27 00:59:09 vapier Exp $
 
 *horde-pear-1.1 (12 Sep 2003)
 
diff --git a/net-www/horde-pear/Manifest b/net-www/horde-pear/Manifest
index 2bdf7a02e445..d8651af59b06 100644
--- a/net-www/horde-pear/Manifest
+++ b/net-www/horde-pear/Manifest
@@ -1,4 +1,4 @@
 MD5 37fca2ee502fe9074bf8f7c5aea7e8e4 ChangeLog 864
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 2e33881051b7a160b226ee2068da815e horde-pear-1.1.ebuild 758
+MD5 de02dd4fd026d5077f4d55c145dc5d71 horde-pear-1.1.ebuild 663
 MD5 5634966aceb363b5265dce1c1bbc0cd2 files/digest-horde-pear-1.1 61
diff --git a/net-www/horde-pear/horde-pear-1.1.ebuild b/net-www/horde-pear/horde-pear-1.1.ebuild
index c6832c24b0ec..cadb78da33e9 100644
--- a/net-www/horde-pear/horde-pear-1.1.ebuild
+++ b/net-www/horde-pear/horde-pear-1.1.ebuild
@@ -1,15 +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.1.ebuild,v 1.5 2004/01/19 06:38:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-pear/horde-pear-1.1.ebuild,v 1.6 2004/01/27 00:59:09 vapier Exp $
+
+inherit horde
 
-MY_P="${P/horde-/}"
-MY_PN="${PN/horde-/}"
 DESCRIPTION="Horde Application Framework PHP PEAR files"
 HOMEPAGE="http://www.horde.org/"
-SRC_URI="ftp://ftp.horde.org/pub/pear/${MY_P}.tar.bz2"
+SRC_URI="http://ftp.horde.org/pub/${HORDE_PN}/tarballs/${HORDE_PN}-${PV}.tar.bz2"
 
-LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=""
@@ -17,14 +15,13 @@ RDEPEND=">=dev-php/mod_php-4.1.0
 	>=sys-devel/gettext-0.10.40
 	>=dev-libs/libxml2-2.4.21-r1"
 
-S=${WORKDIR}/${MY_PN}
+S=${WORKDIR}/pear
 
-src_compile() {
-	#nothing to compile
-	echo "Nothing to compile"
-}
+pkg_setup() { :;}
 
 src_install() {
 	dodir /usr/lib
 	cp -a ${S} ${D}/usr/lib/php
 }
+
+pkg_postinst() { :;}
diff --git a/net-www/horde-pear/metadata.xml b/net-www/horde-pear/metadata.xml
index 13bc126c7d91..68c78dd23817 100644
--- a/net-www/horde-pear/metadata.xml
+++ b/net-www/horde-pear/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
+<email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-www/horde-turba/ChangeLog b/net-www/horde-turba/ChangeLog
index 5319f7661d8e..d83b4370f56d 100644
--- a/net-www/horde-turba/ChangeLog
+++ b/net-www/horde-turba/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-www/horde-turba
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-turba/ChangeLog,v 1.10 2004/01/07 21:37:39 robbat2 Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-turba/ChangeLog,v 1.11 2004/01/27 00:59:30 vapier Exp $
 
   07 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> horde-turba-1.2.1.ebuild:
   fix bug #37492 and update copyright headers
diff --git a/net-www/horde-turba/horde-turba-1.2.1.ebuild b/net-www/horde-turba/horde-turba-1.2.1.ebuild
index 225a65f40a9e..20affde7f7f2 100644
--- a/net-www/horde-turba/horde-turba-1.2.1.ebuild
+++ b/net-www/horde-turba/horde-turba-1.2.1.ebuild
@@ -1,54 +1,21 @@
 # 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.1.ebuild,v 1.9 2004/01/19 06:57:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-turba/horde-turba-1.2.1.ebuild,v 1.10 2004/01/27 00:59:30 vapier Exp $
 
-inherit webapp-apache
+inherit horde
 
-MY_P=${P/horde-/}
 DESCRIPTION="Turba is the Horde address book / contact management program"
-HOMEPAGE="http://www.horde.org/turba/"
-SRC_URI="ftp://ftp.horde.org/pub/turba/tarballs/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.4"
 
-S=${WORKDIR}/${MY_P}
-
-webapp-detect || NO_WEBSERVER=1
-
 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
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/horde/turba
-
-	dodoc COPYING README docs/*
-	rm -rf COPYING README docs
-
-	dodir ${destdir}
-	cp -r . ${D}${destdir}
-	cd ${D}/${HTTPD_ROOT}/horde
-
-	# protecting files
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} turba
-	find ${D}/${destdir} -type f -exec chmod 0640 {} \;
-	find ${D}/${destdir} -type d -exec chmod 0750 {} \;
-}
-
-pkg_postinst() {
-	einfo "Please read /usr/share/doc/${PF}/INSTALL.gz !"
+	horde_pkg_setup
 }
diff --git a/net-www/horde/Manifest b/net-www/horde/Manifest
index 643592311425..5d56881acb87 100644
--- a/net-www/horde/Manifest
+++ b/net-www/horde/Manifest
@@ -1,4 +1,4 @@
-MD5 d00b68f4d9082ed6fc81dd6232bed73f files/digest-horde-2.2.4 63
-MD5 90a5681f8ae4e3a017871877ccbb1131 horde-2.2.4.ebuild 1758
+MD5 7df2278c8f78bed436ffe122eacca6fe horde-2.2.4.ebuild 1134
 MD5 a9d1c0a872a683d89c3f78033399dd7c ChangeLog 2031
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
+MD5 d00b68f4d9082ed6fc81dd6232bed73f files/digest-horde-2.2.4 63
diff --git a/net-www/horde/horde-2.2.4.ebuild b/net-www/horde/horde-2.2.4.ebuild
index 9c29f824a591..75545fb7b66b 100644
--- a/net-www/horde/horde-2.2.4.ebuild
+++ b/net-www/horde/horde-2.2.4.ebuild
@@ -1,15 +1,12 @@
 # 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.4.ebuild,v 1.12 2004/01/19 06:35:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde/horde-2.2.4.ebuild,v 1.13 2004/01/27 00:56:42 vapier Exp $
 
-inherit webapp-apache
+inherit horde
 
 DESCRIPTION="Horde Application Framework"
 HOMEPAGE="http://www.horde.org/"
-SRC_URI="http://ftp.horde.org/pub/horde/tarballs/${P}.tar.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=""
@@ -18,46 +15,27 @@ RDEPEND=">=dev-php/mod_php-4.1.0
 	>=dev-libs/libxml2-2.4.21
 	>=net-www/horde-pear-1.1"
 
-webapp-detect || NO_WEBSERVER=1
-
 pkg_setup() {
-	if [ -L ${HTTPD_ROOT}/horde ] ; then
+	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
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
+	horde_pkg_setup
 }
 
 src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/${PN}
-
-	dodoc COPYING README docs/*
-	rm -rf COPYING README docs
-
-	dodir ${destdir}
-	cp -r . ${D}${destdir}
-
-	cd ${D}/${HTTPD_ROOT}
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${PN}
-
-	# Fix permissions
-	find ${D}/${HTTPD_ROOT}/horde/ -type f -exec chmod 0640 {} \;
-	find ${D}/${HTTPD_ROOT}/horde/ -type d -exec chmod 0750 {} \;
-	chmod 0000 ${D}${destdir}/test.php
+	horde_src_install
+	chmod 0000 test.php
 }
 
 pkg_postinst() {
-	einfo "Horde requires PHP to have :"
+	horde_pkg_postinst
+	echo
+	einfo "Horde requires PHP to have:"
 	einfo "    ==> 'short_open_tag enabled = On'"
 	einfo "    ==> 'magic_quotes_runtime set = Off'"
 	einfo "    ==> 'file_uploads enabled = On'"
-	einfo "Please edit /etc/php4/php.ini."
-	einfo ""
-	einfo "Please read /usr/share/doc/${PF}/INSTALL.gz !"
+	einfo "Please edit /etc/php/apache2-php4/php.ini"
 }
diff --git a/net-www/horde/metadata.xml b/net-www/horde/metadata.xml
index 13bc126c7d91..68c78dd23817 100644
--- a/net-www/horde/metadata.xml
+++ b/net-www/horde/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
+<email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>