Non-maintainer commit: Version bump for security bug 285052. Removing

vulnerable versions. Adding USE condition on the patch in SRC_URI. Fixing
homepage, closes bug 257694.
(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 15 insertions, 80 deletions

diff --git a/www-apps/horde-webmail/ChangeLog b/www-apps/horde-webmail/ChangeLog
index bd6b3eb39513..11a3eb0bbf8e 100644
--- a/www-apps/horde-webmail/ChangeLog
+++ b/www-apps/horde-webmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/horde-webmail
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/ChangeLog,v 1.17 2008/10/30 14:38:40 wrobel Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/ChangeLog,v 1.18 2009/09/16 15:00:44 a3li Exp $
+
+*horde-webmail-1.2.4 (16 Sep 2009)
+
+  16 Sep 2009; Alex Legler <a3li@gentoo.org> -horde-webmail-1.0.8.ebuild,
+  -horde-webmail-1.1.3.ebuild, -horde-webmail-1.2.ebuild,
+  +horde-webmail-1.2.4.ebuild:
+  Non-maintainer commit: Version bump for security bug 285052. Removing
+  vulnerable versions. Adding USE condition on the patch in SRC_URI. Fixing
+  homepage, closes bug 257694.
 
 *horde-webmail-1.2 (30 Oct 2008)
 
diff --git a/www-apps/horde-webmail/horde-webmail-1.0.8.ebuild b/www-apps/horde-webmail/horde-webmail-1.0.8.ebuild
deleted file mode 100644
index 6d14b4b01969..000000000000
--- a/www-apps/horde-webmail/horde-webmail-1.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/horde-webmail-1.0.8.ebuild,v 1.1 2008/09/15 14:03:41 wrobel Exp $
-
-HORDE_PN=${PN}
-
-HORDE_APPLICATIONS="dimp imp ingo kronolith mimp mnemo nag turba"
-
-inherit horde
-
-DESCRIPTION="browser based communication suite"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="crypt mysql postgres ldap oracle"
-
-DEPEND=""
-RDEPEND="!www-apps/horde
-	crypt? ( app-crypt/gnupg )
-	virtual/php
-	>=www-apps/horde-pear-1.3
-	dev-php/PEAR-Log
-	dev-php/PEAR-Mail_Mime
-	dev-php/PEAR-DB"
-
-pkg_setup() {
-	HORDE_PHP_FEATURES="
-		imap ssl session xml nls iconv gd ftp
-		$(use ldap && echo ldap) $(use oracle && echo oci8)
-		$(use crypt && echo crypt) $(use mysql && echo mysql mysqli)
-		$(use postgres && echo postgres)
-	"
-	horde_pkg_setup
-}
diff --git a/www-apps/horde-webmail/horde-webmail-1.1.3.ebuild b/www-apps/horde-webmail/horde-webmail-1.1.3.ebuild
deleted file mode 100644
index a5b36a494201..000000000000
--- a/www-apps/horde-webmail/horde-webmail-1.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/horde-webmail-1.1.3.ebuild,v 1.1 2008/09/15 14:03:41 wrobel Exp $
-
-HORDE_PN=${PN}
-
-HORDE_APPLICATIONS="dimp imp ingo kronolith mimp mnemo nag turba"
-
-inherit horde
-
-DESCRIPTION="browser based communication suite"
-
-HORDE_PATCHSET_REV=2
-
-SRC_URI="${SRC_URI}
-	http://files.pardus.de/horde-webmail-patches-${PV}-r${HORDE_PATCHSET_REV}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="crypt mysql postgres ldap oracle kolab"
-
-DEPEND=""
-RDEPEND="!www-apps/horde
-	crypt? ( app-crypt/gnupg )
-	virtual/php
-	>=www-apps/horde-pear-1.3
-	dev-php/PEAR-Log
-	dev-php/PEAR-Mail_Mime
-	dev-php/PEAR-DB"
-
-EHORDE_PATCHES="$(use kolab && echo ${WORKDIR}/horde-webmail-kolab.patch)"
-HORDE_RECONFIG="$(use kolab && echo ${FILESDIR}/reconfig.kolab)"
-HORDE_POSTINST="$(use kolab && echo ${FILESDIR}/postinstall-en.txt.kolab)"
-
-pkg_setup() {
-	HORDE_PHP_FEATURES="
-		imap ssl session xml nls iconv gd ftp
-		$(use ldap && echo ldap) $(use oracle && echo oci8)
-		$(use crypt && echo crypt) $(use mysql && echo mysql mysqli)
-		$(use postgres && echo postgres) $(use kolab && echo kolab sqlite)
-	"
-	horde_pkg_setup
-}
diff --git a/www-apps/horde-webmail/horde-webmail-1.2.ebuild b/www-apps/horde-webmail/horde-webmail-1.2.4.ebuild
index ed346783214c..6ab1f065af0e 100644
--- a/www-apps/horde-webmail/horde-webmail-1.2.ebuild
+++ b/www-apps/horde-webmail/horde-webmail-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/horde-webmail-1.2.ebuild,v 1.1 2008/10/30 14:38:40 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/horde-webmail-1.2.4.ebuild,v 1.1 2009/09/16 15:00:44 a3li Exp $
 
 HORDE_PN=${PN}
 
@@ -9,11 +9,12 @@ HORDE_APPLICATIONS="dimp imp ingo kronolith mimp mnemo nag turba"
 inherit horde
 
 DESCRIPTION="browser based communication suite"
+HOMEPAGE="http://www.horde.org/webmail/"
 
 HORDE_PATCHSET_REV=1
 
 SRC_URI="${SRC_URI}
-	http://files.pardus.de/horde-webmail-patches-${PV}-r${HORDE_PATCHSET_REV}.tar.bz2"
+	kolab? ( http://files.pardus.de/horde-webmail-patches-1.2-r${HORDE_PATCHSET_REV}.tar.bz2 )"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="crypt mysql postgres ldap oracle kolab"