Pull in and check for more things as well as block horde as suggested by Toffanin [WiredTEK] and Benny Pedersen #187420.

Package-Manager: portage-2.1.4_rc12

4 files changed, 48 insertions, 26 deletions

diff --git a/www-apps/horde-turba/Manifest b/www-apps/horde-turba/Manifest
index 517072f0ad5f..4a5ba9cf6f62 100644
--- a/www-apps/horde-turba/Manifest
+++ b/www-apps/horde-turba/Manifest
@@ -12,14 +12,14 @@ EBUILD horde-turba-2.1.4.ebuild 480 RMD160 b88c6fe1b6c7cb5bc49366f802b07c43aa5d6
 MD5 42396c70a7ef27eb181cec522d8154b2 horde-turba-2.1.4.ebuild 480
 RMD160 b88c6fe1b6c7cb5bc49366f802b07c43aa5d6592 horde-turba-2.1.4.ebuild 480
 SHA256 b6a5397168ea6db7b1acc0006309b67e6f9e68f76a7171ec9551cf6992ace411 horde-turba-2.1.4.ebuild 480
-EBUILD horde-turba-2.1.5.ebuild 479 RMD160 0cf7e13a65260264a7e6a88f1ce4d5d912cd53c0 SHA1 cd59486a2dd7bcde3a754ea8a2f67292d740ce88 SHA256 a76809cfcfdb5bacfa3962b538e26d0e3831e129f5329f996338b3aec2f2850c
-MD5 d2ea8ef7cc439fb0a229852ccc216def horde-turba-2.1.5.ebuild 479
-RMD160 0cf7e13a65260264a7e6a88f1ce4d5d912cd53c0 horde-turba-2.1.5.ebuild 479
-SHA256 a76809cfcfdb5bacfa3962b538e26d0e3831e129f5329f996338b3aec2f2850c horde-turba-2.1.5.ebuild 479
-MISC ChangeLog 5010 RMD160 53db4b715a8c9d4d62289bf5a5d65f4eff1b876c SHA1 05338a075c269ef4361b764843bf447e88a0660e SHA256 3979bf3c1f616474c548b42058b59144d5e9d4099cb93f393b528231f7923d93
-MD5 6a8b6efd34c3974a15edaa8ac24d81ee ChangeLog 5010
-RMD160 53db4b715a8c9d4d62289bf5a5d65f4eff1b876c ChangeLog 5010
-SHA256 3979bf3c1f616474c548b42058b59144d5e9d4099cb93f393b528231f7923d93 ChangeLog 5010
+EBUILD horde-turba-2.1.5.ebuild 524 RMD160 ae67decd1195b6c5b40f3a5bc296cc9b928c91dc SHA1 21c831359474daa1e75cb423391c895d3d3337d6 SHA256 8d86d66258dc327d04b5d3b67b829b00aeaa8db647562f9ec4a7f00b98d27e20
+MD5 1a608fb0407bcf3a3690e0b3275eb5f6 horde-turba-2.1.5.ebuild 524
+RMD160 ae67decd1195b6c5b40f3a5bc296cc9b928c91dc horde-turba-2.1.5.ebuild 524
+SHA256 8d86d66258dc327d04b5d3b67b829b00aeaa8db647562f9ec4a7f00b98d27e20 horde-turba-2.1.5.ebuild 524
+MISC ChangeLog 5151 RMD160 798c9e4b2d37653fbc07a375f44154113c0b87e0 SHA1 7af544cb25f3c82a6209393b625f2a5035b95c95 SHA256 91b9e3d84a621d51cacb88f56478663cf2efc7a5d97eb9a31c17d6af1ec14e55
+MD5 6eaa18ff52183007cb97912027b4c555 ChangeLog 5151
+RMD160 798c9e4b2d37653fbc07a375f44154113c0b87e0 ChangeLog 5151
+SHA256 91b9e3d84a621d51cacb88f56478663cf2efc7a5d97eb9a31c17d6af1ec14e55 ChangeLog 5151
 MISC metadata.xml 1156 RMD160 e3c3c5e874de736e614b7820739d97434588a81f SHA1 9f92a7a1d0ddd0f6de6bbffab61e477c7475aa6c SHA256 f21ba74392c9cd17b191d2e8945524f855b206abc8504e833f93798f56bc5616
 MD5 4a52cd771138efea4026da82a803a812 metadata.xml 1156
 RMD160 e3c3c5e874de736e614b7820739d97434588a81f metadata.xml 1156
@@ -36,7 +36,7 @@ SHA256 ee45f42ce5d5b69a67b12cab3b46fed23c57464b7dcb4753cde7d56905cd3ae9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkdttkEACgkQj9hvisErhMLn4QCeN5ePO/yz0oU4EqVdbFf0PR5B
-mbAAoKyF52qNA7UyKNMatb5p+dmPeJie
-=X2gr
+iEYEARECAAYFAkd36KoACgkQj9hvisErhMI/vACgghgcjGjtyBHAsCKE4SeW2rWP
+rAEAn1qqsTfb4VXK6V9VpD7mNFaRtj+m
+=6UhR
 -----END PGP SIGNATURE-----
diff --git a/www-apps/horde-webmail/ChangeLog b/www-apps/horde-webmail/ChangeLog
index 8fe35869d48f..a32fc670bf5b 100644
--- a/www-apps/horde-webmail/ChangeLog
+++ b/www-apps/horde-webmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/horde-webmail
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/ChangeLog,v 1.2 2007/08/01 15:02:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/ChangeLog,v 1.3 2007/12/30 18:47:20 vapier Exp $
+
+  30 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  horde-webmail-1.0.1.ebuild:
+  Pull in and check for more things as well as block horde as suggested by
+  Toffanin [WiredTEK] and Benny Pedersen #187420.
 
 *horde-webmail-1.0.1 (26 Jul 2007)
 
diff --git a/www-apps/horde-webmail/Manifest b/www-apps/horde-webmail/Manifest
index df51a6c9cdee..f9c219fde3e1 100644
--- a/www-apps/horde-webmail/Manifest
+++ b/www-apps/horde-webmail/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST horde-webmail-1.0.1.tar.gz 18117518 RMD160 c5e323ec2bcc6bfc1d85aa6ea7323ffab5058031 SHA1 501b939d4ac17a062244d78be0acaa2919e239db SHA256 61834a050d1cfff440211c0f9892e051aba8b0d8ffc6b5891aba66f1961b5e3f
-EBUILD horde-webmail-1.0.1.ebuild 399 RMD160 fe81bd91b64bb2d73a9f87644b39cad1e7eb3d12 SHA1 85014063dc6d75bc87e1aaf2677221da60adf2ea SHA256 f8c876170f88727edf2598475d594d07fd47cffd97815da4baff0c5a73697fbf
-MD5 b353492c3e9184ddc9dbf9a3118806cc horde-webmail-1.0.1.ebuild 399
-RMD160 fe81bd91b64bb2d73a9f87644b39cad1e7eb3d12 horde-webmail-1.0.1.ebuild 399
-SHA256 f8c876170f88727edf2598475d594d07fd47cffd97815da4baff0c5a73697fbf horde-webmail-1.0.1.ebuild 399
-MISC ChangeLog 382 RMD160 7e7dff0ae11e1221b4917ebdcf1be623c2f1a6ce SHA1 ed57a7b4874af84ffb668f83701212446adbd666 SHA256 ba150de1ba50763bb7c58c9dc6305d69ae82ccf7939148f60ff3b981ba72f36c
-MD5 c7a434e4ae68c28c8bdc822efeda830e ChangeLog 382
-RMD160 7e7dff0ae11e1221b4917ebdcf1be623c2f1a6ce ChangeLog 382
-SHA256 ba150de1ba50763bb7c58c9dc6305d69ae82ccf7939148f60ff3b981ba72f36c ChangeLog 382
+EBUILD horde-webmail-1.0.1.ebuild 814 RMD160 87389b7b439f691d2ab8419244372362c011f6fc SHA1 0355b025e438e201cb0c7f09cead169b663b788f SHA256 1cad5816b6745dee7039822a011c91cad0dafd0cc1f7a90197d825c94a8a22dc
+MD5 437280bf50060a8d68cdfff2f78d95b8 horde-webmail-1.0.1.ebuild 814
+RMD160 87389b7b439f691d2ab8419244372362c011f6fc horde-webmail-1.0.1.ebuild 814
+SHA256 1cad5816b6745dee7039822a011c91cad0dafd0cc1f7a90197d825c94a8a22dc horde-webmail-1.0.1.ebuild 814
+MISC ChangeLog 588 RMD160 52684b8ef826f23feb67c074f55510db351912ca SHA1 b208c4c9a7535deac5eadee53ec89e7063748a0b SHA256 8056b2252e22513aa1489326bd27a934510e145cb539891d6bb05db60ab4cf9d
+MD5 8f8ce1df5a5a9d8855c0037310099da4 ChangeLog 588
+RMD160 52684b8ef826f23feb67c074f55510db351912ca ChangeLog 588
+SHA256 8056b2252e22513aa1489326bd27a934510e145cb539891d6bb05db60ab4cf9d ChangeLog 588
 MISC metadata.xml 222 RMD160 320541c68d392fd67d55ab074a9863806afd7459 SHA1 2a21d508073fa88fb00ab7ffe4c41b9d7c839232 SHA256 ccadeea873dedd97b264c4e4f7c9c60604a6bb88a28cea368cadd644c0262817
 MD5 c8532e9fff10dd851fb682c74d1138a0 metadata.xml 222
 RMD160 320541c68d392fd67d55ab074a9863806afd7459 metadata.xml 222
@@ -18,9 +18,9 @@ MD5 3d4ceb91aa6b4bbe7d9b83d64dce1e2c files/digest-horde-webmail-1.0.1 265
 RMD160 aa9b20550e15eb52054014903f6d6e23d457e749 files/digest-horde-webmail-1.0.1 265
 SHA256 52a2f17ad115e035245f0ba1892e278f34b1169dd12375ed335a45721593fe77 files/digest-horde-webmail-1.0.1 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGsKCtp/wUKkr7RBoRAmkzAJ92ukxisl0afKUt2aWQF0klSbdNAwCgpmXc
-qZR7gHzVaKJnKmOlm3EWB3w=
-=mydU
+iEYEARECAAYFAkd3574ACgkQj9hvisErhMJS4QCgj4UqNirrpXGxKBMmoJd0rN7p
+sVEAn1BSL5HXtQe4WRpafJGq4EbuR/LI
+=pr5y
 -----END PGP SIGNATURE-----
diff --git a/www-apps/horde-webmail/horde-webmail-1.0.1.ebuild b/www-apps/horde-webmail/horde-webmail-1.0.1.ebuild
index f61b98983c64..661cec01be87 100644
--- a/www-apps/horde-webmail/horde-webmail-1.0.1.ebuild
+++ b/www-apps/horde-webmail/horde-webmail-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1.ebuild,v 1.1 2007/07/26 05:07:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horde-webmail/horde-webmail-1.0.1.ebuild,v 1.2 2007/12/30 18:47:20 vapier Exp $
 
 HORDE_PN=${PN}
 inherit horde
@@ -8,6 +8,23 @@ 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-3"
+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
+}