Removing gpg plugin because it is broken. See bug #202406.

(Portage version: 2.1.4_rc11)

7 files changed, 14 insertions, 288 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 09310a778c4d..dbae3e40533b 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.109 2008/01/10 17:06:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.110 2008/01/12 02:40:39 eradicator Exp $
+
+*squirrelmail-1.5.1-r7 (12 Jan 2008)
+*squirrelmail-1.4.13-r1 (12 Jan 2008)
+
+  12 Jan 2008; Jeremy Huddleston <eradicator@gentoo.org>
+  -squirrelmail-1.4.11.ebuild, -squirrelmail-1.4.13.ebuild,
+  +squirrelmail-1.4.13-r1.ebuild, -squirrelmail-1.5.1-r6.ebuild,
+  +squirrelmail-1.5.1-r7.ebuild:
+  Removing gpg plugin because it is broken.  See bug #202406.
 
   10 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org>
   squirrelmail-1.4.10a-r2.ebuild, squirrelmail-1.4.11.ebuild,
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.11 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.11
deleted file mode 100644
index accc6907cda6..000000000000
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.11
+++ /dev/null
@@ -1,33 +0,0 @@
-MD5 c321d0f7efa624f6bc3f3a4d1bf08782 admin_add.0.1-1.4.0.tar.gz 2388
-RMD160 6847934c59ae73119a796c6fef251de26a2ea531 admin_add.0.1-1.4.0.tar.gz 2388
-SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc admin_add.0.1-1.4.0.tar.gz 2388
-MD5 eaa0e8835b8d7d451500aad907c22e24 all_locales-1.4.9-20070106.tar.bz2 2699569
-RMD160 9da0e3df1bc5a89b861f7dd9ac244a3885a45417 all_locales-1.4.9-20070106.tar.bz2 2699569
-SHA256 04ad3e37042deb8c5668946c3364cd53d9c30b2486f24deee4d71c05fa584423 all_locales-1.4.9-20070106.tar.bz2 2699569
-MD5 4766f5f6706e086d5c9370bef9e7629f amavisnewsql-0.8.0-1.4.tar.gz 101008
-RMD160 72b796565f128354c51e8a04384e49621371cf16 amavisnewsql-0.8.0-1.4.tar.gz 101008
-SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c amavisnewsql-0.8.0-1.4.tar.gz 101008
-MD5 53e89f4ad52a93909a8c7d66ba5b2b1b compatibility-2.0.9-1.0.tar.gz 31763
-RMD160 8c0d18b0f0ffab3b2cddcf943dfcbccffc0b16ee compatibility-2.0.9-1.0.tar.gz 31763
-SHA256 49c8dce4ee257fb36a97396c7cdd445d2b862659dc76c17048d96d2634d64019 compatibility-2.0.9-1.0.tar.gz 31763
-MD5 1e422dd77d455f8b1d07a66dc7d8aaed gpg-2.1.tar.gz 539562
-RMD160 aeecb1ae1d2021677c19923532e94f9d81794c57 gpg-2.1.tar.gz 539562
-SHA256 639aef199f9ccd96817f8c04b5d130f1206e5181204915923ee3d0d420459573 gpg-2.1.tar.gz 539562
-MD5 c836661e8360358b94df4e153e449b2c ldapuserdata-0.4.tar.gz 67439
-RMD160 6f7fa3eab6eb2877057fc4d9d360da2e10858ba6 ldapuserdata-0.4.tar.gz 67439
-SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 ldapuserdata-0.4.tar.gz 67439
-MD5 dfe469f7ab473fd2292b30800e3141d5 retrieveuserdata.0.9-1.4.0.tar.gz 10448
-RMD160 942d073f86947295ed069ed04e4fc268857932af retrieveuserdata.0.9-1.4.0.tar.gz 10448
-SHA256 086796d858e781c518b538b37e9ec011d51a2aebd6d14aeba1aa330b58626b8d retrieveuserdata.0.9-1.4.0.tar.gz 10448
-MD5 3dcd0c5bca4053621226ba7df955e51f secure_login-1.3-1.2.8.tar.gz 16075
-RMD160 1c8ef7f0f02846f59c9088f4703748d99bcd4c77 secure_login-1.3-1.2.8.tar.gz 16075
-SHA256 0c44112114e1d3f2b8615b5b586631fb50fb1877037a438c37f4b890f46b0ccc secure_login-1.3-1.2.8.tar.gz 16075
-MD5 83b7abc3e903209802a772a4da1b7879 show_ssl_link-2.2-1.2.8.tar.gz 13193
-RMD160 8e0669c674453cab31b0493ab1404e0a0097ad8d show_ssl_link-2.2-1.2.8.tar.gz 13193
-SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a show_ssl_link-2.2-1.2.8.tar.gz 13193
-MD5 486fb27a6ab306088603163160dbc8ca squirrelmail-1.4.11.tar.bz2 496370
-RMD160 c43f8f35665d4c40eb0fbcd40a2a52f3b881e334 squirrelmail-1.4.11.tar.bz2 496370
-SHA256 7c187933dd76fd0a13544851b17db12a9875f5d5eb2e2d6d16528b442fc20bb6 squirrelmail-1.4.11.tar.bz2 496370
-MD5 2b5d60f3845ef1cc51e5076cdf3994ae squirrelmail-decode-1.2.tar.bz2 333942
-RMD160 a217662f923a7e2129e293c6bf806dd0c21dab0b squirrelmail-decode-1.2.tar.bz2 333942
-SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26 squirrelmail-decode-1.2.tar.bz2 333942
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.13 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.13-r1
index 90f9cf2957cd..6223dae42d99 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.13
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.13-r1
@@ -10,9 +10,6 @@ SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c amavisne
 MD5 53e89f4ad52a93909a8c7d66ba5b2b1b compatibility-2.0.9-1.0.tar.gz 31763
 RMD160 8c0d18b0f0ffab3b2cddcf943dfcbccffc0b16ee compatibility-2.0.9-1.0.tar.gz 31763
 SHA256 49c8dce4ee257fb36a97396c7cdd445d2b862659dc76c17048d96d2634d64019 compatibility-2.0.9-1.0.tar.gz 31763
-MD5 1e422dd77d455f8b1d07a66dc7d8aaed gpg-2.1.tar.gz 539562
-RMD160 aeecb1ae1d2021677c19923532e94f9d81794c57 gpg-2.1.tar.gz 539562
-SHA256 639aef199f9ccd96817f8c04b5d130f1206e5181204915923ee3d0d420459573 gpg-2.1.tar.gz 539562
 MD5 c836661e8360358b94df4e153e449b2c ldapuserdata-0.4.tar.gz 67439
 RMD160 6f7fa3eab6eb2877057fc4d9d360da2e10858ba6 ldapuserdata-0.4.tar.gz 67439
 SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 ldapuserdata-0.4.tar.gz 67439
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r6 b/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r7
index 13f6696ee3bc..e71416f7fccb 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r6
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r7
@@ -10,9 +10,6 @@ SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c amavisne
 MD5 b7a19451b104480fc01f75f39d056cd0 compatibility-2.0.8-1.0.tar.gz 32254
 RMD160 14060c2f6a1d7f2fafc753a57a52d9dc0a333472 compatibility-2.0.8-1.0.tar.gz 32254
 SHA256 d3cde09dee0470091d651fdc907f80ff16f3189482beed822e421f2b3283d4f6 compatibility-2.0.8-1.0.tar.gz 32254
-MD5 1e422dd77d455f8b1d07a66dc7d8aaed gpg-2.1.tar.gz 539562
-RMD160 aeecb1ae1d2021677c19923532e94f9d81794c57 gpg-2.1.tar.gz 539562
-SHA256 639aef199f9ccd96817f8c04b5d130f1206e5181204915923ee3d0d420459573 gpg-2.1.tar.gz 539562
 MD5 c836661e8360358b94df4e153e449b2c ldapuserdata-0.4.tar.gz 67439
 RMD160 6f7fa3eab6eb2877057fc4d9d360da2e10858ba6 ldapuserdata-0.4.tar.gz 67439
 SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 ldapuserdata-0.4.tar.gz 67439
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.11.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.11.ebuild
deleted file mode 100644
index 3df32aa9aace..000000000000
--- a/mail-client/squirrelmail/squirrelmail-1.4.11.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.11.ebuild,v 1.2 2008/01/10 17:06:36 alonbl Exp $
-
-IUSE="crypt ldap spell ssl filter mysql postgres nls"
-
-inherit webapp eutils
-
-DESCRIPTION="Webmail for nuts!"
-
-# Plugin Versions
-COMPATIBILITY_VER=2.0.9-1.0
-USERDATA_VER=0.9-1.4.0
-ADMINADD_VER=0.1-1.4.0
-AMAVIS_VER=0.8.0-1.4
-GPG_VER=2.1
-LDAP_USERDATA_VER=0.4
-SECURELOGIN_VER=1.3-1.2.8
-SHOWSSL_VER=2.2-1.2.8
-LOCALES_VER=1.4.9-20070106
-DECODING_VER=1.2
-
-MY_P=${P/_rc/-RC}
-S="${WORKDIR}/${MY_P}"
-
-PLUGINS_LOC="http://www.squirrelmail.org/plugins"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
-	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
-	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
-	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
-	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
-	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
-	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	crypt? ( ${PLUGINS_LOC}/gpg-${GPG_VER}.tar.gz )
-	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
-	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
-
-HOMEPAGE="http://www.squirrelmail.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=""
-
-RDEPEND="virtual/php
-	virtual/perl-DB_File
-	crypt? ( =app-crypt/gnupg-1.4* )
-	ldap? ( net-nds/openldap )
-	spell? ( || ( app-text/aspell app-text/ispell ) )
-	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
-	postgres? ( dev-php/PEAR-DB )
-	mysql? ( dev-php/PEAR-DB )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
-
-	cd ${S}
-
-	mv config/config_default.php config/config.php
-
-	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" config/config.php
-
-	# Now do the plugins
-	cd ${S}/plugins
-
-	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
-
-	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
-
-	unpack admin_add.${ADMINADD_VER}.tar.gz
-
-	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
-
-	use filter &&
-		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
-		mv amavisnewsql/config.php.dist amavisnewsql/config.php
-
-	use crypt &&
-		unpack gpg-${GPG_VER}.tar.gz
-
-	use ldap &&
-		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
-		epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
-		mv ldapuserdata/config_sample.php ldapuserdata/config.php
-
-	use ssl &&
-		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
-		mv secure_login/config.sample.php secure_login/config.php &&
-		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
-		mv show_ssl_link/config.php.sample show_ssl_link/config.php
-
-	use nls &&
-		cd ${S} &&
-		unpack all_locales-${LOCALES_VER}.tar.bz2
-
-	cd ${S}
-	use crypt && epatch ${FILESDIR}/squirrelmail-gpg-2.1-CVE-2005-1924.patch
-}
-
-src_compile() {
-	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	for doc in AUTHORS COPYING ChangeLog INSTALL README ReleaseNotes UPGRADE; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto compatibility
-	for doc in plugins/compatibility/INSTALL plugins/compatibility/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto admin_add
-	for doc in plugins/admin_add/README; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	docinto retrieveuserdata
-	for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
-		dodoc ${doc}
-		rm -f ${doc}
-	done
-
-	if use filter; then
-		docinto amavisnewsql
-		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use crypt; then
-		docinto gpg
-		for doc in plugins/gpg/README plugins/gpg/README.txt plugins/gpg/INSTALL plugins/gpg/INSTALL.txt plugins/gpg/TODO; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ldap; then
-		rm plugins/ldapuserdata/README
-		docinto ldapuserdata
-		for doc in plugins/ldapuserdata/doc/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	if use ssl; then
-		docinto secure_login
-		for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-
-		docinto show_ssl_link
-		for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
-	# Copy the app's main files
-	einfo "Installing squirrelmail files."
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	cp ${WORKDIR}/squirrelmail-decode-${DECODING_VER}/*/*.php ${D}${MY_HTDOCSDIR}/functions/decode
-
-	# Identify the configuration files that this app uses
-	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
-	use filter && configs="${configs} plugins/amavisnewsql/config.php"
-	use crypt && configs="${configs} plugins/gpg/gpg_local_prefs.txt"
-	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
-	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
-
-	for file in ${configs}; do
-		webapp_configfile ${MY_HTDOCSDIR}/${file}
-	done
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for phpmyadmin, we *assume* that all .php files that don't end in
-	# .inc.php need to have CGI/BIN support added
-
-	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
-	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	#done
-
-	local server_owned="data index.php"
-	for file in ${server_owned}; do
-		webapp_serverowned ${MY_HTDOCSDIR}/${file}
-	done
-
-	# add the post-installation instructions
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-}
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.13.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild
index b2f30cd7b188..58f8b1a4ae32 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.13.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13.ebuild,v 1.2 2008/01/10 17:06:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.13-r1.ebuild,v 1.1 2008/01/12 02:40:39 eradicator Exp $
 
-IUSE="crypt ldap spell ssl filter mysql postgres nls"
+IUSE="ldap spell ssl filter mysql postgres nls"
 
 inherit webapp eutils
 
@@ -13,7 +13,6 @@ COMPATIBILITY_VER=2.0.9-1.0
 USERDATA_VER=0.9-1.4.0
 ADMINADD_VER=0.1-1.4.0
 AMAVIS_VER=0.8.0-1.4
-GPG_VER=2.1
 LDAP_USERDATA_VER=0.4
 SECURELOGIN_VER=1.3-1.2.8
 SHOWSSL_VER=2.2-1.2.8
@@ -32,7 +31,6 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
 	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
 	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	crypt? ( ${PLUGINS_LOC}/gpg-${GPG_VER}.tar.gz )
 	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
 	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
 
@@ -45,7 +43,6 @@ DEPEND=""
 
 RDEPEND="virtual/php
 	virtual/perl-DB_File
-	crypt? ( =app-crypt/gnupg-1.4* )
 	ldap? ( net-nds/openldap )
 	spell? ( || ( app-text/aspell app-text/ispell ) )
 	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
@@ -77,9 +74,6 @@ src_unpack() {
 		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
 		mv amavisnewsql/config.php.dist amavisnewsql/config.php
 
-	use crypt &&
-		unpack gpg-${GPG_VER}.tar.gz
-
 	use ldap &&
 		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
 		epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
@@ -94,9 +88,6 @@ src_unpack() {
 	use nls &&
 		cd ${S} &&
 		unpack all_locales-${LOCALES_VER}.tar.bz2
-
-	cd ${S}
-	use crypt && epatch ${FILESDIR}/squirrelmail-gpg-2.1-CVE-2005-1924.patch
 }
 
 src_compile() {
@@ -143,14 +134,6 @@ src_install() {
 		done
 	fi
 
-	if use crypt; then
-		docinto gpg
-		for doc in plugins/gpg/README plugins/gpg/README.txt plugins/gpg/INSTALL plugins/gpg/INSTALL.txt plugins/gpg/TODO; do
-			dodoc ${doc}
-			rm -f ${doc}
-		done
-	fi
-
 	if use ldap; then
 		rm plugins/ldapuserdata/README
 		docinto ldapuserdata
@@ -183,7 +166,6 @@ src_install() {
 	# Identify the configuration files that this app uses
 	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
 	use filter && configs="${configs} plugins/amavisnewsql/config.php"
-	use crypt && configs="${configs} plugins/gpg/gpg_local_prefs.txt"
 	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
 	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
 
diff --git a/mail-client/squirrelmail/squirrelmail-1.5.1-r6.ebuild b/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild
index c476cf4947ea..4048bc394e85 100644
--- a/mail-client/squirrelmail/squirrelmail-1.5.1-r6.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r6.ebuild,v 1.6 2008/01/10 17:06:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r7.ebuild,v 1.1 2008/01/12 02:40:39 eradicator Exp $
 
-IUSE="crypt ldap spell ssl filter mysql postgres nls"
+IUSE="ldap spell ssl filter mysql postgres nls"
 
 inherit webapp eutils
 
@@ -13,7 +13,6 @@ COMPATIBILITY_VER=2.0.8-1.0
 USERDATA_VER=0.9-1.4.0
 ADMINADD_VER=0.1-1.4.0
 AMAVIS_VER=0.8.0-1.4
-GPG_VER=2.1
 LDAP_USERDATA_VER=0.4
 SECURELOGIN_VER=1.3-1.2.8
 SHOWSSL_VER=2.2-1.2.8
@@ -32,7 +31,6 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
 	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
 	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
-	crypt? ( ${PLUGINS_LOC}/gpg-${GPG_VER}.tar.gz )
 	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
 	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
 
@@ -45,7 +43,6 @@ DEPEND=""
 
 RDEPEND="virtual/php
 	virtual/perl-DB_File
-	crypt? ( =app-crypt/gnupg-1.4* )
 	ldap? ( net-nds/openldap )
 	spell? ( || ( app-text/aspell app-text/ispell ) )
 	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
@@ -95,9 +92,6 @@ src_unpack() {
 		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
 		mv amavisnewsql/config.php.dist amavisnewsql/config.php
 
-	use crypt &&
-		unpack gpg-${GPG_VER}.tar.gz
-
 	use ldap &&
 		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz &&
 		epatch ${FILESDIR}/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch &&
@@ -112,9 +106,6 @@ src_unpack() {
 	use nls &&
 		cd ${S} &&
 		unpack all_locales-${LOCALES_VER}.tar.bz2
-
-	cd ${S}
-	use crypt && epatch ${FILESDIR}/squirrelmail-gpg-2.1-CVE-2005-1924.patch
 }
 
 src_compile() {