Add LINGUAS support (bug #194567).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index a269160cf60b0c3eb9165ea6ee88fc757dc8117a..3b1a43363611af9e772b3c9f43e04f7fe848540c 100644 (file)
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sysstat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.173 2010/03/05 07:30:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.174 2010/03/16 01:49:41 jer Exp $
+
+  16 Mar 2010; Jeroen Roovers <jer@gentoo.org> sysstat-9.1.1.ebuild,
+  +files/sysstat-9.1.1-nls.patch:
+  Add LINGUAS support (bug #194567).
 
   05 Mar 2010; Ulrich Mueller <ulm@gentoo.org> sysstat-9.0.6.ebuild,
   sysstat-9.0.6.1.ebuild, sysstat-9.1.1.ebuild:

diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 971f08a72670c056874f4c0d8d21ff8ceb04dd1b..04509ae96699010050b1ac638247426837270ada 100644 (file)
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX crontab 537 RMD160 1691874f9addabd7b234f792b112d45cb6e4de9a SHA1 7fdba83e02b333a37861c84d050876cc83daecff SHA256 0c2bcfb3b0c8df092a978c0e6d8ee960b3c10157271df1d4d14707a0d5788fa3
+AUX sysstat-9.1.1-nls.patch 3735 RMD160 d116073b59547879e801b7bd8f6bd9fead7f7501 SHA1 8adf8e44466d07073db21915a2c6fe6ecbdaf2f4 SHA256 e91783f74235370231139d7095bd9af029a7634eb78d508e3d2793d8b659a7be
 AUX sysstat.init.d 529 RMD160 d7e9059d390194bfc90a9adae65a974ac1904f50 SHA1 2b922c924a50e1dae23c16b1c97f46bed146d88d SHA256 2b563aef917fd372e33b8c8f47b254cd1102ebe2c59ffbb6952324710346aa0e
 DIST sysstat-9.0.6.1.tar.bz2 243939 RMD160 9433cacb5a4f4b4ca82e817bf7896de6f41c65d0 SHA1 1d2c47d1c236e9d33519015bc12b0bf816300ae3 SHA256 27cfac5384fd53b8929c0e5e91f81b75f357206798fb32f3948e03c64c303918
 DIST sysstat-9.0.6.tar.gz 299506 RMD160 f06678a81cc65b5096d79d875151f9061966bd05 SHA1 329dd628366a8d43bddcf9fd692411f244ad9148 SHA256 464a4e23ab3b7d6886a5b8aa108e05b1a7f42654e1c398a040c88c81f30168c9
 DIST sysstat-9.1.1.tar.bz2 242465 RMD160 0e943aaa1ce145debdf812f13b4b868fddc9a4d9 SHA1 d96b27c2d13ae1f8687399155c617ae4c9f43c53 SHA256 8367de6385ce7dfe454123887d462716853deeb6251296cd02eda22238aba600
 EBUILD sysstat-9.0.6.1.ebuild 1392 RMD160 7a03cb47df89c85013e97b10c49a68f0347844ec SHA1 8c813a2873f6c63bd4b0d420f120eda3012abe73 SHA256 fb91054eaef22928a277d79dcb571f09b178c5383ecb842defd22f2536dcc3f5
 EBUILD sysstat-9.0.6.ebuild 1407 RMD160 a4da58744bdf1ae582b589a018f4f9605c48cfca SHA1 d7ed7300a683990120bb73d717534cd9b72ea00a SHA256 d4cd30badef9aea7e42c3e2f0327e0e52ace185ce69d7beedb23569ce9d0375e
-EBUILD sysstat-9.1.1.ebuild 1390 RMD160 6326dc65ebd73c71abbba0c6aa541d3725d4256f SHA1 8dd33ed7d45ec8fbb3bade4f1bb3456354a4cdb5 SHA256 61b5ff467d423fd5fcf39dfb273be4cb9e019f1af2ecf0c7245dd5b7f70970b4
-MISC ChangeLog 21405 RMD160 f3aad3db559d2844525fc0a5aaae6ef88aba0c66 SHA1 34dd0845a476438ad9b01db5ab962aa3e9af2dfd SHA256 e29570035450f6ad30304299d3b12705a18c8cca90f096a14144d480aeef18c0
+EBUILD sysstat-9.1.1.ebuild 1837 RMD160 762d7627022e0742206951ebdc8f9af15e744221 SHA1 b05fa8a508f0f8d659c220bb6f16c2fb263c2f29 SHA256 ff547665fa70194dc728e5b13851d1055ef0a983aa4f58708969cc5ada36f828
+MISC ChangeLog 21546 RMD160 7481b4388dd70e78ab662484941097ed22940014 SHA1 ff558905637f0d4bbdb980e0f983e00fe1c5d98d SHA256 bb1a068e306c9460c4a11a0ef504b1c9a22670d947ac6392598e5110b5740f16
 MISC metadata.xml 416 RMD160 7f095f0f80e688c8817c2120707b5186b9950da4 SHA1 115f7b62bc505ed8176b3c2558556009856e9f00 SHA256 d93e7ab614ffb746fe5a8acd24c1906f5159bf0850e7a9bf5605be4f1ff6a731
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iEYEARECAAYFAkuQsygACgkQOeoy/oIi7uyjzwCfd6t+aln6qbeuKfl5cXXAE0oF
-UksAnjWRB+SZROjZWfTlDtNvow6Q9GcM
-=i0e+
------END PGP SIGNATURE-----

diff --git a/app-admin/sysstat/files/sysstat-9.1.1-nls.patch b/app-admin/sysstat/files/sysstat-9.1.1-nls.patch
new file mode 100644 (file)
index 0000000..b643239
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-9.1.1-nls.patch
@@ -0,0 +1,72 @@
+Generate a list of locales instead of hardcoding individual ones
+
+--
+       Jeroen Roovers <jer@gentoo.org>
+
+
+--- Makefile.in
++++ Makefile.in
+@@ -257,56 +257,13 @@
+ 
+ install_nls: locales
+ ifdef REQUIRE_NLS
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/af/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/da/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/de/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/es/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/fi/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/fr/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/id/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/it/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/ja/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/ky/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/lv/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/mt/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/nb/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/nl/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/nn/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/pl/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/pt/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/pt_BR/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/ro/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/ru/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/sk/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/sv/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/vi/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/zh_CN/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/zh_TW/LC_MESSAGES
+-      $(INSTALL_DATA) nls/af.gmo $(DESTDIR)$(NLS_DIR)/af/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/da.gmo $(DESTDIR)$(NLS_DIR)/da/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/de.gmo $(DESTDIR)$(NLS_DIR)/de/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/es.gmo $(DESTDIR)$(NLS_DIR)/es/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/fi.gmo $(DESTDIR)$(NLS_DIR)/fi/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/fr.gmo $(DESTDIR)$(NLS_DIR)/fr/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/id.gmo $(DESTDIR)$(NLS_DIR)/id/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/it.gmo $(DESTDIR)$(NLS_DIR)/it/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/ja.gmo $(DESTDIR)$(NLS_DIR)/ja/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/ky.gmo $(DESTDIR)$(NLS_DIR)/ky/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/lv.gmo $(DESTDIR)$(NLS_DIR)/lv/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/mt.gmo $(DESTDIR)$(NLS_DIR)/mt/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/nb.gmo $(DESTDIR)$(NLS_DIR)/nb/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/nl.gmo $(DESTDIR)$(NLS_DIR)/nl/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/nn.gmo $(DESTDIR)$(NLS_DIR)/nn/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/pl.gmo $(DESTDIR)$(NLS_DIR)/pl/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/pt.gmo $(DESTDIR)$(NLS_DIR)/pt/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/pt_BR.gmo $(DESTDIR)$(NLS_DIR)/pt_BR/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/ro.gmo $(DESTDIR)$(NLS_DIR)/ro/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/ru.gmo $(DESTDIR)$(NLS_DIR)/ru/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/sk.gmo $(DESTDIR)$(NLS_DIR)/sk/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/sv.gmo $(DESTDIR)$(NLS_DIR)/sv/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/vi.gmo $(DESTDIR)$(NLS_DIR)/vi/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/zh_CN.gmo $(DESTDIR)$(NLS_DIR)/zh_CN/LC_MESSAGES/$(PACKAGE).mo
+-      $(INSTALL_DATA) nls/zh_TW.gmo $(DESTDIR)$(NLS_DIR)/zh_TW/LC_MESSAGES/$(PACKAGE).mo
++      catalogs='$(NLSGMO)'; \
++      for cat in $$catalogs; do \
++              cat=`basename $$cat`; \
++              lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
++              mkdir -p $(DESTDIR)$(NLS_DIR)/$$lang/LC_MESSAGES; \
++      $(INSTALL_DATA) nls/$$cat $(DESTDIR)$(NLS_DIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
++      done
+ endif
+ 
+ install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \

diff --git a/app-admin/sysstat/sysstat-9.1.1.ebuild b/app-admin/sysstat/sysstat-9.1.1.ebuild
index fcbdef20836e42747256dea610000f7b50653c2f..79ca3adc38fcc8d31577d3b8cdeb7d320b21f8ac 100644 (file)
--- a/app-admin/sysstat/sysstat-9.1.1.ebuild
+++ b/app-admin/sysstat/sysstat-9.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-9.1.1.ebuild,v 1.2 2010/03/05 07:30:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-9.1.1.ebuild,v 1.3 2010/03/16 01:49:41 jer Exp $
 
 EAPI="2"
 
@@ -15,6 +15,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cron +doc isag nls"
 
+SYSSTAT_LINGUAS="af da de es fi fr id it ja ky lv mt nb nl nn pl pt_BR pt ro ru sk sv vi zh_CN zh_TW"
+
+for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
+       IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
+done
+
 RDEPEND="
        cron? ( sys-process/cronbase )
        isag? (
@@ -27,6 +33,17 @@ RDEPEND="
 DEPEND="${RDEPEND}
        nls? ( sys-devel/gettext )"
 
+src_prepare() {
+       epatch "${FILESDIR}/${P}-nls.patch"
+       local lingua NLSDIR="${S}/nls"
+       einfo "Keeping these locales: ${LINGUAS}."
+       for lingua in ${SYSSTAT_LINGUAS}; do
+               if ! use linguas_${lingua}; then
+                       rm -rf "${NLSDIR}/${lingua}.po"
+               fi
+       done
+}
+
 src_configure() {
        local myconf=""
        use doc || myconf="--disable-documentation"