diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-08-06 03:51:55 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-08-06 03:51:55 +0000 |
| commit | 2939a206dc380060ce01918ebffbae935580ee0a (patch) | |
| tree | e27c8281f61f43750263acff4c40aa242bc63e79 /net-nntp/inn | |
| parent | Enable hash storage driver by default. (diff) | |
| download | gentoo-2-2939a206dc380060ce01918ebffbae935580ee0a.tar.gz gentoo-2-2939a206dc380060ce01918ebffbae935580ee0a.tar.bz2 gentoo-2-2939a206dc380060ce01918ebffbae935580ee0a.zip | |
Replace piped sed calls with single combined sed scripts.
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'net-nntp/inn')
| -rw-r--r-- | net-nntp/inn/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nntp/inn/inn-2.5.2-r1.ebuild | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog index 65b3f42972b3..a4ae327418ed 100644 --- 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/inn-2.5.2-r1.ebuild b/net-nntp/inn/inn-2.5.2-r1.ebuild index 0b7ae9c9f03d..534b95382f93 100644 --- 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 |