Replace piped sed calls with single combined sed scripts.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index 65b3f42972b327ec8999686647c6acd9656176a0..a4ae327418ed46761b7d281b919b84abca6dda0d 100644 (file)
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nntp/inn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.39 2011/08/06 03:27:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.40 2011/08/06 03:51:55 jer Exp $
+
+  06 Aug 2011; Jeroen Roovers <jer@gentoo.org> inn-2.5.2-r1.ebuild:
+  Replace piped sed calls with single combined sed scripts.
 
   06 Aug 2011; Jeroen Roovers <jer@gentoo.org> inn-2.5.2-r1.ebuild:
   Fix pkg_config. Make it more verbose.

diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
index a8231e7834b70447a5e18d86c45facbec04c5110..59a9dc79f7c0674916e00c6d7df3f0dc1d85041f 100644 (file)
--- a/net-nntp/inn/Manifest
+++ b/net-nntp/inn/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 AUX innd 503 RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e SHA1 85aa86e4fcca7837e32e2e3be31fbd50e96b79c2 SHA256 ab2082ee261d632dafeaaf9ebb459e5afe684597c67b860ca0a7a8ff3bf554ed
 DIST inn-2.5.2.tar.gz 2331916 RMD160 2fce7fade8bd8df3fe7f813b6feb37ff2b2bf07c SHA1 e7a9512acb5fa09ecdf116a4bde39c9f5efe65db SHA256 f5edd48f48ecee9b6430db94fe504f893d7dfae4257f55f382ba1cf7375b4e68
-EBUILD inn-2.5.2-r1.ebuild 8207 RMD160 eca2b3e3089a4387922131bb58e47f4656e35cc0 SHA1 9e662aecb24a77771a2b49673befbc7ad8dca32b SHA256 1d48e569d12de9ef77d580d5a746872539ff6b705e7893cb68f0432d7a1751f6
+EBUILD inn-2.5.2-r1.ebuild 8187 RMD160 442a95b2e9f3b667e18040fe08ca7bb23b93cc20 SHA1 9b2361bc88daa9131a536a080a107bf4eda12367 SHA256 141b13d9f359763a05044eb0927615c2034498573c2114d938bc683fdd7e34a0
 EBUILD inn-2.5.2.ebuild 8015 RMD160 4a37c5d5589b4f93440e4721dd80eda0ca14b0a9 SHA1 a29dff7239c331972cf10d077f7f10122c74b473 SHA256 571730ba03b8c7c4ac800e1a32c5d701b5621893a7cec7e40ad50a08086b64bd
-MISC ChangeLog 8355 RMD160 adab9f91dd25bca135a12402cd5897fb355b841b SHA1 1d40f2a5f7c800ef7076fead96f06c5a7b1ae25b SHA256 c94497b99bf219f03b752c975b3f9a604087034882619f18e18ab6a1b990275d
+MISC ChangeLog 8484 RMD160 7d355b7721785ad14f24568014e647e7ced8f66d SHA1 350f7778d34899188f55c8d163cc68217088ac85 SHA256 596cf31b828c9c8297932d61ffce1485647bc882b848344925d43c50095985fd
 MISC metadata.xml 352 RMD160 802eed9c30b34a5226648155bf521f9fd3bef350 SHA1 230d40e31eb709966710ca40e489ad00962c80bb SHA256 c58a5ed6da2054c42c3e7a6328456cedbdc45664210a95223fdd18a0fec340ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk48tJQACgkQVWmRsqeSphMu7ACeNFuLFEjVe+xUkmqLstxTJyEc
-OsEAn2WsgQjU+Gg3ehLIksemC/3v0HRO
-=oZln
+iEYEARECAAYFAk48umAACgkQVWmRsqeSphOHvACfSLXQok6/prg6JgRnS2QhxXis
+BaoAn2eu+yXNYoqccg+M1YjIjM1XDJjc
+=DymN
 -----END PGP SIGNATURE-----

diff --git a/net-nntp/inn/inn-2.5.2-r1.ebuild b/net-nntp/inn/inn-2.5.2-r1.ebuild
index 0b7ae9c9f03d5c5568d5a32c2913ce5b4064d634..534b95382f939d0a408f4f427c76877af653a3a9 100644 (file)
--- a/net-nntp/inn/inn-2.5.2-r1.ebuild
+++ b/net-nntp/inn/inn-2.5.2-r1.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/net-nntp/inn/inn-2.5.2-r1.ebuild,v 1.2 2011/08/06 03:27:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2-r1.ebuild,v 1.3 2011/08/06 03:51:55 jer Exp $
 
 EAPI="4"
 
@@ -27,14 +27,14 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-       sed -i -e "s/ -B .OLD//" Makefile.global.in || die
+       sed -i -e "s: -B .OLD::" Makefile.global.in || die
 
        # Do not treat LDFLAGS as if it contained libraries to link to
-       sed -i m4/python.m4 -e 's|LDFLAGS||g' || die
+       sed -i m4/python.m4 -e 's:LDFLAGS::g' || die
 
        # We do not have the biff service, but we do have comsat
        sed -i tests/lib/getnameinfo-t.c \
-               -e 's|"biff"|"comsat"|g' \
+               -e 's:"biff":"comsat":g' \
                || die
 
        eautoreconf
@@ -230,12 +230,12 @@ pkg_config() {
        fi
 
        INNCFG_INODES=$(
-               sed -e '/innwatchspoolnodes/ ! d' /etc/news/inn.conf |
-                       sed -e 's/[^ ]*[ ]*\([^ ]*\)/\1/' \
+               sed /etc/news/inn.conf \
+                       -e '/innwatchspoolnodes/ ! d; s:[^ ]*[ ]*\([^ ]*\):\1:'
        )
        INNSPOOL_INODES=$(
                df -Pi ${NEWSSPOOL_DIR} | \
-                       sed -e 's/[^ ]*[ ]*\([^ ]*\).*/\1/' | sed -e '1 d'
+                       sed -e 's:[^ ]*[ ]*\([^ ]*\).*:\1:; 1 d'
        )
        if [[ ${INNCFG_INODES} -gt ${INNSPOOL_INODES} ]]; then
                ewarn "Setting innwatchspoolinodes to zero, because the filesystem behind"
@@ -244,7 +244,7 @@ pkg_config() {
                cp /etc/news/inn.conf /etc/news/inn.conf.OLD
                einfo "A copy of your old inn.conf has been saved to /etc/news/inn.conf.OLD."
                sed -i /etc/news/inn.conf \
-                       -e '/innwatchspoolnodes/ s/\([^ ]*\)\([ ]*\).*/\1\20/'
+                       -e '/innwatchspoolnodes/ s:\([^ ]*\)\([ ]*\).*:\1\20:'
                chown news:news /etc/news/inn.conf
                chmod 644 /etc/news/inn.conf
        fi