From: Eray Aslan <eras@gentoo.org>
Date: Thu, 18 Aug 2011 06:17:48 +0000 (+0000)
Subject: QA - bug #379629
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5025bc4f44630615d33e05d7c231a2dcc381223a;p=gentoo.git

QA - bug #379629

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

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index c0a20d51736f..f7e59a0b0b96 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,9 @@
 # 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.160 2011/07/13 18:50:27 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.161 2011/08/18 06:17:48 eras Exp $
+
+  18 Aug 2011; Eray Aslan <eras@gentoo.org> squirrelmail-1.4.22.ebuild:
+  QA - bug #379629
 
 *squirrelmail-1.4.22 (13 Jul 2011)
 
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index 172bf54ca456..4d218e54ad76 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -15,23 +15,23 @@ DIST squirrelmail-1.4.21.tar.bz2 526813 RMD160 f4eeb97d85c76a037e848217d06aa13a1
 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
-EBUILD squirrelmail-1.4.22.ebuild 5665 RMD160 7e8aa07de94055e729ef43209d71331d6bc039af SHA1 75746e93da11bb4800cb435bed357e8ef03251f3 SHA256 2dc22fc954e209bd2d9eebea23f87315eb36b4c89e12c17f84c5db93b8928321
-MISC ChangeLog 32154 RMD160 6b1c84a6efdb4346ef70364c97cac3f5390d227e SHA1 27f8cc73a1905fb6d15f3f8d230e2a7912dfdd40 SHA256 b344dd0ac055449adef0c1540d22911afd35988b186b841b125d650840383e72
+EBUILD squirrelmail-1.4.22.ebuild 5625 RMD160 f4303a986d5030d0101bd14b94fe19fac9859476 SHA1 bc05317c26f36359e9ae4a625fb97efea2f44ae0 SHA256 6d9eb686d29586cfd756094fc134165755b07a23343691a3447d779b633c240c
+MISC ChangeLog 32246 RMD160 7d104b84f41546ce9f25d49e36d5179e8be92ee0 SHA1 d233e3eec73b17b6c174a42d28e68e2e8cf3d732 SHA256 e848395bcdc23a8296496a2c58ebbbc5cbe909c7e6db502814e372b1924061a7
 MISC metadata.xml 256 RMD160 1d17a8ea7a1b4d83b151287d3c55481493c2a820 SHA1 6e17c2f60251b728a4529b083f395ba812ff8887 SHA256 4c67b16c0ac2307fd0bb4ae307bddd5cc6fc6a9c7a41edc4cffb885e63edbb63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJOTK6ZAAoJEHfx8XVYajsf8m4QALaimggDCzSDuWMz0KfsDs/8
+FZ6AqvLr6OTERS+HHc36bCQwDdcpge4+xmBczlg1ZsMsDBK+cvd21HV3E6Or7IWd
+vofVQAYNQoywTQMre4iICi5d3a7sud+aUGM5NmfhjbyeXZ+xNMHWN7W1U+IOn6RC
+nphkNXd8dBlso5CjU4iOwDJqx6b09RfGsYVKkJo0KClM+ZCJX5iDz9FJ1+ESM4re
+7MDr2EnIEN7BC1TKyF1l7VcqS5qZqGZAiEIZaPyTCHDUIlNQpv7IfRWy/uzuCxVU
+nwylVvniJ9yy6I7pP7jmnH5SymJ4PA54q1jp7f4+DwfyrTTxrEAOc+cW2IaksPmL
+AQRiz4MCWwHioDYX1kxrlyeD535u0mL2bgr+Dp27NkdOFvg7/y18W0WhVv7jLHFT
+tHzITH+m/nH7m1LMADSYxn/nZbbVOZzSt53V+51BXfduugolX4AFHWVj4SY5DPN6
+R+3b/23A3ysKdURaSiXNkQiV+MNxv+E0Bnyr7n3J9Ae8tM0meHFglkp9Gx0yoMha
+50zfKwhMRLi3mRQukLVHVRwg3Xi+Xy0uM9OrUaCtv2FqAHfqfWvFBq+A4GcWE9y3
+P1K3W3IGAsWszyT345vkRUAk7/+B/1inFO+v3ZVn3B09wUYmSWCvGoz+IA2TskqY
++iuJUV2HzEPYUIq097oA
+=MQmj
 -----END PGP SIGNATURE-----
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild
index 6fa21fa74074..a5a3c4ef5fa1 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.22.ebuild,v 1.2 2011/08/18 06:17:48 eras Exp $
 
 EAPI=2
 
@@ -59,14 +59,9 @@ src_unpack() {
 
 	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
@@ -78,9 +73,7 @@ src_unpack() {
 		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
+		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz
 
 	use ssl &&
 		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
@@ -93,6 +86,17 @@ src_unpack() {
 		unpack all_locales-${LOCALES_VER}.tar.bz2
 }
 
+src_prepare() {
+	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" \
+		config/config.php || die
+
+	cd "${S}/plugins" || die
+	if use ldap; then
+		epatch "${FILESDIR}"/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch
+		mv ldapuserdata/config_sample.php ldapuserdata/config.php || die
+	fi
+}
+
 src_configure() {
 	#we need to have this empty function ...
 	echo "Nothing to configure"