Add USE=-nls fix to older ebuilds too.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 33 insertions, 15 deletions

diff --git a/net-misc/whois/ChangeLog b/net-misc/whois/ChangeLog
index 28f4f488022c..35f16099baea 100644
--- a/net-misc/whois/ChangeLog
+++ b/net-misc/whois/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/whois
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/ChangeLog,v 1.180 2012/07/25 21:00:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/ChangeLog,v 1.181 2012/08/18 23:46:41 vapier Exp $
+
+  18 Aug 2012; Mike Frysinger <vapier@gentoo.org> whois-5.0.15.ebuild,
+  whois-5.0.16.ebuild:
+  Add USE=-nls fix to older ebuilds too.
 
 *whois-5.0.18 (25 Jul 2012)
 
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 53ccefee20be..d3e16f27adcb 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -2,26 +2,32 @@
 Hash: SHA256
 
 AUX whois-4.7.2-config-file.patch 198 SHA256 b7ad9cb716a8dbd1bb64dc80c1d4460c4a5661ba9420b771f9323c4337dbbea2 SHA512 1b2363abaae196390acdca8c04e7af9a2de14038e305b08c0780d272855d05b3ab06bee1157288f6a123ce072fd03b5ddb64be60faa091599eff92557ba3f4d3 WHIRLPOOL 02ca8ea0d8d864ad2fb94c2d8d36ddafd7a91195d08c5f30579893181b23f08c4a8821b2981b70dd23edeb630c7cd0869de8ab1cc7e7c85413e499629e2abab7
-DIST whois_5.0.11.tar.gz 81195 SHA256 7f257a3104b14b7fe17f31a7b873e50c590df10e46cbab9942f9ad0a4a49c7ce
-DIST whois_5.0.15.tar.xz 69696 SHA256 e50aaef420a7233929cbaa862e78a7c5e363e661746490adc4b71f2fe44a19d9
+DIST whois_5.0.11.tar.gz 81195 SHA256 7f257a3104b14b7fe17f31a7b873e50c590df10e46cbab9942f9ad0a4a49c7ce SHA512 7ea67bbe7633c28db2691bb29ecb8dd8c6f371e8aee70e699bee8cc1541655f28d9700c8096382e8eb6254f710c1ab4698a00b9a03fcd359136e3d1b24bbc242 WHIRLPOOL 4d6653c5037da4ed83c4cc2f5300f1b77913375bbf9deaffc2b9b534a19084d3d6cb6d3d0a7f679a6a2176a559ecd3ee46c322a6d575e795a5f2f53584761a57
+DIST whois_5.0.15.tar.xz 69696 SHA256 e50aaef420a7233929cbaa862e78a7c5e363e661746490adc4b71f2fe44a19d9 SHA512 d920d23b1c347be442c7eba72f9ffd348c891ea558cd7e82c810962ff59817eef723fc5d6de7e5b22161b008a6916ea5e89eed2b4461ecc31d0124b1e791454f WHIRLPOOL 9dd862b97b8f4ed15a05d6400e5e2ec2a76567cea1d3a0353e92cd66fa9aaa2ca67d644f9c6847c6b6ad1e373ad071bb414293c37ae36a59a27c0ad6bd92ba7f
 DIST whois_5.0.16.tar.xz 69812 SHA256 b628be5bd5e7527b7695a2e28508d61989d8b1e57407d3215ff7145e2070d604 SHA512 6029953825a4e7d8f8450604641fda16050b122b43a56f1bca271ef82ecef7dab48ae77efdfd58bf802671364ab6694fa8a2c0ea0e1af4f0d9762a99b0a4879a WHIRLPOOL a32e546aa70c5b24a014773843b255a69d992c49494a9b59663d1308c8298366c8f9efba405abb16458065c5d722763d4a832a4a259dcee9cbd5361831cd2d21
 DIST whois_5.0.17.tar.xz 69616 SHA256 b20bc0e80ea6594d82e004ec02ceac0ce663bc211097c221c550080dca2c0da7 SHA512 ceddda92c8cbf8b44b45104d581f69c931e15ab66a08cd27a7075ba36c2d5fb1720ee5cfd199b0a54731b2061623bbe6629992c711bf8bb5981183a1cb0ea92d WHIRLPOOL 1df637e4c453bfc670a25d0e843c90af58938d807d852e87b1af912180fe2ba6db3ae8f09937eec24544da44c600782c42018d05c38f0160786f6720c3b019ae
 DIST whois_5.0.18.tar.xz 69664 SHA256 e3bbe5fb8c75551c9e49aac5aa91b01f3da8def5bc76a7988f2bca5b07373053 SHA512 e29eea71c5074fa4abe565760ed9597435844ac081ba9ae52ab7f20519e283327c37c6069eabf657a9915a26ef3461b7dc727f4ab2034b7c6db213a626ebdd8c WHIRLPOOL 71ef337c1f5f1c580f535db17b7e25e4cace570002a39a26ea7029ff44f8271fe24e368ea1e16e9cc770f58c0c12b342df6697e9d815cbb181900ddbca18f58c
 EBUILD whois-5.0.11.ebuild 1342 SHA256 9323e879512d14acedb28ce5fe650f4f92cf895fad2a1f9cce27c8aea35eb209 SHA512 9afe31705cc2d60057c83b7a6a81049160e2768a11e6ecc08081485bc389d0d4199fb9cb072017805236664a03f7545dce6f605de4af1349afb8f9a12a878746 WHIRLPOOL 94e10cf840d1504b13e7c13b9b2a329f56031e1db8583035a0c3fb9cc25907380d56c4fca2c9a94478e56af317d8b3b10e4db1e9c6504501fd551d801a41ec61
-EBUILD whois-5.0.15.ebuild 1374 SHA256 4fcc2e77bb7269bb7f3e7b8572158f561318ee3dc29970f81971001081016c14 SHA512 ba7eef3737334978a01149d393225e75bf43f0e9b20373f036e6c50298d05eb0f9156163c265492ea3ad3ba3549f9bb0476b08d269a34ec78df416676cc23095 WHIRLPOOL a28a72bdaa328ec8476cf906bd0145a8b1af437950699142a71938711d603509158648fcc42e26d792a5fcc50f8320e96788d54feb72d6159878e6a72eb72442
-EBUILD whois-5.0.16.ebuild 1387 SHA256 6af2eba4f6b8b403dd0c52357687c8b9eb80b887175113806d520ed62376fa2f SHA512 5ada6a449649620575038fb891c356c11a8b6bd557da1b01b0f3016f455b12cdb62187fc9f3c6b1f00b6e3a0cdd9fc7d67285c355716a24ce1348181524acff5 WHIRLPOOL 112a64c0bb59d99d35b104cefbf99ab7727c81041ac62db12918459024b0c6cd315effd0f1f595ef67437c2b31e7ea4d56950b23556b8887b6c38e263e4cc2eb
+EBUILD whois-5.0.15.ebuild 1521 SHA256 028ea00c8a447bdb495200e9f4d85f640d9510c5ed03abb7f8385542018a50a0 SHA512 2ad58f768a2195e0fb3f542d25158a4b58511d535fdfb3e07a080e60e61f23b0d36b65605af95bad912a9df9d337c41554a7ae753b5c12a3e0a4737fdb46cb2a WHIRLPOOL dcfc02a68bdadbfeee32b96580a4e21a8f392b59cb9b01c4aaf7ef98ab14128fae66e17a0c11b9776e4d8f0e94deee2df8c4dff70379b416471b5988827ba5a6
+EBUILD whois-5.0.16.ebuild 1532 SHA256 9305e0ac60283a30b4bd7df9bd296c864fc36c3143eeec24473d30808624ed5f SHA512 fce73c42257de4e3683047f97c29f74a2a79e8fe6df6c657a10953628eaca52f21a4d726a921d245c145ec42fb3b16af8be513882a194d86f11721fcc62ab4a8 WHIRLPOOL 7bf82912f28de2a233a557a215865745efd8116f0a34b3c78e664a2ce86a9b8eeb5ce8d02d1b47c49697c01e2f351ea3aa73b8b8c254091deff69ae2b8c62f74
 EBUILD whois-5.0.17.ebuild 1618 SHA256 e2082ffc9855250bb7df974933c8b88d13f07f8562910d1944a91c72df752868 SHA512 c852fc5f657bb9106dc73c793a5c0b22aa0a7690c6391836f8f6bc52f014ef1c7a40c7bc0acb007a4258107368d6e041fb78b3e91e308aacc0b18e4ad85fe8c3 WHIRLPOOL bce6bb34ffb716f22fe1f325d5cbbd28765cf329ba1609abff82bb6144936c069578955b520dea84fe5114c6ef6e4566ca0364df05b9560b0ed0da707e28a56c
 EBUILD whois-5.0.18.ebuild 1618 SHA256 6279b0d01dd70a841b0ad05d9ca67adc1ea29687d0d55b273985a83cc5e73e42 SHA512 7e8f8528af9b36f52d9bbf98dab9a4f2e70384a9a6907bba01f30add7f9352ce0fffe69cbbe1df002dc3d8265b069ae3b83d869a75aabd379228b678d9fe9297 WHIRLPOOL f7bc16d184ea8c6435f267f986bdf44c7484d24907d92bdd3f70abb4b1d24d6a98cdc6a7c3e783726ea8078410133f5dd46b30400b6bfe8493052982ef310160
-MISC ChangeLog 22463 SHA256 6ab9ea55cf51a8eb4d172fa646040dd7a4c1db2ed559c6ee9a3e41793e6327ca SHA512 d3cfa18a367aa06872a79249ae01e5ca566aab069995e12d92ccbbc10f6a86e6a4947d0eb1e1c13c4ad9f3dcfb88a915806b5d89e75ed09eb847dda1e221162b WHIRLPOOL 5dac3bfe5678e6156e3fed7afb668582c191cdd3b56fbe2ec11e2cf51129f2ff4a1e94eb481a9ad54e15e7a626b3a4220faceadcb95b9769c1ee6f675c5a2e4c
+MISC ChangeLog 22596 SHA256 da95752f58a16c5f3037cc366bd73232907d991810c8afd5ec829e4ecea4687f SHA512 de0fa0f9104a0be70c2eea2dcb8cfbc3b887e172ed6adfba88664009522208def38088fbcbf182fe1702de809f30cb9cdab4c0824e8771ac9b2c8feaaa2f09b1 WHIRLPOOL 6a444868a6e95dc1793cdfa52deac6a5af7dee059cdaecf18f34ebd98d0416018b666203665a10033318a2f0a7c87d4d80e1139428e51a99b8888e6e520ef891
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQEF6QAAoJEEqz6FtPBkyjo/0H/3yY++THhWTLNNvvRPlFtiLc
-pzG9evJWGacJ3Ia8wF2koA6DA/1QXCQxDfPSq73/3hBwpxnMrzwRJOT2wsarW5BZ
-tW29NRVMnsUC50UPOaPukd5K8O9qELMrRIM46wW3QvWIY2rRwEPy/I2bGSt9afyF
-C1EGWdGw5vH1CMka95naR+2WWPYnUmyWFKr0WpDHsntmIV5tvK0THCwnJnqgGK+e
-b2vinyApPrZcKgHHtdpRrTq/yb2csZoa1CGplKpkw9TJENOrI9hueXc0YaiGLFkY
-i19Y/gP8v9mV4UP/58nvLFJp23GjHyV/l6vx4kZMMp3l8oW4cPx7MtVMwK6uFeU=
-=3UJ+
+iQIcBAEBCAAGBQJQMClqAAoJELEHsLL7fEFWWgcP/2f6yXQLQwjBC5xcN/9/kGAH
+R30DBZ1dZ3pxSyIejBhBYqpUsKA9ETXMF3e0XaI8ALDLPEueLFXcyhVm9s/VIdde
+llLwXyB7Ccu1/YvnqLyG9OYx/yDUFedJcVyIPe6jceMhZvXuscItJ08SWq8MJfwC
+Kkhxz0hzMx/MN8snBOsVZ6FAZhz1peuBxp/63LANYgnhySG1JcrlnzeBHPWIO3Mz
+71a2NX33iBOk1O3KZ5+WLSP8bBUMw7o1qryH7iLR8jHHaAndEv1Dg7LFaJleAGfz
+Ejkj8b6scvwwB+1xtLOrHPvU0EnrFk3iyClqwluItAlUHyOS7ZLVwIsTqqibyDgm
+qEePD8KlcLUTv8FVsiLTLhkP/r+c5TxPmk0hjIJg39bIQ6JoaBsk1GxyzPZHGB/Q
+Zt7c5abFG8+NgUCiP254bZl2IKrv+o9+X/+hwdIdGzIThyHYNWV1rndc/fZH76b+
+NNnZoXfElAKGa5DU++FTDUPnYNNaO9/jC5a6GBQ/CvO6mGpA7d5P/edrjQdzdaJn
+raWmQ6UlJO5CkXJIhWzenixA2poKfa1DYwZ93FDDKSWYmvHdF2I6jTllCJIdXPDm
+JlD4u9c+w2G/1/rerFbcmvXhus5eY7qn2eYCyc1nl8x4IH5pZNjg501YjRuag+VM
+iJPnygz1ODjIs+x9pFDe
+=Yzar
 -----END PGP SIGNATURE-----
diff --git a/net-misc/whois/whois-5.0.15.ebuild b/net-misc/whois/whois-5.0.15.ebuild
index 16c28ead2cca..3503fe9400ac 100644
--- a/net-misc/whois/whois-5.0.15.ebuild
+++ b/net-misc/whois/whois-5.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.15.ebuild,v 1.8 2012/06/17 16:04:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.15.ebuild,v 1.9 2012/08/18 23:46:41 vapier Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -28,6 +28,10 @@ src_prepare() {
 		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
 	else
 		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
 	fi
 }
 
diff --git a/net-misc/whois/whois-5.0.16.ebuild b/net-misc/whois/whois-5.0.16.ebuild
index 88fbcc178350..f4b1de8497f9 100644
--- a/net-misc/whois/whois-5.0.16.ebuild
+++ b/net-misc/whois/whois-5.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.16.ebuild,v 1.1 2012/05/01 14:19:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.16.ebuild,v 1.2 2012/08/18 23:46:41 vapier Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -28,6 +28,10 @@ src_prepare() {
 		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
 	else
 		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
 	fi
 }