Fix the patch to use space- or tab-indentation matching particular input file.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 25 insertions, 21 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index e529302f4e81..328281cec809 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/blueman
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.25 2014/11/20 00:06:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.26 2014/11/20 13:09:18 mgorny Exp $
+
+  20 Nov 2014; Michał Górny <mgorny@gentoo.org>
+  files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch:
+  Fix the patch to use space- or tab-indentation matching particular input file.
 
   20 Nov 2014; Michał Górny <mgorny@gentoo.org>
   files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch:
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 7edd7209f085..07e30bee2209 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -5,7 +5,7 @@ AUX blueman-1.23-fix-broken-status-icon.patch 1174 SHA256 b6fe3d426d90e2d212a005
 AUX blueman-1.23-plugins-conf-file.patch 988 SHA256 58132546cf913af396d189503e7e3aee53d6e626486343757169b6f0ec34d913 SHA512 3016a3a9c29fe65b7482091571f8aa6b49f21ea72181a9c7e559943347957c7554a72df4022c43d41ee4f4a10be82a011a9f1918191616acee8587fb0aa3a00a WHIRLPOOL d649ec459310b108eec4f95c68647f53454a4a69aa7ab24baf262c79e1398cc9be593f59e9b61cc7e56afd1175c2c8aa181db7e13a53b25589a2be5b725b0b11
 AUX blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch 9343 SHA256 6d2cd72f41fc054f023dfeb894bb4049441fc01e6e0f936120603021c305bbcc SHA512 0f264599331b518ce5c6573324fffad9b202b66c993284d907db38b6736a25f3d62d38973ac78adb542381bd0c8d09d710612ba0f373f0ba9153d70fbacb6302 WHIRLPOOL 1e29293f77b919cad790e43391231bee07304d938d44b981a67fd806a392547c8b1c426debf881a0cebb9c0df37e4d43bd97ef237ca76a5d23613e05b20a9096
 AUX blueman-9999-plugins-conf-file.patch 1083 SHA256 a97c052b107beaf1c6615f47809ce08c5bd2c0cb1d2096f61f47c3bdb25af654 SHA512 4500b68061fda3672f2261d8035acbd6a3623d5c3d6836a6e06fb3c4c81f8143fc1ad14ee3109fb159aef8e980f494593fdc3a904294d17309d9ad2e0d6ce0b5 WHIRLPOOL b9d5f52a35ec6fd2cfef9b06ff98b3834946412859b30d187f598c883eb8ad235276f60b6cc3cc507c456fd753467f354dc47fd70bf717cce6983d0406920b5c
-AUX blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 8675 SHA256 11ef875a9475afc1c28837c4911d4e62ce218b6ef841368d6f53f269858f3503 SHA512 3acae778387776c7360a2109945bafcf217699210ba982de280d98d1f13dc8159404a7087f764c2cc0060ee7b0cfae273469973db50c16e795a704b9366a1ac8 WHIRLPOOL f093ac61f602f4f55598bd1e248ce725163247f1b51145ee3ad48ecc6edf7e0ddde560bcb4b0d4c778ca81e3a26fd6271a6bfa1856d786c234ca33860b47525b
+AUX blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 8655 SHA256 f6acf4c846d3ccc1168a9dbc7fb31ecebae7488e544cc9778ec15ec5b468d23d SHA512 7d3834476d3a82e05853404733b26408fad76a6a4fa809f7f4eeb2de48fca7820a98fd28022d5e92b401c4c80ff1ea2992b97550172ac4dc4b433a840d32d355 WHIRLPOOL be7a9785a7a80b00f5966423585ace349effbc75a7ed8e77ce251809b5c3a9cae33636274e78175ce9051e4af30c32aca8f29499a7eed32dfb69336568e678fe
 DIST blueman-1.21.tar.gz 1086099 SHA256 86200dab50b1595c9a9537586c07de90ccfa084b954bb74f3e8732cc000fe3af
 DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011 SHA512 529a43dace73bf362baac69404a9e87d14f5bcb7b07b18194434c7a6c1dbc22f8fecdb4923c92a77b65656405a492b9e147e77cb7a161df4a93e8b78a003eba7 WHIRLPOOL 4070b4d86cbe743278730e4ee3022bcfdea590b5b76e545cc67912a3498de993ed0c62cb67ac2cd3ad3b8e3c17c5d5a8b1f8fa6e214234a64a784146c6d6d542
 DIST blueman-1.23_p20140717.tar.xz 1679284 SHA256 3b4bbd68e6613299b7577e6a73a9efb86fa1ee2b033e0eb5849e6acd61135fc9 SHA512 ce279aaa7ed85dedc1329534c99f0d660c00c1b887efb543f7b62217bc329c03d400f60847e01b1a25ea4dbbad8f67077b865ac484d88e0e00a4791dcd8c4156 WHIRLPOOL f1b01633062c6a779be6755e039065d7a3ebefefc26025ddc28156968ea1b39c7509ee05f077d574786293d999d586bd2e0ca1eb18da05cf3593b06b28110cc9
@@ -15,24 +15,24 @@ EBUILD blueman-1.23-r2.ebuild 2489 SHA256 fd282cd7921d32f0a22b5ce016523992f0e429
 EBUILD blueman-1.23.ebuild 2319 SHA256 948090096730f2c9440e16e6780b43cf123c507108ba032d502f37de01e0df7b SHA512 c986c35ba5a758e2dcbe574ac92f1fa00477ab80d809f1820b6d19b9afe040af8d3e30790b13b5272e3b9145c6e5ae4ab282c306e1294db9c0713057983dba46 WHIRLPOOL e03e593f21e1aa2588c9795a1f3bca6d1512982a3c56596ec7a9a62b8b06068d64367f53049cdabc3a2853e88fed621f2de4b9406bfa6d531aa7267624265c1d
 EBUILD blueman-1.23_p20140717-r1.ebuild 2656 SHA256 488a795e884388ba01494904da4405d80bbf99e747ddf23fe20f060a5f1add23 SHA512 26ea0ac9098aef1dfe6532e2a3b6131594867bbdbf6fcaa29a3d89ce642c849099cf89eaa7794157788369123897e813e01cfabdf2c7567ed09c1384752c39f8 WHIRLPOOL b00cbde4581501b8fa16dcf629d0e84a950bd6c5c6c7d043286244aae4aaf46617c1be550c8963976ed0ccd3996b8618f6c04ba754c32b71192ca42bb933ddc8
 EBUILD blueman-9999.ebuild 2547 SHA256 bc28f8de1700dc825333c18a47683d7197f088230cd71ba6762434c09a976748 SHA512 a78a9aad609abdc277651c18ba9efaab64fa8347cf80fce11cbf89c690c397e4322623728bb6e7e39506f5a7f3953d441007c19d3acc863de6074c9d4bef33a2 WHIRLPOOL 5ceb961be1626a5e9318e7c414dab9545b83a981a31042b87b5ccdbeab25b3b909873a2d315b52a833c1d5b3d5b0bdfcde269b7584ab32f0eb19fcaed1b3c06b
-MISC ChangeLog 5209 SHA256 18b6c34c11c262ba17542fa3e79bc929112d74ed6a5fa940b51882b12b75c0f3 SHA512 b4e26a5b08ec967ca40c1069d1c096df8537054bfed7b4174df1abb61f79e6e626d8f8f7d00fb20c020427d542d6a4ef20a90c73d8d45fb87dd596b73c4c919f WHIRLPOOL 72848dd214741ea1a0c11810740d2af4469241775db29e734ef8731d1fbea8180de89998bf3401256dd282884cdd70687679c4ee6895fa9123900435585ec46f
+MISC ChangeLog 5409 SHA256 a72a27f14122e6334403e0688b58a4b909ecaed1578a13e4eb75f1729fdb7139 SHA512 710adff1231f8239fb46a8a8e1399418e11f6ae59e6ccd2bc039d97f190a69032aa632a09fe811e7b28dd848712cce2e3a3d27adcc5119ff34d868b5a04471b5 WHIRLPOOL c7fbc17b2f8f52254c3c79dfd13a7d30a1be4276a6b206ec77d3c8b118dc854be9684cc1f4d691b5c69960f1fe307cf0e9536ea8bebbe8fe0554407db2c41497
 MISC metadata.xml 525 SHA256 706d61c1400fbeda6ada529e6f1864446171ca76e3c5f9799fc381ea5ac834ac SHA512 ad18fcc5b222c9f1d40c7dd30ec8fdef2d2756f79743027548be30d1a301ba324bb5d9fb0f45c3a812730a81ed849cd22c8a529f0c987b2f214d133186dc9aaf WHIRLPOOL 9a6b9224077931c83262cd8d9014a36ed3c520cfaddfd0f7bd8f7f2e4683a7b4d8597f839535b1cbada4dc4df8ede7bd6e85fa4ed60697bc23bc6caef364bc09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUbTCCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUbef/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKtQP/iRj1uX88Y0bMtMLwPqx5mix
-iXrIOvpMxCIKeEOHDZUo1wZq+4yX0JqpI5uYdAwmAjPIos4MLpCVtqB8u9nQmnC+
-eL8KY4uTWjur6GMmiHmnnghrB6dbZ9NF25rcBGqRpd4WKCtmg80SJYGTPI+jxIQF
-4dk04IvQ2c0amP5yLXR6NVLdj2lgvZniF3MS8DWUWqzztHWXWg3sDFTYczVS/Enm
-o2JW28CjCV1l7lz0nnrTKt8x1HRsHzjzo2Ax1lkbVGTaoiy9Q7ImWC0WzhXvqwgX
-/HheoXCvnEpmWJ01i77RJC9koKMR61c1c6Xz6tGpqpy1yafopRBL7pm7BQVMrB6P
-KGc2AAzAImijgMBszkRXlEzcCoD3VoCngR+nHOOdx3hZc0eBSQsduGEFcrZj2xZ9
-NcKxZkF1tZqqXUq7zLGEzMkQlRG1LkjWGoHCFCh0LuEhCNBH7mw5cwnQ2eAD4jsF
-DTi5y+GE7uwXnFL9sU3gtEFhpnvdWUySSkLTlXf6IyoRxarS6qbJV6jKBZZJyGO0
-h0q21DMXoJRDcWXoM2aDp6Ww2EEPORHMrwxVAgA9i1GU4znHsLnS3mqWnp41bXYe
-uX02CXsitG7Jeu1CBU6RuHjbxyZuBMQiAoLK17AnkLnZaSds8cOtjU4sB5DHlqH5
-ehDU2aleDdMEMRZbo+1v
-=79X4
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO4JgP/0wZ37L25WWRMysYNK0p1FBD
+zRyHlFLebGiLQIkdDaVlkz16mNQ+a9Hp0AxP281ShQqieBDQdvieXdRTQuOtjIuh
+5wZodiD2p3reihIpZrCLKV6RtvkPUpaHVSnClK+SazIXYtYyJp8hmvuakUbORsP8
+7dvNA715zhdD6l39BXNVNBUVAPd1uWiWcKm8+FKvSKwHfvAwM3CEnKMBE5dL3TH7
+L/kP13PIqINnCPCNB9wlDxCBQ5Fq5fKapxEqC93w+HQklm84tZOdkzUP+uCk1k14
+6fsl8ISvDozwbJVTUE7U7mMU6SgLzV9brVGa6SWlCrTpeWbjUNROb7p3Y11E5hGK
+hl3jTsM0MHw+u0b22GM0AI8DWEYSSEFOazw9lIYv1+McHhuXPyg2wmRyych4R8rQ
+hTEU5W8qwLMZL3idh+fWaCw+NXvQ/62BcLcbqZMNBVxiPDU/hfPNNoTHjtFdPQi5
+A55Du3L6L4k4nAN1GNgxOy+QwKjwiIv7eMyGKEceJx7DZ+xr4QzDahRaCCV7d4Zq
+HmuxR0VKEZvGRZYbJVq28QsnzXtQziznRoC+MYzZccemI4hy6I0NgIVFSk8AwQEK
+bz6bLULEIQHio8W1kgFSGUq5H962uW2ulcPchVw7rIE7Yao81xzizcQYJb0zXL8a
+W+1C1AntUZqbajJ8JZ74
+=v8v3
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
index 54c4981cbc5b..ce341c866cd9 100644
--- a/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
+++ b/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
@@ -114,7 +114,7 @@ index ee07e62..e58277b 100644
  		
  		self.Builder = Gtk.Builder()
  		self.Builder.set_translation_domain("blueman")
-+       bind_textdomain_codeset("blueman", "UTF-8")
++		bind_textdomain_codeset("blueman", "UTF-8")
  		self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui")
  		
  		vbox = self.Builder.get_object("vbox1")
@@ -134,7 +134,7 @@ index f994cc9..84d6370 100644
  		
  		self.Builder = Gtk.Builder()
  		self.Builder.set_translation_domain("blueman")
-+       bind_textdomain_codeset("blueman", "UTF-8")
++		bind_textdomain_codeset("blueman", "UTF-8")
  		self.Builder.add_from_file(UI_PATH +"/applet-plugins-widget.ui")
  		
  		self.set_title(_("Plugins"))
@@ -195,7 +195,7 @@ index b44d6b5..4b13e8f 100644
  		
  		self.Builder = Gtk.Builder()
  		self.Builder.set_translation_domain("blueman")
-+       bind_textdomain_codeset("blueman", "UTF-8")
++		bind_textdomain_codeset("blueman", "UTF-8")
  		self.Builder.add_from_file(UI_PATH +"/services-audio.ui")
  		self.widget = self.Builder.get_object("audio")
  		
@@ -215,7 +215,7 @@ index 5fab49a..0dd88d9 100644
  		
  		self.Builder = Gtk.Builder()
  		self.Builder.set_translation_domain("blueman")
-+       bind_textdomain_codeset("blueman", "UTF-8")
++		bind_textdomain_codeset("blueman", "UTF-8")
  		self.Builder.add_from_file(UI_PATH +"/services-network.ui")
  		self.widget = self.Builder.get_object("network")