Format patch with dos2unix, bug #476064.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 38 insertions, 34 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 3c0245d15970..6638da5e6e54 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.252 2013/06/14 17:17:22 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.253 2013/07/10 20:30:55 johu Exp $
+
+  10 Jul 2013; Johannes Huber <johu@gentoo.org>
+  files/cmake-2.8.10.2-FindPythonLibs.patch:
+  Format patch with dos2unix, bug #476064.
 
   14 Jun 2013; Michael Palimaka <kensington@gentoo.org> cmake-2.8.11.1.ebuild:
   Fix tests by David Leverton <levertond@googlemail.com> wrt bug #467720.
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d22932f75b81..42f0b4d03f6a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,7 +14,7 @@ AUX cmake-2.8.10-more-no_host_paths.patch 4221 SHA256 adf64e6357c69d6153efcf0bab
 AUX cmake-2.8.10-tests.patch 3339 SHA256 189bd592d5c7de8f9146858b031cf270b4c7385c02ca7dd7e9e86b87e7a7a62e SHA512 3bda453b07f80aeaafd866495a370895497ee2e11707e08994c5636de451f3d114d26c37e1994058cca87be01fa2f684bd3463f6676b6e1b4d5bb5858d6ee340 WHIRLPOOL 1c0631fecb3539a5e2e63e591a947b7de4e0961e2a43c25e2ee380b7335750ea84eaf84e854e59bfe17c345202cae60983e2dd2b8ad3df80cef83e785160101f
 AUX cmake-2.8.10.2-FindImageMagick.patch 2834 SHA256 c4aefe4c7d962a37da700ee505516d4d056517cc46e95aac994b8272e2cc5487 SHA512 2c4734462b847d7caa8d073cdb51c5f00d7b7c1a70abc5977252ddd74b27dcb8c4a89414c02a23626029f9e79a4210a3a6d59135a7f074c41df9c1eba8bdfcfb WHIRLPOOL e430ec0f104029b42bdfd6636666742e3facac233d1395f82b979722a9a7caf324756a1405fa43b1d14dc96f96a579a8a3e9fa751398cfdff64269983afd69ed
 AUX cmake-2.8.10.2-FindPythonInterp.patch 651 SHA256 bae58e84982de8331a4038fdc1339baa42512ffb254dfbf553d3bf6f04221cfe SHA512 a1c68cc9f24addc771b8eb33ca6ac0d841311b634e5c5d6500924d70678408a666353791a8b2a00013e1b31545ecef6d26f939216b8fe7dcb8b6152c9e89f17c WHIRLPOOL 3c6a3f084d402244d8628bce6ac17a11eda0d55ced3824584284f63b5f1300f89921941257ded395e2aec88950ab65ca80dd9ff0fa6932f7eee908bd4778c688
-AUX cmake-2.8.10.2-FindPythonLibs.patch 992 SHA256 84053943d3d99426ed4262d542b87f03dc0e8aaefdefd8d8f95bb7e758d06635 SHA512 b3f1613fd9738fcc8d445c3c3249fdbb224999fdfd4892d5eeac94816300803a14deabc3bb3bb1f47ee8eccc3b669012924ad68ebb26885e2dfe61e997869411 WHIRLPOOL 12752e4f3e745ef1d475e78b7bbe8c0133b092c6b03719dc8e5783868f3faa9d19aada7fd20fa61105ca8ead4289760916fe023015f0802c61b21f53fe5a9544
+AUX cmake-2.8.10.2-FindPythonLibs.patch 968 SHA256 4a2bbd60a2c526387ac8088d6bbecff1cc4399259d737530f2d55a6afd033b15 SHA512 e42713242202409e06a1b0725c6ea0a89c6d623d143e6c06def9681b72516a760ebddeccdf16e141e6b21ced2fb63e42337536afd6ca799e6d6d8689d48037cb WHIRLPOOL f92e7981f267310e471425b9f6595c54bf6df2af3fd99a0502bebaa39d87dcc14e31389d1c1bd99271718ce6b33f837842a0cdb454de09da60df5252f86cf826
 AUX cmake-2.8.10.2-implicit-include.patch 5674 SHA256 25839c6c1726e1eaf65e7fc127a23075d89d304f53ceafaa3c2ac36763ed9488 SHA512 0b8ee9fad6ded237c97667cc4eed4347e287ddf899ed3d0f400a434b988d44509a002fdf7b1efc6e92826476d483766bd8a5b444e8daadc836d3b96c2bfdbce5 WHIRLPOOL 370c375395d477fb537fb8f0db76bd846e375d841dcb4f6be1b5c0bf7026cbc0c6f5a82bb786a6f97819da8c15b060c77ca89bfc0a64f811d65ca04f87f6344e
 AUX cmake-2.8.10.2-qt5.patch 423 SHA256 56caffa73e509b28c7a950fd1346e590751ab9b0e134ec203281ebc5a4481fcd SHA512 f1ec48c01b1747f169fbc835cb25830d2cdc92769397e4fc00fe816b2eb8954d7d0bb77f6114341343ece4b208db83e6b95174b935d788e39de97cfab679ffd2 WHIRLPOOL c544b33913d6e481cd741e0bdeca0e3fcfb682b58ab3b0d4cca59bda08db1c8da0ee66726fc7b589620a8d0d5ccbc1fafb221dfc552ac88fecac6f9219a80fd6
 AUX cmake-2.8.11-FindBLAS.patch 1524 SHA256 d59a2d1fdbab24d25c90e22047569745b6a2d80318d0914ab21c704286b1d15e SHA512 20b4f594a5fee9e20cccd1ec79797d2ac2e930ae2252ac544248ee7825ee76dbd32459ae6b87afd0d684a9a780dd1e1e78da361519dbb767fe761eeff6b545f6 WHIRLPOOL 38e13557dc7009ba422c5e6487b89c9847c2b51fa69c0d02eac20ea8c9d9d212a5b66f4ab9049d241ff0e4ffc23096117592c584b3b787dceb5e225a06ea9d75
@@ -30,16 +30,16 @@ DIST cmake-2.8.10.2.tar.gz 5768373 SHA256 ce524fb39da06ee6d47534bbcec6e0b50422e1
 DIST cmake-2.8.11.1.tar.gz 5886098 SHA256 b7dbb86824051319b8e082d2f892ebe6d5914b4dac9b9ef1aeac5e7ed054b0bf SHA512 2dae5e1a4256b332c759ba077e53fc01f8f7a3927098fbd14807ed631163bdf5286f072f2aff214e759b771c2e2365656db1718a86025b3456173715976f2904 WHIRLPOOL 04a655f46a094de9fdd0197caea990c289e2d7a0bbf731acc16d0925ce67c96b56cc237b6443a50f7618d9dcb07046635de26bf7a59de6ff03d7ed9a0bc7447c
 EBUILD cmake-2.8.10.2-r2.ebuild 5062 SHA256 ea6ebc14c28c352ae27758386775d8db2ec411d1f244f932e8ae1c57532413b0 SHA512 8fe2c50a8809f926ce2aa3222500cc354aa646c6a7ec139a2b04465b43ea2c97afe3568e573dfb726126a69747f340be971f1e83734c2fa469ce4d847d389ff9 WHIRLPOOL eb1c197d62354d8e3dcad0a87235b6c8a0b0738213fa313151c643354fe8600f786a177f06a9ef8ad5c0f8508025a150f3f94ba3bc70f5507451ba68eaeb2992
 EBUILD cmake-2.8.11.1.ebuild 5360 SHA256 a604d2c37f0e2268325bbb169f89539281ba7e241ee0b7c0cacb12aa4f5a6c36 SHA512 0c5e04bc1c62989fe4c075aaa774b8f0ab9cbdba56a4eecb2618cf9f08ef4b8babdb5e5b7087a294463792147085c46912b8bb8ccf92bdd6039edf15969705c9 WHIRLPOOL d118ec283eea8d3823e68c4754b3385cc122103be0b101785fe1c08997a1f4d8b5ee5742bfde59023bbc26b2816c54c51a67cd2f5d6abc78ff843ff0c8b9fd9b
-MISC ChangeLog 40572 SHA256 90a22fd492b206973d349d8abafd64ca88b944b62ef4e5575be3d1d98f322f9c SHA512 0ee5dfa930e8b721de522ff4968e2cc2231b4b23599a3d766dcd87c5c9a7f31c7c850280396a07eef7e9a0bcb2e201314ea0b8c7bc8e9fd6a94b618b66e6950f WHIRLPOOL e0506b2d816399b5fa78d5cab73df00ecfcb78dc34abcf5359206af74f5d50d7ffc7c828a211b8bb5949b24e78cfcd2995cc9e0d24f17edc293cc5eab5a0d116
+MISC ChangeLog 40703 SHA256 8e219e92bd026d0227dd903146b026b3f46929d6ecb65f3d2c885fcd524aed37 SHA512 d42a854111b31cbd251c12502afdd64dcc6ac9024aa1cc38a55ac116f47da2a438436a027d8b3a93a14be89776e77354d86526ae04cff647bec846f062183dc7 WHIRLPOOL efd6c03c5c5c2ffe3dca593f2b07f5f3acb42770d7a7036fe5f0a7d65f177bafa5faa502f8906ff8ca0fbebd563fd68d59b559d68eda3d12e873f631156dda26
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRu0/MAAoJEMbwO6tnXQ0sCY8IAJdW8FTBavfEv7QnAmNO4GaE
-8ji09UWDY7F8cEmXOaH++qgWjVpYEsXBEgJNlFYFJp78vH2zdCgDvMZgIAif8zJQ
-f+ApwLc/gAN15DH5fe438TmVNQIomlwimJ3DwqlC80kcTCLDhKWpU3q7lmZD5ujH
-fWV0SDU4OAY1gcD/7OTpFlel7Qg/wGH2TXooaD3pJpNgpXsRWUwAj1n5POPJ428Q
-atTFnJM0Kt46m2wB39kd/rxEvi9HLgPjSjwtn6q6PqjwSYuiff0gK/5k61+tT4tR
-0VP9brxO5jyvCB2r2smiMvGo7N7JGUJuf/fuRkb/ITzDckj2PiCQhp7lvrqq1OE=
-=E13W
+iQEcBAEBCAAGBQJR3cSiAAoJEO+t9ga+3I3a2+sIAM96ioT9Fq8aEe/hal7p9fQ2
+pcJ9oUmYKUS5uMqXXxGNY+ZuAvKIu1ZCeQMpzbTKCF4LtgHRbhOLHt/Eo1wNvHIJ
++TDsJUQGrOcsfvuXwyuwCJZ+eHrB6ZxT2W1vL/57sHAl92nQmaUmQB3S/mUqg6jN
+XWY9oJyQpfxYl+09Xl3tBvX8ThyQSb2lDrBlYrDKMl+nVOqImqD8DTdS51c8DhNp
+6ZjeoHiy2sHU5jAjwAcdzMUT81YjJdlWj4Y18KcTDfC/XBTC8MGwD1sW8wvc4fne
+Tu/OSh7CMYvimRrpy0n1Z0xDl4zktmCykHF3cv0THqX2U77KwrE1wsDmsd5hWMI=
+=vO4M
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
index 80cc4d38873f..2a83ff7abb69 100644
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -1,24 +1,24 @@
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake

-index bffa9fb..8fc90ee 100644

---- a/Modules/FindPythonLibs.cmake

-+++ b/Modules/FindPythonLibs.cmake

-@@ -74,6 +74,19 @@ set(_Python_VERSIONS

-   ${_PYTHON_FIND_OTHER_VERSIONS}

-   )

- 

-+# Gentoo portage requires that you use exactly the given python version

-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)

-+    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"

-+                    OUTPUT_VARIABLE _Gentoo_Python_VERSION)

-+    list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)

-+    if (_Gentoo_Python_INDEX EQUAL -1)

-+       # the current Gentoo python version is not compatible with what is requested

-+       set(_Python_VERSIONS)

-+    else ()

-+       set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")

-+    endif ()

-+endif()

-+

- unset(_PYTHON_FIND_OTHER_VERSIONS)

- unset(_PYTHON1_VERSIONS)

- unset(_PYTHON2_VERSIONS)

+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index bffa9fb..8fc90ee 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -74,6 +74,19 @@ set(_Python_VERSIONS
+   ${_PYTHON_FIND_OTHER_VERSIONS}
+   )
+ 
++# Gentoo portage requires that you use exactly the given python version
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++                    OUTPUT_VARIABLE _Gentoo_Python_VERSION)
++    list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
++    if (_Gentoo_Python_INDEX EQUAL -1)
++       # the current Gentoo python version is not compatible with what is requested
++       set(_Python_VERSIONS)
++    else ()
++       set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
++    endif ()
++endif()
++
+ unset(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON1_VERSIONS)
+ unset(_PYTHON2_VERSIONS)