version bump

Package-Manager: portage-2.1.10.5/cvs/Linux x86_64

3 files changed, 227 insertions, 15 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 26c264826a9a..c0a20d51736f 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.159 2011/06/13 18:15:49 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.160 2011/07/13 18:50:27 eras Exp $
+
+*squirrelmail-1.4.22 (13 Jul 2011)
+
+  13 Jul 2011; Eray Aslan <eras@gentoo.org> +squirrelmail-1.4.22.ebuild:
+  version bump
 
   13 Jun 2011; Eray Aslan <eras@gentoo.org> -squirrelmail-1.4.19.ebuild,
   -squirrelmail-1.4.20.ebuild:
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index 011678d27d8b..172bf54ca456 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -13,23 +13,25 @@ DIST secure_login-1.4-1.2.8.tar.gz 16993 RMD160 879f9e735434871f265e6039c3880419
 DIST show_ssl_link-2.2-1.2.8.tar.gz 13193 RMD160 8e0669c674453cab31b0493ab1404e0a0097ad8d SHA1 39073e417ce28080f9206d068cbfa4161284be3e SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a
 DIST squirrelmail-1.4.21.tar.bz2 526813 RMD160 f4eeb97d85c76a037e848217d06aa13a15bfac04 SHA1 8a125ceca939fd4dd957491d17263b1857ddff60 SHA256 09f3a6c6e80f28a8a97a19d6653e0a52e4ca2a1dc2a692c1e7013f0ad218cc38
 DIST squirrelmail-decode-1.2.tar.bz2 333942 RMD160 a217662f923a7e2129e293c6bf806dd0c21dab0b SHA1 90439c4644fd99b7ca4208b441ee0a2c2efa2308 SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26
+DIST squirrelmail-webmail-1.4.22.tar.bz2 531360 RMD160 08c2aff84a3750dc6f0704a0105bc42a74966eb0 SHA1 46819275be27e9119e9a2fd976d441cee261ea55 SHA256 2231578d0f9abeae52bc4e461a6773d78762f20a27e1e2fbebc1a11ccd1af877
 EBUILD squirrelmail-1.4.21.ebuild 5605 RMD160 378b4facfaddd73e1eb12ce61e174885e1c4fbb9 SHA1 95a2e99f0a620ab5272cde358408e1f7ffb84133 SHA256 3ae593cc2f524e43cf1205ca0e4685c4e5ec1f026a9a0f096a91fb80e96299ba
-MISC ChangeLog 32029 RMD160 2de8641325190e38b53e055cc14df30924f018de SHA1 0fac04070832471f7cbe1434b7dee18b819cdcbd SHA256 ad80779505394d08f6df645adad5e775239bddb8a04643d40833aa5eaa200a3b
+EBUILD squirrelmail-1.4.22.ebuild 5665 RMD160 7e8aa07de94055e729ef43209d71331d6bc039af SHA1 75746e93da11bb4800cb435bed357e8ef03251f3 SHA256 2dc22fc954e209bd2d9eebea23f87315eb36b4c89e12c17f84c5db93b8928321
+MISC ChangeLog 32154 RMD160 6b1c84a6efdb4346ef70364c97cac3f5390d227e SHA1 27f8cc73a1905fb6d15f3f8d230e2a7912dfdd40 SHA256 b344dd0ac055449adef0c1540d22911afd35988b186b841b125d650840383e72
 MISC metadata.xml 256 RMD160 1d17a8ea7a1b4d83b151287d3c55481493c2a820 SHA1 6e17c2f60251b728a4529b083f395ba812ff8887 SHA256 4c67b16c0ac2307fd0bb4ae307bddd5cc6fc6a9c7a41edc4cffb885e63edbb63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN9lPiAAoJEHfx8XVYajsf8tAQALINvnWRJ2uYhxCWPX+TwhYe
-Nmi6Ekso0kKwfXG/p5HXeh21q/1JL+/OgCF+rXmDA7p268huCy654eq1Z7fwuLof
-Scx8jVg/jRxHAJx4pXDfkHvFPxUArrNBM8IDI0W2JbWNr/vW67tKAXalyEuxQ6D4
-5Yyvk725HqgaFB4VJPPsn5HGPYJpCLbB6TCdZtk+8URsnWdr5rfFdiDyVFeMnEe7
-g1GnEFtbx9aZfVQG6jwV8ljlC5g3ahtNYiwecKJnO/EMsm019L9dYhxpoNbAX+ux
-tNDkLwa+HIfydOxaXqQAnxOGH9AEcO4bPsZMYjUolBvmVfey+SSi5aQ/8yBlAWjv
-m08c6qIC4IqlnrXKuFUlPfJCEeqoWrWDPE/nRrfXnYXMalL2/ok2zsokg5M/AUux
-pEydY6b8LQG2lL/IKLqnfR+3fC9YW61ImhK0ek0BRQalSvy7wBqG6fZ3jYlKaOUD
-zxkwXgKp/Bv33xRTkZ1GKzu3BftvQkPjlfV+b+XDgVyTKZyv2JjwbFfXP54wHaTM
-HKMK6hDvnZ+D2RMKfS4Q3WXqM72mxLs8flJBfVUkYivyH4Zh/4cMgxxWUeDURDM4
-02hWmiQgW0zxdMQMSRkQh7eUkjlv/4651rt2lt+EYgybP7bnti37lQZufvfoQ/dR
-PW7XLJw6I7QWlaakxZbw
-=d5Au
+iQIcBAEBCAAGBQJOHekAAAoJEHfx8XVYajsfM8EP/iOKumRgJFBTFPX4w3kGHN6v
+3OHT0s/rLXKqT6A11FwhO18tzd3VmWvYdXjw4Chw98qlBqnzzbI0YTAoag3es1m4
+kzRgyp9N+rhSuNbHtmRMi0h75mxDlY1PLRv5axCCjNWCBZDUrZibULXxzk2JrXUa
+AOCJ7QXlKO9zeYdKlf9TEP0u5YUt3ggl6dI2Q7vblEXYOYkdxYv3GiUHvUAAUa6K
+W4S4psRjw2HC0/H9/64xpVWEkHNRJvawIfHMH5/prlRKh2Zb4Pu1G3Hbe3kM43E2
+KQMsdogQdeyNRrxBjlFkzGELXNdhmX8BEnNAL6y5xsTifAq1cUvX2Rp/fsjyinSm
+FSXOmomZybQJgW1qdAPUxH3mzXOWrzCamMs7AUAQtFAPjxFr/hxXWOcvZ6bwfEvS
+xq3VKDerLbJeT6xpAPCgoVhEe7OSYecqoaxWFKv1G3CwgHxBMJpn8SlXxmhiSiPv
+AHoLx0YhFIscoEY8zsVyQatxwZoEQj6AnPUUyxgJ3A7kaoxed8iFxCDg8rzRpAv0
+Tvi8lGHczQ/At7ENJUGf2y+SNqOufMUQI3GyIDss3Lh2xJArSU2FBEee10finAJY
+IbQFNgNULwbhpy2uMm+/AtGGvonEphsV/oQtnJ69/0JrbRIfV9SEAWiy0G/Ez26T
+R7339uQdOldKQLcQJPFZ
+=USoG
 -----END PGP SIGNATURE-----
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild
new file mode 100644
index 000000000000..6fa21fa74074
--- /dev/null
+++ b/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild,v 1.1 2011/07/13 18:50:27 eras Exp $
+
+EAPI=2
+
+IUSE="ldap spell ssl filter mysql postgres nls"
+
+inherit webapp eutils
+
+DESCRIPTION="Webmail for nuts!"
+
+# Plugin Versions
+COMPATIBILITY_VER=2.0.16-1.0
+USERDATA_VER=0.9-1.4.0
+ADMINADD_VER=0.1-1.4.0
+AMAVIS_VER=0.8.0-1.4
+LDAP_USERDATA_VER=0.4
+SECURELOGIN_VER=1.4-1.2.8
+SHOWSSL_VER=2.2-1.2.8
+LOCALES_VER=1.4.18-20090526
+DECODING_VER=1.2
+
+MY_P=${PN}-webmail-${PV}
+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 )
+	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="dev-lang/php[session]
+	virtual/perl-DB_File
+	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}" || die
+
+	mv config/config_default.php config/config.php || die
+
+	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" \
+		config/config.php || die
+
+	# Now do the plugins
+	cd "${S}/plugins" || die
+
+	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 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
+}
+
+src_configure() {
+	#we need to have this empty function ...
+	echo "Nothing to configure"
+}
+
+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!
+
+	dodoc README
+
+	docinto compatibility
+	for doc in plugins/compatibility/docs/INSTALL plugins/compatibility/docs/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 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}" || die
+
+	cp "${WORKDIR}"/squirrelmail-decode-${DECODING_VER}/*/*.php \
+		"${D}${MY_HTDOCSDIR}/functions/decode" || die
+
+	# 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 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
+}