diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2013-05-10 22:14:25 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-05-10 22:14:25 +0000 |
| commit | 8ca5f832bc0a6fd119b063393a75f39c8fa83598 (patch) | |
| tree | 724247206be7fab94cb4db662fe48acc58180f11 | |
| parent | Fix (diff) | |
| download | historical-8ca5f832bc0a6fd119b063393a75f39c8fa83598.tar.gz historical-8ca5f832bc0a6fd119b063393a75f39c8fa83598.tar.bz2 historical-8ca5f832bc0a6fd119b063393a75f39c8fa83598.zip | |
Fix
Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806
| -rw-r--r-- | app-text/iso-codes/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/iso-codes/Manifest | 22 | ||||
| -rw-r--r-- | app-text/iso-codes/iso-codes-3.40.ebuild | 14 |
3 files changed, 17 insertions, 24 deletions
diff --git a/app-text/iso-codes/ChangeLog b/app-text/iso-codes/ChangeLog index 6207aea3ccae..6a5e6a57d2cf 100644 --- a/app-text/iso-codes/ChangeLog +++ b/app-text/iso-codes/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/iso-codes # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.143 2013/04/09 16:40:59 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/ChangeLog,v 1.144 2013/05/10 22:14:20 eva Exp $ + + 10 May 2013; Gilles Dartiguelongue <eva@gentoo.org> iso-codes-3.40.ebuild: + Fix linguas stripping logic, bug #463958. 09 Apr 2013; Agostino Sarubbo <ago@gentoo.org> iso-codes-3.40.ebuild: Stable for sh, wrt bug #458984 diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest index 0b9b901fe09d..c53fa40f6dc1 100644 --- a/app-text/iso-codes/Manifest +++ b/app-text/iso-codes/Manifest @@ -1,26 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 DIST iso-codes-3.37.tar.bz2 10192736 SHA256 408d1b8bbbd0c496c70e1a94093bc1f88495a7c6f6135c65c1cd53bdb1c62d90 SHA512 5202b526f4cf03343780b30ec38dd0197b3ef0fa467822a9c3213bfbcf10556e435f0abf0a66793dc6bba82aec59dc5785a0d3029eac8ad9d73f1e87b13ce709 WHIRLPOOL 22220f1f4424f53b07032d13e00bf64cdb5d47a392b6aa6b55fc21847c4912c6349d56ece7a2b6c0c7de4193f0a7188f62ea83a068fd1f7b5ba5d57d57f80be0 DIST iso-codes-3.40.tar.xz 3634056 SHA256 f98a7022e8b642c9d2a6c03e05cafb0e5e8b5985ff8bd75b8493c08dac49f046 SHA512 1393a406aca36e2a49b07e373cb424166742e343f135e9a73cb1a29875c1c6fba95a597093af1043b395ea603dc69c46ba9639409826920ebb81be8129c47424 WHIRLPOOL 3ec551bc84675cadb79cc2f0490e906acb57056c5e6f5a6307342b9b25aa2cc7d771f3b15f0012aa53c347abffee993e54a3e5c5424f9192cd51a482fbedb685 EBUILD iso-codes-3.37.ebuild 1356 SHA256 17357632aaf9cfd65941ae415fd39251133cdb4380969ea40cf69aadf90d8a4e SHA512 94d1a250b0e6161205ced9ca7f2e6c832e420cd2b2c8e7f9789609647e3eb8e7a0be38f4905d4537868827b833831c9aaa9ca9d8a5e7aca919626225d170a9f8 WHIRLPOOL d0469fd8b570bcb5235711c88fa73f46b2a4cadb1af35a90bbae9b37c4a8803648a1ca759b4df2f46d34bb4682ee65deaa94c31a80e812513349ce417f5a6c0a -EBUILD iso-codes-3.40.ebuild 1351 SHA256 f30c9bc1c031453112b0dfb62b5d173569ef66b85363fb5bff613c8ab9189312 SHA512 f5a570d2bd8a2a848754d57e47d5b26bf4dc9e9981e7bf01faa8e06d5abad9bb2d3fa4473f4a92455990b98aa9e31aef8dad79574833fbf9e17d0fefb8ab68b9 WHIRLPOOL 6fd836e358203de2aafab2a7b2fda416de34cfe51ae106644f48d30931b841a9169b97690632d7bf7cf74dda90220ef051aa8f0130c6ea7d0247689e43435d6e -MISC ChangeLog 17810 SHA256 1828347eaaf7853e7893c7ac364cabecb37e240a6511e5fd4f784c6dcbfc72f7 SHA512 1ed731c860f229cf3151315976198aaa905600022a5482f3e9c3682254611008564b6f90dd296e50c5959d974dcdb349f9197e553fffda413c14e020e79ada4e WHIRLPOOL 82142f213e5103c1ffd1b7b3319e6b2c2ac4e51d5178a0f26111db0ee30e1326d19014fe56d4638443f4e1fcdb0c0c377291c845dfa6a9e0a84e9f69996e790f +EBUILD iso-codes-3.40.ebuild 1357 SHA256 af3b065625dccb819f68a5475170fd1a44f3c70be249cc951284e3c3b97fb660 SHA512 14337ed819e02fc1b7d131d0c1ff672faa4d2d6487f49da91c6f24c2e5fac6e339ba214da7ab9959eedef005f8bb84edf467ae4f76568424e93ce3a47cee4baa WHIRLPOOL 986d961cd8749be790d0edc47e2190d5fc281307f118963c420e82388654cf62ede55189ec9db79a259c43d61f675584ceedd48d7ccbdd66fbdf4c39ad67706b +MISC ChangeLog 17932 SHA256 59fc6b690d9dea983c51297dd558e12dcd816903dd835fdb26e236b98cd7f810 SHA512 4bd8dc8d5f73b8156d1cff8da3f57232b8471c72c44f5367481127aa40ede8f6bcbd96f1c96c3361f3c8f42a6ae6943cafe71350941c44b96bfeb7b12fde3713 WHIRLPOOL 54efce3dec4e5b256dbf8f93723b64aedc1256db47d34c1bcfa223391a599d343f99cbcad0fd12edbfbf8d862de25cf743eb31451030d7dc784ddd102058c351 MISC metadata.xml 387 SHA256 d5252ca9dce95b72fa3153d212126bfa4594a1cf6868bff0dc205e46891a05e8 SHA512 fe1255bac7852aa3a93b5e0da7025f32d4b633f9d29c441501e5f7c30dafdd963ef00d62e68567f6a6b6fc15eb370ab4326bb6a7cc66681cca79e1767c791a94 WHIRLPOOL c4d465b7b0d6a7f0582ca0cb74c44a57d369c18a45bb81854c879398d0b5c0745ec300f2770e79e279833c8622920036a3b6bd8ae07d92ef3d8c8b02d3f1e3c9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRZEQFAAoJELp701BxlEWf1+wP/2DuRki8ZpDsDmaI323WPY/D -qHkaAHTrZa8kvbVfOrfGLOrGpUXFixt8yLvd+PpLCU6wj7MZ8PGl5aA0YCfj92Fb -/Haoy9vmCRlD7OQx0Pu/tbWpNFFzyD5LGwuPUEKIuuXTDZuTBLVJ6yCSVuHW8fc/ -TMijdqymo8xFAGrgwGR+V44zIbjJ4AYbs/dWmHx++CqwXJW87nVXiHboyMXuJAsL -2/O/81ehLVvXCZC7fNHGHPBNr8O4UPaqXopsZ6OXxtGgco2+cEKfcWNmFKX9XZvG -5MtYm0pqfLgqY8f7VIVTd2rZ2jj83rBBcSV66/PJbdLeHTW1JRom4NwRN70XBL5k -HklU9RhiNM6lTSFdfE414rsVub/pK8EGpLOzL2xdHrAWd2o/U9sr0C1BqyhzRD0z -MYssvlAGzl11YzfkrSVcPavDprDJGm+yDzmLfsC836F4TqmQ6TzOxbmmV0hp+tRB -BlgGlZQStD90uUWSh8sPbwwcENBDH/D/yf0pNvTHw16NAKgpFU5ZEzxYaR97zKoK -LFdvwLg/byrixOVSXHbf0xP0kIi2Wzxqpet3MC1C50/fZOv+/yNaY4H5nWt8iWvU -luAfxDrMXsc0o39v1d/x9C9mGNua2EdA+BUNwXuKz85tmoGbs56V+S90qvzu0N5T -1nmqtqJivWdEF6MoeavM -=71+P +iEYEAREIAAYFAlGNcT4ACgkQ1fmVwcYIWAZdKwCfd6P1/bluhv0khh0sLAsVIMeu +CogAmgMLzR1Qwfk3EAGDgiVH2PTxQ145 +=PuyW -----END PGP SIGNATURE----- diff --git a/app-text/iso-codes/iso-codes-3.40.ebuild b/app-text/iso-codes/iso-codes-3.40.ebuild index 640b67d838f3..b430f517839e 100644 --- a/app-text/iso-codes/iso-codes-3.40.ebuild +++ b/app-text/iso-codes/iso-codes-3.40.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.40.ebuild,v 1.11 2013/04/09 16:40:59 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.40.ebuild,v 1.12 2013/05/10 22:14:20 eva Exp $ EAPI="5" @@ -25,6 +25,8 @@ src_prepare() { local linguas_bak=${LINGUAS} local mylinguas="" + [[ -z ${LINGUAS} ]] && return + for norm in iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3; do einfo "Preparing ${norm}" @@ -36,11 +38,9 @@ src_prepare() { mylinguas="${mylinguas} ${loc}.po" done - if [ -n "${mylinguas}" ]; then - sed -e "s:pofiles =.*:pofiles = ${mylinguas}:" \ - -e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo}:" \ - -i "${S}/${norm}/Makefile.am" "${S}/${norm}/Makefile.in" \ - || die "sed in ${norm} folder failed" - fi + sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \ + -e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \ + -i "${S}/${norm}/Makefile.am" "${S}/${norm}/Makefile.in" \ + || die "sed in ${norm} folder failed" done } |