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
commita6375168815cb2c8ba7c6122e80def43986660fe (patch)
tree83e6d08e57c50f24507f6d1ebab125ef39449bcb /app-admin/sysstat
parentRDEPEND on splitted python ebuilds (bug #352935 with Markos Chandras approval). (diff)
downloadhistorical-a6375168815cb2c8ba7c6122e80def43986660fe.tar.gz
historical-a6375168815cb2c8ba7c6122e80def43986660fe.tar.bz2
historical-a6375168815cb2c8ba7c6122e80def43986660fe.zip
Move count function out of global scope.
Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64
Diffstat (limited to 'app-admin/sysstat')
-rw-r--r--app-admin/sysstat/ChangeLog5
-rw-r--r--app-admin/sysstat/Manifest10
-rw-r--r--app-admin/sysstat/sysstat-10.0.1.ebuild12
3 files changed, 14 insertions, 13 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/Manifest b/app-admin/sysstat/Manifest
index fc64e72519a5..13d653ff130c 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -10,14 +10,14 @@ DIST sysstat-10.0.0.tar.bz2 261707 RMD160 f05799ddf0fcc0dfb745b79e89948b91a2135d
DIST sysstat-10.0.1.tar.bz2 265790 RMD160 5fd675358764e58a157eda5f4103dedfbc0b098f SHA1 6e13561a377c8ee48ef34d618592a28d5f6f238c SHA256 790763caae51c5a18b694a587e77e9fd3ac5dc2f47d5ce69b2d0eddb3087b094
DIST sysstat-9.0.6.1.tar.bz2 243939 RMD160 9433cacb5a4f4b4ca82e817bf7896de6f41c65d0 SHA1 1d2c47d1c236e9d33519015bc12b0bf816300ae3 SHA256 27cfac5384fd53b8929c0e5e91f81b75f357206798fb32f3948e03c64c303918
EBUILD sysstat-10.0.0.ebuild 2161 RMD160 eeba01cc131eba11fd54864b3b7bd33b783f2b67 SHA1 c41b44c35b0bbd3517db54a3ec1f98aa3ff7c27b SHA256 35991b077de4a993229bd753364d158466ab64d1aefae55b812270b9340a8892
-EBUILD sysstat-10.0.1.ebuild 2421 RMD160 49bf6352298d0b1f4fad5166e0366d4545f521ea SHA1 31094c3fecdffd2a272e12e3b444986e2ba79cfc SHA256 f729adbf36d03f5e56e993db13abb10c543d9b169e9a1a4787c7de8240543ce3
+EBUILD sysstat-10.0.1.ebuild 2410 RMD160 718349888a375c15e9864d99fd016def314840ea SHA1 33253f11081825440f70a686e29a895a802c77f0 SHA256 6c328bce52a0d8bef8d8a45f1c5c7d4f5ebf809847dd95b7b1587d17583bf239
EBUILD sysstat-9.0.6.1.ebuild 1389 RMD160 721ca5d33f736895819787df73d1a87ae8be6687 SHA1 81fb50612927353e9c83291dc4ff65c20e1d124a SHA256 a7830dbabb1223c4d1fe92ec41a2160775e261e472e0d8cdaf38d252a6914329
-MISC ChangeLog 24778 RMD160 673c710ae8802c640c504b56025ae0ab5acdc15b SHA1 52ca332e9b4de0a8d9b8da7441a11e581e6cd354 SHA256 6bde5636a2fbf2593dcefd3f8da3358e0d3b3a44106261779349ff19a1cd2e66
+MISC ChangeLog 24892 RMD160 d430895ebb7923e2e02ace4379d1b253c5c1a072 SHA1 a69cb36a5c9b0ebed94a5e9c2d936346a8424078 SHA256 b3e6b3c24529dada969ffd4557e57f23002ff13d54cdbce6b22ee137eeafe0f8
MISC metadata.xml 416 RMD160 7f095f0f80e688c8817c2120707b5186b9950da4 SHA1 115f7b62bc505ed8176b3c2558556009856e9f00 SHA256 d93e7ab614ffb746fe5a8acd24c1906f5159bf0850e7a9bf5605be4f1ff6a731
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk3qbJYACgkQVWmRsqeSphN4jACfdVU4hTEHBVJtUnLSCuQSK/Rl
-tF4An2QeGx9yhT0PIt9RGkWssMoB5UFR
-=QQIE
+iEYEARECAAYFAk3qbXwACgkQVWmRsqeSphMWQgCfYrM+BfdlOw20gkWfnsehQqJb
+BA4An1wRwdzcRddAkVK24IDIh6wQtier
+=93/r
-----END PGP SIGNATURE-----
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