Revbump. Newer compatibility library and using amavis-new rather than the old virus scanner.

(Portage version: 2.1_pre6-r5)

4 files changed, 244 insertions, 14 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 2ab71a1965f3..ee5f3b9c17cb 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.43 2006/03/21 20:23:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.44 2006/03/21 22:06:11 eradicator Exp $
+
+*squirrelmail-1.4.6-r1 (21 Mar 2006)
+
+  21 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +squirrelmail-1.4.6-r1.ebuild:
+  Revbump. Newer compatibility library and using amavis-new rather than the
+  old virus scanner.
 
   21 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
   -files/squirrelmail-1.4.5-array_shift.patch,
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index eb0cb063836a..b2839f67d977 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -1,12 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 292a2c52f784106be8dd0fa1564a7ffe ChangeLog 14466
-RMD160 9f245782dfe7262df658aa4821c2272e82423149 ChangeLog 14466
-SHA256 6767de3819474e93444a6ed80f34b48aeb2f62accae84bc3477aec8fac33aad8 ChangeLog 14466
+MD5 ecb8443ecd202610227bbe49f82ed78a ChangeLog 14692
+RMD160 e7b2d967821f56788cbc7d0607d05a283af8e893 ChangeLog 14692
+SHA256 d6717bf45550746437fb5209d3f5ea03d609f948c92168f1fc1bf4a60de896ed ChangeLog 14692
 MD5 51898c856a5a6605f95b04d7ae33b8bb files/digest-squirrelmail-1.4.6 2316
 RMD160 397b6bbb73737519ed634a15964f8b62074fdb54 files/digest-squirrelmail-1.4.6 2316
 SHA256 61df34c17f9a5ef184d3c7edb52263986fa60591d174f6f983d359a103d38146 files/digest-squirrelmail-1.4.6 2316
+MD5 23d4caf82b877616e067005d8f409deb files/digest-squirrelmail-1.4.6-r1 2334
+RMD160 a0740d0c8093a63f4564e5bd376bf1a749868c52 files/digest-squirrelmail-1.4.6-r1 2334
+SHA256 975b1c7008b98f057189baf43a0c948838d2f3d1c8cbc05433a21342d6e94882 files/digest-squirrelmail-1.4.6-r1 2334
 MD5 1ebd5ce3ff0ce02fa62f3890b6a8f255 files/ldapuserdata-0.4-gentoo.patch 709
 RMD160 a7b5fe1aba60530c193919ecb6b213cdd57dddf8 files/ldapuserdata-0.4-gentoo.patch 709
 SHA256 bff9cf8e7518df983b03b3f4e7f10fcf31fb75f6d73afb21c8923f2a8312b4a3 files/ldapuserdata-0.4-gentoo.patch 709
@@ -19,13 +19,9 @@ SHA256 4346a850d4972a54d642c8a91e331110b063eb3eb363cd904a6573c2f6e9b16e files/sq
 MD5 08cd5d6f4b8f101029a526ea0a1ea4b1 metadata.xml 258
 RMD160 d2eb817fc980ecb7e48b90373e39e38538ddc060 metadata.xml 258
 SHA256 0c209e720f028e6e9b098d29eab884753668aea3f47b56e44f3271ae60750680 metadata.xml 258
+MD5 1a22036dcf41588d9c87d9ca88296e13 squirrelmail-1.4.6-r1.ebuild 5403
+RMD160 6c726150c7f94363604b5559e13ee66a9c7dd428 squirrelmail-1.4.6-r1.ebuild 5403
+SHA256 ae9ce3e8ade89d1c650fa7b913d160b1e309e5653d7583c043fc2a955b7b7338 squirrelmail-1.4.6-r1.ebuild 5403
 MD5 588992d86d51214c78b2734b356fa800 squirrelmail-1.4.6.ebuild 5473
 RMD160 314f04a3e8627fa7f40366a34757e9052a16d878 squirrelmail-1.4.6.ebuild 5473
 SHA256 5c8739ce5b0f1fe2dde15a6ef961c6f06375d387b60c22838d5fee036747f9eb squirrelmail-1.4.6.ebuild 5473
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEIGDWOpjtAl+gMRURAtulAJ0d+Y10EJ4ODrq1rhA8U765uf/EWQCcCjrJ
-PTdZFq/DYIlBwS0kUXg3+9E=
-=ql1P
------END PGP SIGNATURE-----
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.6-r1 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.6-r1
new file mode 100644
index 000000000000..d7a4c74c40a1
--- /dev/null
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.6-r1
@@ -0,0 +1,27 @@
+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 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 cfc3279a613b917fcba8200c596dadb0 compatibility-2.0.4.tar.gz 18703
+RMD160 f5b272fb1598c28be70e16ed4251eefa57f46f8e compatibility-2.0.4.tar.gz 18703
+SHA256 5aa1bbf871a131eeb3d64e9c89b239231927ebc9aee81a272a31d014ccae667e compatibility-2.0.4.tar.gz 18703
+MD5 88f80922e2a060f5277fd2192404efab gpg.2.0.1-1.4.2.tar.gz 383592
+RMD160 f8e53570494b84d61bb467e1fcb368decb9bbd2a gpg.2.0.1-1.4.2.tar.gz 383592
+SHA256 b4fa8f4112ef8b69d9b79fbc43c8bde3523de5487e1447445deee67b6c66091b gpg.2.0.1-1.4.2.tar.gz 383592
+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 73d2c111579e2fad17c289f62e0be855 secure_login-1.2-1.2.8.tar.gz 6361
+RMD160 e3e35d7acf5f427592915d541ca2aaad79d37b1d secure_login-1.2-1.2.8.tar.gz 6361
+SHA256 b3cf5fbf15206ca9f0e00b573408fc78b287fbb2e0d5fcbba93fe6e75ceb4a0b secure_login-1.2-1.2.8.tar.gz 6361
+MD5 a14a46388ed710a81c356d69276844c1 show_ssl_link-2.1-1.2.8.tar.gz 5950
+RMD160 58f202d7febcde55efdf8a6f312caebf3d4e0d45 show_ssl_link-2.1-1.2.8.tar.gz 5950
+SHA256 a5eb5c1eade9fb6fda5f0f9279a8bb186e9d249cae67a98eaf125845f4d177d2 show_ssl_link-2.1-1.2.8.tar.gz 5950
+MD5 300ddcf66b7907a61b6e9404840e35de squirrelmail-1.4.6.tar.bz2 484099
+RMD160 3cee894b392620af3e35ef1d00e35775559dd4f7 squirrelmail-1.4.6.tar.bz2 484099
+SHA256 8694412708eeb1f4029a4850e69f4a6891b0959e6315572013f4db9d3addc9d3 squirrelmail-1.4.6.tar.bz2 484099
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.6-r1.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..eedff147d11d
--- /dev/null
+++ b/mail-client/squirrelmail/squirrelmail-1.4.6-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.6-r1.ebuild,v 1.1 2006/03/21 22:06:11 eradicator Exp $
+
+IUSE="crypt ldap spell ssl filter mysql postgres"
+
+inherit webapp eutils
+
+DESCRIPTION="Webmail for nuts!"
+
+# Plugin Versions
+COMPATIBILITY_VER=2.0.4
+USERDATA_VER=0.9-1.4.0
+ADMINADD_VER=0.1-1.4.0
+AMAVIS_VER=0.8.0-1.4
+GPG_VER=2.0.1-1.4.2
+LDAP_USERDATA_VER=0.4
+SECURELOGIN_VER=1.2-1.2.8
+SHOWSSL_VER=2.1-1.2.8
+
+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/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 )"
+
+HOMEPAGE="http://www.squirrelmail.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ppc x86"
+
+DEPEND=""
+
+RDEPEND="virtual/php
+	perl-core/DB_File
+	crypt? ( app-crypt/gnupg )
+	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
+
+	cd ${S}
+
+	mv config/config_default.php config/config.php
+	epatch ${FILESDIR}/${PN}-fortune.patch
+
+	# Now do the plugins
+	cd ${S}/plugins
+
+	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.php.sample secure_login/config.php &&
+		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
+		mv show_ssl_link/config.php.sample show_ssl_link/config.php
+}
+
+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}
+
+	# 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
+}