summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-06-04 17:37:58 +0000
committerJeroen Roovers <jer@gentoo.org>2011-06-04 17:37:58 +0000
commit4112527cd882fa84f5b69b8522a2abb3bb81f06b (patch)
tree735e1676214c2d8ac0b6b271f8c26a70182a558f
parentRDEPEND on splitted python ebuilds (bug #352935 with Markos Chandras approval). (diff)
downloadgentoo-2-4112527cd882fa84f5b69b8522a2abb3bb81f06b.tar.gz
gentoo-2-4112527cd882fa84f5b69b8522a2abb3bb81f06b.tar.bz2
gentoo-2-4112527cd882fa84f5b69b8522a2abb3bb81f06b.zip
Move count function out of global scope.
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
-rw-r--r--app-admin/sysstat/ChangeLog5
-rw-r--r--app-admin/sysstat/sysstat-10.0.1.ebuild12
2 files changed, 9 insertions, 8 deletions
diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index 57d36f41511b..81db09c10de1 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/sysstat
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.196 2011/06/04 17:34:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.197 2011/06/04 17:37:58 jer Exp $
+
+ 04 Jun 2011; Jeroen Roovers <jer@gentoo.org> sysstat-10.0.1.ebuild:
+ Move count function out of global scope.
04 Jun 2011; Jeroen Roovers <jer@gentoo.org> sysstat-10.0.1.ebuild:
Add a simple linguas counter. Die() when removing lingua fails.
diff --git a/app-admin/sysstat/sysstat-10.0.1.ebuild b/app-admin/sysstat/sysstat-10.0.1.ebuild
index 9ca54b2ff199..740d84994051 100644
--- a/app-admin/sysstat/sysstat-10.0.1.ebuild
+++ b/app-admin/sysstat/sysstat-10.0.1.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/app-admin/sysstat/sysstat-10.0.1.ebuild,v 1.2 2011/06/04 17:34:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.0.1.ebuild,v 1.3 2011/06/04 17:37:58 jer Exp $
EAPI="2"
@@ -37,18 +37,16 @@ RDEPEND="
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
-sysstat_count() {
- echo ${#}
-}
-
src_prepare() {
epatch "${FILESDIR}/${P}-nls.patch"
local po_count li_count lingua NLSDIR="${S}/nls"
- po_count=$(sysstat_count ${NLSDIR}/*.po)
- li_count=$(sysstat_count ${SYSSTAT_LINGUAS})
+ count() { echo ${#}; }
+ po_count=$(count ${NLSDIR}/*.po)
+ li_count=$(count ${SYSSTAT_LINGUAS})
[[ ${po_count} = ${li_count} ]] \
|| die "Number of LINGUAS does not match number of .po files"
+ unset count
einfo "Keeping these locales: ${LINGUAS}."
for lingua in ${SYSSTAT_LINGUAS}; do