Patching rst2man -> rst2man.py, closing #524474

Package-Manager: portage-2.2.14_rc1/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

4 files changed, 45 insertions, 4 deletions

diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog
index 7b1e75cf61c7..7b25a60f4a6a 100644
--- a/media-libs/lensfun/ChangeLog
+++ b/media-libs/lensfun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/lensfun
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.78 2014/10/08 00:52:28 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.79 2014/10/09 02:47:31 grozin Exp $
+
+  09 Oct 2014; Andrey Grozin <grozin@gentoo.org> lensfun-0.3.0.ebuild,
+  +files/lensfun-0.3.0-rst2man.patch:
+  Patching rst2man -> rst2man.py, closing #524474
 
   08 Oct 2014; Manuel Rüger <mrueg@gentoo.org> lensfun-0.2.8-r1.ebuild:
   Mark stable on amd64. See bug #524436.
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 40bcf005baf1..8c4cd8b55fc9 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,11 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX lensfun-0.2.8-build.patch 1898 SHA256 ca4b4c4431f10b3ec54a97a02b582f558c135d921d9667e6f40998bae56336dd SHA512 1794a5313f06feeec5d2bcd86338f5a2c500bf80d34d6cd92db3402272b0c385965b4c36cc0fe7ce6aa54bd7f523a868f52b9d61919fb05d7eb2b343adf532c6 WHIRLPOOL e7eeb1581ee56a6db95c8fc908309a379a96af33d9a26d2b916801c8a680174beb4385405a51df8eb37001bdd91cc92a75172bcf8012faa7eec6961e5840860e
 AUX lensfun-0.2.8-r1-build.patch 1343 SHA256 ed8401c6ac26c637ac7b8860f51033a53a505bc1be1c394b722d91a429f7133f SHA512 4e71b37cb24951091379bbcfbace9b7b5f5b3b402254e79baaf6e2cd7ee89897bb332b47328878c33889aebe99dfc601dc876edfb795fae31fe92c53cdf0f750 WHIRLPOOL fcba03641c0ae3424940b03c62eed5fc52e22e7ebbc09a7ef891e17b9f6397209928418c27f3af9c025a2745a0ee61e109c5bf67aa1033c3688e9670321e5af0
 AUX lensfun-0.2.8-support-clang-visibility-as-gcc.patch 733 SHA256 f0e50a5f3e813c75c7dd6c21132a1a9b21b807e5d4a46b66c9d04c24f055513a SHA512 1d8583132bbed9f155f508a173f0a56459113917f51d8754bd41d77f8e757ad0af721f23b689530470bec1089004bd0d19a9f4cf88bb3b865d35b005b1bac80b WHIRLPOOL 1cd161a7cab59d1ddfe0a94fd85f9846b6d54b23d5f9251e1415bc31217ac649fc6d6270e9da62be79d3ea49b809dd4a004395c29acaa534f3557da79f1faefb
 AUX lensfun-0.2.8-x32.patch 944 SHA256 54d7b5413d39d25776e1a9a87171de132814652d08b0b122de41cad95110b9a7 SHA512 6b21eb3cf3f84892b27eb76bf6af39767cca061d3762f019280961157349bb5829f6a61de8b6879e886471db3b47d3395bafdf043b4829428092f9eb90514a2f WHIRLPOOL 1b1010acfceeddf4532af5e7b8a12d7702f6c503a972638547ba4d84ce607c2a2d1264c93f5433efa0567f3d486549f0951e48814c6810bbc2cd1c2cfaf4332b
+AUX lensfun-0.3.0-rst2man.patch 1112 SHA256 2880cd8ad47f8c310b9cba0ecfc6193bc788d6db16ad9232b224dbe1809be0da SHA512 a7017f968333ffa3bfe746600b3c30dee7d9a288fb0a758f02ee03547b9ec23f364a04e9322984748c8599bd9976dbc6dde9f287efe3d668e6260c5a469ecb1b WHIRLPOOL 5ec38e9eb53efd3d1207f9487b670823c63f7e6530f63dee93630199e1262ad8464dac43232337fea4b709337b4e4e2d340b6b0d3c02b138828db729116cc1e6
 DIST lensfun-0.2.8.tar.bz2 628913 SHA256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48 SHA512 46fc545882884f806e3e4c8c49237243123f1f463379a4161821f627eb63b61815fcfe9c19f239b733a311c2c952e4a652fabe2d8e351e31d8157a5f2600e284 WHIRLPOOL 84118fe34e9a6984a5567546daf95ab7e5945e93efcfb45bcd86a157b6b20f3764921c53cfecd9419c9cb0205df8e940f61a828ae575f76bf12282b9b4fad0cc
 DIST lensfun-0.3.0.tar.bz2 636694 SHA256 c2c3c03873cb549d49d42f118fcb0ffa95d1e45b9ff395e19facb63bf699bec1 SHA512 2b0a57b3ae48401908d51372814424c1076d4219400935990af917f131e34261c44122773114c045a39db9062d6a0146cd44e20e3942d2bf3c281a5cc1494cc7 WHIRLPOOL 898b19dcfc70e8721bba45a8782f9e33a17180ab4ce21eef06b874f1bcf76bc0cae8231fdcff797ceb0bdd086266a42a47ebe6d63d20d0595aee11bbe713484a
 EBUILD lensfun-0.2.8-r1.ebuild 1341 SHA256 1e8f84ec81d77b022b9c86d9ecdc5951c8413a8c01d663a406e9c8d6be2a9985 SHA512 0d84dfbd8f996803824742912f225b63a3c9c206beb6d1f3236487f215175d2692a97e6f40f09c2e5bc2be838d78e94a41f5405bb02deb519ad2ebf148705d6e WHIRLPOOL 678712618468de6cf40c431149dbef0b90c94d5a24fc9f55cec7dfcea22f84952ff75646c00075ddc88980321463ff992a55fbbabe3ff351520459540a7b4c23
 EBUILD lensfun-0.2.8.ebuild 1275 SHA256 45c1763e4cec962f62d12ce88b5130409b19d7614e0604cf2dbed78377abd262 SHA512 ff83b68c3ace9f1da0967dd1a31409e3343fec3f0a2327f0d9985476529f42f5093ed94d7b7150a3974244dbe9fd1c472e3022dea54407ebe621a2c67fbb3d14 WHIRLPOOL 298546946256fc620f5ebd5b6b32df9e23417e879264ac7bd0e941b2da682a4d68c369214f8c7f36ba96f2b6fa53ccfa645257c97469c28254f9336655c81425
-EBUILD lensfun-0.3.0.ebuild 1234 SHA256 ddeda78cb0dc3ea3e10fe44d25e99993c95aec690a54ad6bffd65ab54bacee86 SHA512 b40f7cdcb405eb768c8051b95341fc8634ceaa17bae933ed7223d624c2100f3cbb6e2fe4e51c07262437880e1ab0bd1563b56a0dad985b1fff4c2ddabe0723b1 WHIRLPOOL bd4581e0d6953883c7a6edb73f1aad6435862f5a10a063cb991e5ae38334235848b9cd6ed75928d9634f9718b640799f8836a85581f4fad7b2bab85b83ee14c9
-MISC ChangeLog 10354 SHA256 c3f2d81bbb852fc5c8fc9a8d41090e19e30a4dc697b0076d6236e31841e0546d SHA512 672225d7af10d8133f8fd5491ec1e0bc47ae4cb4f5e9f974504b16f02ef593aebdfc69e236982e6d19f79ba75f311fefe952eb15fb5fffd8dbbf61150e8d3dd5 WHIRLPOOL c57e26be9908cf1cd5c12a3618edad1b2bde3d243b8835c1f8efe9a450167f2763fb0a427448fd1e06308dae4e28ce8726859fb115bf61382effc4e20f7b4c20
+EBUILD lensfun-0.3.0.ebuild 1280 SHA256 3c1a557eb59adcca91ceee8fe3e6231c7ccc0088cc2fd57546cd6460389f4952 SHA512 c232be5c48e9cc9a3fece30f216889e7c6199eb649935c8f256c93c3900335bac542a0944553acbb41717759968a517593b0507965d1b36b596a8ff1132e8a4c WHIRLPOOL 2bececb9373ae618ee5f91a4e88709220dab33d49e31f861d44a8e9d3aa1971dd373c550fa8738644f734856b429df6aba37d034bfb9d81e299551b7f9511ed6
+MISC ChangeLog 10515 SHA256 217e2313c139f4da6976bc048e2bf5f7ce9ee769a69b33fb21f66df3d9aee368 SHA512 0100ac3c74b82e607532f6f060adc07d5599e37a8bf2e5a1963848e0e2c1cb406cabd07c4ce453938b97b52d5dbdfe81ac23928a296eb1d629b2cf3fccae71d1 WHIRLPOOL 63a53f0bf7d625820352a3ee5a6dffa93fe7e358afdbd0afdfb7dda3649f7e1978da489d4da79c58677edefccd5fab68577b59056ff0614c92b46c973873af04
 MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f SHA512 3735e2c7fd32e4b2309ebbfb2f8e3107698a5d722fbbb712bddda7dc665af5d994e8f213c06e247ff0fa04f09f209be2cd4fdac4ef218c5b60c99a65334944bf WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJUNfUuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2M+Q0P/2MNhHam6iKFYCJO9kshibii
+DxHsxSP433Vug/WEQUJIrW9lBqhi7um3HzkuHh+daisjimxtauiIP4amKroln010
+o3aYL2dVl6KBhtskeQ8etBhDZQob6oTxWnHfBnYxoPywPhyXAi6dxhlPuIa8E4Q8
+1ZNV+jL9pl0EaMWRL5579HNwHIN8+/Aj3QW9aD7GgzZcjtA7v6ywH67GCiXz6UDd
+K0Ud283Aw8Xa81EBEuOrmDdVsxfHQ+EOMo7FGAl+/gEz52+xasu+E722zMayIq3/
+9VKuj/qmcajMRBsV9Tse4Y+6t7eo93w1F9ESXAgDxDJEQtFQCy3J7OEXAEDN1cBZ
+B8QLt8u/Sm6UEyp5XHPFYWTg2SI+lQ9jCdeBR2//0Fxe5QmN9oI1nVLRJ0/ojBoU
+d1r75g239RUWZJi5F6OpfQ7LHSwARX7IGDjDayg35yjtwRxH/D3kCJ+Czh3bzL6o
+RDmxRZ7d7vLpCY703kwVEBvEPGwLAxgr34tGogtHMbw9Q+0hV8h3cRBNvmw52xSd
+cCla67ReDL40kTkb/UwPg1tpT6Ky/V02XMuYOBNGRsOYjzxjq7UFE/suKHt0FylN
+4k2HHvkyRWJekjVp5DKw7TiUTtTEVNHE4fK2GEqiWKp0dVAMjenzrZoBjcA76rrQ
+7aTuoMUG/edGYsWoaPj9
+=6fSn
+-----END PGP SIGNATURE-----
diff --git a/media-libs/lensfun/files/lensfun-0.3.0-rst2man.patch b/media-libs/lensfun/files/lensfun-0.3.0-rst2man.patch
new file mode 100644
index 000000000000..1f2382feabb4
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.3.0-rst2man.patch
@@ -0,0 +1,12 @@
+diff -r -U1 lensfun-0.3.0.orig/docs/CMakeLists.txt lensfun-0.3.0/docs/CMakeLists.txt
+--- lensfun-0.3.0.orig/docs/CMakeLists.txt	2014-10-01 00:37:34.000000000 +0700
++++ lensfun-0.3.0/docs/CMakeLists.txt	2014-10-08 15:50:44.135182005 +0700
+@@ -28,5 +28,5 @@
+   TARGET man
+-  COMMAND rst2man ${CMAKE_CURRENT_SOURCE_DIR}/man/g-lensfun-update-data.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/g-lensfun-update-data.1
+-  COMMAND rst2man ${CMAKE_CURRENT_SOURCE_DIR}/man/lensfun-update-data.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/lensfun-update-data.1
+-  COMMAND rst2man ${CMAKE_CURRENT_SOURCE_DIR}/man/lensfun-add-adapter.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/lensfun-add-adapter.1
++  COMMAND rst2man.py ${CMAKE_CURRENT_SOURCE_DIR}/man/g-lensfun-update-data.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/g-lensfun-update-data.1
++  COMMAND rst2man.py ${CMAKE_CURRENT_SOURCE_DIR}/man/lensfun-update-data.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/lensfun-update-data.1
++  COMMAND rst2man.py ${CMAKE_CURRENT_SOURCE_DIR}/man/lensfun-add-adapter.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/lensfun-add-adapter.1
+   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
diff --git a/media-libs/lensfun/lensfun-0.3.0.ebuild b/media-libs/lensfun/lensfun-0.3.0.ebuild
index 994706d41abe..232ade229b12 100644
--- a/media-libs/lensfun/lensfun-0.3.0.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.3.0.ebuild,v 1.1 2014/10/04 10:13:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.3.0.ebuild,v 1.2 2014/10/09 02:47:31 grozin Exp $
 
 EAPI=5
 
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+PATCHES=( "${FILESDIR}"/${P}-rst2man.patch )
+
 DOCS=( README docs/mounts.txt ChangeLog )
 
 src_configure() {