Simplify postinst info messages. Fix pre-stripped QA warning.

Package-Manager: portage-2.1.2.3

diff --git a/net-proxy/squirm/ChangeLog b/net-proxy/squirm/ChangeLog
index 3884b2f37abb4f9a03aea2fd4ada042df4ec592c..cfb1f989c982ca9658472b77267efe7b031eba9b 100644 (file)
--- a/net-proxy/squirm/ChangeLog
+++ b/net-proxy/squirm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squirm
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/ChangeLog,v 1.4 2006/10/23 18:18:07 mrness Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/ChangeLog,v 1.5 2007/04/11 13:55:44 mrness Exp $
+
+  11 Apr 2007; Alin Năstac <mrness@gentoo.org> squirm-1.23.ebuild:
+  Simplify postinst info messages. Fix pre-stripped QA warning.
+
+  11 Apr 2007; Alin Năstac <mrness@gentoo.org> squirm-1.23.ebuild:
+  Simplify postinst info messages.
 
   23 Oct 2006; Alin Nastac <mrness@gentoo.org> squirm-1.23.ebuild:
   Make net-proxy/squid compile-time dependency (#152467).

diff --git a/net-proxy/squirm/Manifest b/net-proxy/squirm/Manifest
index c298a3e0455b6f63671ee3c47581ef7c6dad4689..86b1105f9a82f75deb5999113a4c21c258e58d2d 100644 (file)
--- a/net-proxy/squirm/Manifest
+++ b/net-proxy/squirm/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST squirm-1.23.tgz 43151 RMD160 68d276b3b437bffb948e300fa715cea509ff2ea3 SHA1 bc1fa94e8dfdeaaff0199fde1387b70c9f28f6e8 SHA256 d0778727d01a220a4511429250c99afae86fbf5182e4aafa174115431dd33b6f
-EBUILD squirm-1.23.ebuild 1178 RMD160 1a5cbf5702a0d70bc03b7810c10ec4459be0c3a6 SHA1 8e3ca2712f80b6716e76708c6b9a2411c66fa0b3 SHA256 13b80f232b56f9b714e5fa29a94b3577cff8ecb427124fff08b9d8434c37e73b
-MD5 bd303307b07ccf31559e4a593580154f squirm-1.23.ebuild 1178
-RMD160 1a5cbf5702a0d70bc03b7810c10ec4459be0c3a6 squirm-1.23.ebuild 1178
-SHA256 13b80f232b56f9b714e5fa29a94b3577cff8ecb427124fff08b9d8434c37e73b squirm-1.23.ebuild 1178
-MISC ChangeLog 1354 RMD160 c60545f501dfc9c8c1f901e1b3ca6c122c8500ec SHA1 50a1f35223586ff00cfd2d26e807028833d3be25 SHA256 bb919cd49b23321e6d4b4442658632be9d253db3d93ffa1f068b535ef799764e
-MD5 520ca223c8165ae16a37e80e8cc6b2fd ChangeLog 1354
-RMD160 c60545f501dfc9c8c1f901e1b3ca6c122c8500ec ChangeLog 1354
-SHA256 bb919cd49b23321e6d4b4442658632be9d253db3d93ffa1f068b535ef799764e ChangeLog 1354
+EBUILD squirm-1.23.ebuild 980 RMD160 0ef87e351c8bda3edc12eae3c265305f4323d102 SHA1 aacb9228b606bd36841a3d41a0cc5282537fff1e SHA256 e110379050403a54dc9173c62505ac268ad22062f23e2d25ec38b96a10152486
+MD5 01ce0a44efb3034a0a4c2620116b8276 squirm-1.23.ebuild 980
+RMD160 0ef87e351c8bda3edc12eae3c265305f4323d102 squirm-1.23.ebuild 980
+SHA256 e110379050403a54dc9173c62505ac268ad22062f23e2d25ec38b96a10152486 squirm-1.23.ebuild 980
+MISC ChangeLog 1591 RMD160 d2dcd67e70d17ca66cb6437939bb747b7a122ad2 SHA1 3cafef5c0967dc7c19237e3028f5b1d6c194ee65 SHA256 e611d5a88abcd23026e52098fee2159ac29fc5d29e485810a0f63b6c5747af53
+MD5 0876a3ee1d97def6196fac03fd7a7093 ChangeLog 1591
+RMD160 d2dcd67e70d17ca66cb6437939bb747b7a122ad2 ChangeLog 1591
+SHA256 e611d5a88abcd23026e52098fee2159ac29fc5d29e485810a0f63b6c5747af53 ChangeLog 1591
 MISC metadata.xml 220 RMD160 b3959b1e5e7257f851583e0a0ff6db0f4a0a0112 SHA1 f10e7f86649ceb749be2d1b105ed621c421b9cef SHA256 15ffb93c241bd710f5731f55fed5b3b621195e9e0a55a220de6a84aef7e2ab8e
 MD5 72e4905c488cbc93ddc5cedf48876077 metadata.xml 220
 RMD160 b3959b1e5e7257f851583e0a0ff6db0f4a0a0112 metadata.xml 220
@@ -18,9 +18,9 @@ MD5 4e8e0515d46fc0847ece2b1d86a59593 files/digest-squirm-1.23 223
 RMD160 5fba2b4224bb0adc8391a4e1022dccf95456f7fe files/digest-squirm-1.23 223
 SHA256 2fddd6aa590b0997a7a3308cddf3e272eab2f799519fa7bc80996cf8e93e22af files/digest-squirm-1.23 223
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFPQdq3sf9c6kjmR8RAuIwAJ4qPGotnqCWSGP68q6sCg+p67zC8QCfYidR
-UZtc4yjiK4zxrt9Eq409vCY=
-=55Rj
+iD8DBQFGHOjqJnxX6mF440QRAsTFAKCEY4QbYi13CyQ+cJOlo7cC/iPtQwCgxPjx
+wbYfTP96BrqyuaD69UR20WA=
+=qURr
 -----END PGP SIGNATURE-----

diff --git a/net-proxy/squirm/squirm-1.23.ebuild b/net-proxy/squirm/squirm-1.23.ebuild
index c1bf304b560eed13d809d356a68461e3bce74cd6..7cd712f68b21bbe2cd6f71b064ca2533fabcc88a 100644 (file)
--- a/net-proxy/squirm/squirm-1.23.ebuild
+++ b/net-proxy/squirm/squirm-1.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/squirm-1.23.ebuild,v 1.5 2006/10/23 18:18:07 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/squirm-1.23.ebuild,v 1.6 2007/04/11 13:55:44 mrness Exp $
 
 DESCRIPTION="A redirector for Squid"
 HOMEPAGE="http://squirm.foote.com.au"
@@ -8,7 +8,7 @@ SRC_URI="http://squirm.foote.com.au/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="ppc x86"
 IUSE=""
 
 DEPEND="net-proxy/squid"
@@ -21,6 +21,7 @@ src_unpack() {
                -e 's|^PREFIX=.*|PREFIX=/usr/squirm|' \
                -e "s|^OPTIMISATION=.*|OPTIMISATION=${CFLAGS}|" \
                -e "s|^CFLAGS =.*|CFLAGS=${CFLAGS} -DPREFIX=\\\\\"\$(PREFIX)\\\\\"|" \
+               -e "s|--strip||" \
                "${S}/Makefile"
 }
 
@@ -30,10 +31,6 @@ src_install() {
 
 pkg_postinst() {
        einfo "To enable squirm, add the following lines to /etc/squid/squid.conf:"
-       einfo " - for squid ver 2.5"
-       einfo "    ${HILITE}redirect_program /usr/squirm/bin/squirm${NORMAL}"
-       einfo "    ${HILITE}redirect_children 10${NORMAL}"
-       einfo " - for squid ver 2.6"
-       einfo "    ${HILITE}url_rewrite_program /usr/squirm/bin/squirm${NORMAL}"
-       einfo "    ${HILITE}url_rewrite_children 10${NORMAL}"
+       einfo "    url_rewrite_program /usr/squirm/bin/squirm"
+       einfo "    url_rewrite_children 10"
 }