Version bumped.

8 files changed, 98 insertions, 16 deletions

diff --git a/net-www/horde-imp/ChangeLog b/net-www/horde-imp/ChangeLog
index 5e87501adb81..8fe2b0b9b3c0 100644
--- a/net-www/horde-imp/ChangeLog
+++ b/net-www/horde-imp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2003/04/08 21:43:01 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/ChangeLog,v 1.11 2003/09/11 19:13:37 mholzer Exp $
+
+*horde-imp-3.2.2 (11 Sep 2003)
+
+  11 Sep 2003; Martin Holzer <mholzer@gentoo.org> horde-imp-3.1.ebuild,
+  horde-imp-3.2.1.ebuild, horde-imp-3.2.2.ebuild, horde-imp-3.2.ebuild:
+  Version bumped.
 
 *horde-imp-3.2.1 (08 Apr 2003)
   08 Apr 2003; Dean Bailey <alron@gentoo.org> horde-imp-3.2.1 :
diff --git a/net-www/horde-imp/Manifest b/net-www/horde-imp/Manifest
index aabc3f1191d3..323f78d132f1 100644
--- a/net-www/horde-imp/Manifest
+++ b/net-www/horde-imp/Manifest
@@ -1,8 +1,8 @@
-MD5 a37ef09aeada32607dbea0902d9f3de3 ChangeLog 1522
-MD5 1342453b42288ffcede0a8aa19b637ce horde-imp-3.1.ebuild 2376
-MD5 76a0af4c11c4377c007169941f85c509 horde-imp-3.2.1.ebuild 1877
-MD5 6450446bdd7e01938c1b33c4cd70de87 horde-imp-3.2.ebuild 2540
-MD5 f78fa458d3a8c065f56f79d36766e92e horde-imp-3.2.2.ebuild 1877
+MD5 51e1d29dc269899c706d823bc1c9b830 ChangeLog 1719
+MD5 b923d0ffd17ba2650f0b87978ebef46b horde-imp-3.1.ebuild 2375
+MD5 b84d36dd72ea979fdbebbee29a5439ba horde-imp-3.2.1.ebuild 1876
+MD5 65f03fb45a235eb940fdf9b3ed781a2f horde-imp-3.2.ebuild 2539
+MD5 ac84d01036dfe8de00e7772ff7e95d09 horde-imp-3.2.2.ebuild 1876
 MD5 b46592cbb457b086f8a7028101446355 files/digest-horde-imp-3.1 60
 MD5 fbcc7aba9696f0f62a57c1da73ed2adf files/digest-horde-imp-3.2 60
 MD5 ed9183a28cb927048e4638b39f7b4718 files/digest-horde-imp-3.2.1 62
diff --git a/net-www/horde-imp/files/digest-horde-imp-3.1 b/net-www/horde-imp/files/digest-horde-imp-3.1
index 19a9112c3ac9..aaac192ead8c 100644
--- a/net-www/horde-imp/files/digest-horde-imp-3.1
+++ b/net-www/horde-imp/files/digest-horde-imp-3.1
@@ -1 +1 @@
-MD5 73ff42a32e3ee3617fd411be356cb70f  imp-3.1.tar.gz 1027446
+MD5 73ff42a32e3ee3617fd411be356cb70f imp-3.1.tar.gz 1027446
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
new file mode 100644
index 000000000000..1aa7a2eca15e
--- /dev/null
+++ b/net-www/horde-imp/files/digest-horde-imp-3.2.2
@@ -0,0 +1 @@
+MD5 757e4d3b6b1b7137712ed4c4a358e822 imp-3.2.2.tar.gz 1489544
diff --git a/net-www/horde-imp/horde-imp-3.1.ebuild b/net-www/horde-imp/horde-imp-3.1.ebuild
index 8ece88cbdeaf..b255bb264de2 100644
--- a/net-www/horde-imp/horde-imp-3.1.ebuild
+++ b/net-www/horde-imp/horde-imp-3.1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2003 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.1.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/horde-imp-3.1.ebuild,v 1.6 2003/09/11 19:13:37 mholzer Exp $
 
 DESCRIPTION="IMP provides webmail access"
 HOMEPAGE="http://www.horde.org"
-P=imp-3.1
-SRC_URI="ftp://ftp.horde.org/pub/imp/tarballs/${P}.tar.gz"
+MY_P=${P/horde-/}
+SRC_URI="ftp://ftp.horde.org/pub/imp/tarballs/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND=""
 RDEPEND=">=net-www/horde-2.1"
+S=${WORKDIR}/${MY_P}
 
 find_http_root() {
 	export HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
diff --git a/net-www/horde-imp/horde-imp-3.2.1.ebuild b/net-www/horde-imp/horde-imp-3.2.1.ebuild
index e793946d98d7..bd6220dcd0b0 100644
--- a/net-www/horde-imp/horde-imp-3.2.1.ebuild
+++ b/net-www/horde-imp/horde-imp-3.2.1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2003 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.1.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/horde-imp-3.2.1.ebuild,v 1.3 2003/09/11 19:13:37 mholzer Exp $
 
 DESCRIPTION="IMP ${PV} provides webmail access"
 HOMEPAGE="http://www.horde.org"
-P=imp-3.2.1
-SRC_URI="ftp://ftp.horde.org/pub/imp/tarballs/imp-3.2.1.tar.gz"
+MY_P=${P/horde-/}
+SRC_URI="ftp://ftp.horde.org/pub/imp/tarballs/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.1"
+S=${WORKDIR}/${MY_P}
 
 find_http_root() {
 	export HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
diff --git a/net-www/horde-imp/horde-imp-3.2.2.ebuild b/net-www/horde-imp/horde-imp-3.2.2.ebuild
new file mode 100644
index 000000000000..4573c470f3e8
--- /dev/null
+++ b/net-www/horde-imp/horde-imp-3.2.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2003 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.1 2003/09/11 19:13:37 mholzer Exp $
+
+DESCRIPTION="IMP ${PV} provides webmail access"
+HOMEPAGE="http://www.horde.org"
+MY_P=${P/horde-/}
+SRC_URI="ftp://ftp.horde.org/pub/imp/tarballs/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+DEPEND=""
+RDEPEND=">=net-www/horde-2.2.4"
+S=${WORKDIR}/${MY_P}
+
+find_http_root() {
+	export HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
+
+	if [ -z "${HTTPD_ROOT}" ]; then
+		eerror "HTTPD_ROOT is null! Using defaults."
+		eerror "You probably want to check /etc/passwd"
+		HTTPD_ROOT="/home/httpd/htdocs"
+	fi
+
+	export REGISTRY=${HTTPD_ROOT}/horde/config/registry.php
+	[ -f ${REGISTRY} ] || REGISTRY=${HTTPD_ROOT}/horde/config/registry.php.dist
+}
+
+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
+	find_http_root
+	[ -f ${REGISTRY} ] || die "${REGISTRY} not found"
+}
+
+src_compile() {
+	 echo "Nothing to compile"
+}
+
+src_install () {
+
+	# detecting apache usergroup
+	# FIXME: With time, apache's GID should be static
+	GID=`grep apache /etc/group |cut -d: -f3`
+	if [ -z "${GID}" ]; then
+		einfo "Using default GID of 81 for Apache"
+		GID=81
+	fi
+
+	find_http_root
+
+	dodir ${HTTPD_ROOT}/horde/imp
+	cp -r . ${D}/${HTTPD_ROOT}/horde/imp
+
+	# protecting files
+	chown -R root.${GID} ${D}/${HTTPD_ROOT}/horde/imp
+	find ${D}/${HTTPD_ROOT}/horde/imp/ -type f -exec chmod 0640 {} \;
+	find ${D}/${HTTPD_ROOT}/horde/imp/ -type d -exec chmod 0750 {} \;
+}
+
+pkg_postinst() {
+
+	find_http_root
+
+	einfo "Please read ${HTTPD_ROOT}/horde/imp/docs/INSTALL !"
+}
diff --git a/net-www/horde-imp/horde-imp-3.2.ebuild b/net-www/horde-imp/horde-imp-3.2.ebuild
index e0e114e33dc1..118ad827d57c 100644
--- a/net-www/horde-imp/horde-imp-3.2.ebuild
+++ b/net-www/horde-imp/horde-imp-3.2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2003 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.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/horde-imp-3.2.ebuild,v 1.3 2003/09/11 19:13:37 mholzer Exp $
 
 DESCRIPTION="IMP ${PV} provides webmail access"
 HOMEPAGE="http://www.horde.org"
-P=imp-3.2
-SRC_URI="ftp://ftp.horde.org/pub/imp/tarballs/imp-3.2.tar.gz"
+MY_P=${P/horde-/}
+SRC_URI="ftp://ftp.horde.org/pub/imp/tarballs/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND=""
 RDEPEND=">=net-www/horde-2.1"
+S=${WORKDIR}/${MY_P}
 
 find_http_root() {
 	export HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs