diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-10-19 19:50:15 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-10-19 19:50:15 +0000 |
| commit | 45e10ad35d4ce20e20fe6007abc689b381c9cb2f (patch) | |
| tree | b3c88cf12bae20d2ab10f297d210572271aae7d7 /media-gfx/photivo | |
| parent | Restrict bash USE=readline mask to SLOT=0. (diff) | |
| download | historical-45e10ad35d4ce20e20fe6007abc689b381c9cb2f.tar.gz historical-45e10ad35d4ce20e20fe6007abc689b381c9cb2f.tar.bz2 historical-45e10ad35d4ce20e20fe6007abc689b381c9cb2f.zip | |
Fix compile error, bug #521204
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA
Diffstat (limited to 'media-gfx/photivo')
| -rw-r--r-- | media-gfx/photivo/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/photivo/Manifest | 34 | ||||
| -rw-r--r-- | media-gfx/photivo/photivo-0_pre20131115.ebuild | 11 |
3 files changed, 29 insertions, 24 deletions
diff --git a/media-gfx/photivo/ChangeLog b/media-gfx/photivo/ChangeLog index 2b9741b47cb4..92f64805c915 100644 --- a/media-gfx/photivo/ChangeLog +++ b/media-gfx/photivo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/photivo -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/ChangeLog,v 1.8 2013/12/17 21:13:39 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/ChangeLog,v 1.9 2014/10/19 19:50:03 blueness Exp $ + + 19 Oct 2014; Anthony G. Basile <blueness@gentoo.org> + photivo-0_pre20131115.ebuild: + Fix compile error, bug #521204 17 Dec 2013; Markos Chandras <hwoarang@gentoo.org> photivo-9999.ebuild: Drop EHG_REVISION so it can be overridden by command line. Bug #494474 by diff --git a/media-gfx/photivo/Manifest b/media-gfx/photivo/Manifest index 86a7a5c0ba2a..464bbd93b04c 100644 --- a/media-gfx/photivo/Manifest +++ b/media-gfx/photivo/Manifest @@ -6,26 +6,24 @@ DIST photivo-0_pre20121212.tar.gz 2606004 SHA256 86fadfa343d0b9b8c6390dba43ad3e1 DIST photivo-0_pre20131115.tar.gz 3145008 SHA256 cfbbf7f9dfb41ba0aadb6771739d95fe36219f78bd32d340a3908344a0ce82ac SHA512 b98d2dced306325b5ab116c4ba170404a6956d081128095b5315f3b061797290b5a305da73ede9f496659b2b1cc8090cd2f300cfbd311c69db59c8425bd2e047 WHIRLPOOL 4671c62c647ca919973adeed2aceac0570d9f8d70b90819660f8a42958bd514278f119063def0c77e355813a84c85f7199b1fa4182926c4694b4a1c9217c037f EBUILD photivo-0_pre20121006.ebuild 1464 SHA256 597f784f7b7566ca8db6ad2c9c62a3f491958fee7cd605496f756b4a6f7393ca SHA512 142eed3da4a0d8e23ed67f436075594cacdd2c857123ef8bcda97dc9aaf5ea71b0fd8e427bbecab839c7015d725f71527f3053e901548db49af84dad235ad751 WHIRLPOOL f22617b5978cc3195413d948798f23830c2f2e119fcbe9849794f09fee30be44cd867d940df0e0d7822417718c68ef0b96ba46105017551e67a20394071e123c EBUILD photivo-0_pre20121212.ebuild 1459 SHA256 b38f1e807481f2c468a9bd3f2c64e5fedb04312a6524b52792003347800d490f SHA512 ae82132c96a08ac4df7572f08e30e21bc4ca1b9e6cc73192c856e40eccc54dec9104ab97570a3a83b1f69238186baf0726a61de7c15eeb3f8f792d8cf537e87b WHIRLPOOL 49f9fa0a44155ee51cf568080a0b50ffdf79a6bceb55ec127eb9b29defab985ba2875a37af0bd8d4a37fbea207a00b4710381d83dfaa2ab4bf5149791f09bf29 -EBUILD photivo-0_pre20131115.ebuild 1437 SHA256 f7ee491063c2d081e2a90ee9156d2a380ffaaad073a8327a24ba09d343321041 SHA512 3228f485f41e09891c9daeaede4f8f1299d2ff61e46ff955236d71d5d2a31b206d6276d7a5effe6da4eb28f98d47661fba71ea059f0df300311bf4f6cfd90085 WHIRLPOOL b5bc3c36fbe68c2dec5c1375118ac9d7089893585b30276be2598b4926d56e5f05b4b070f93c9923c72d01a9a436bcc95c03a23b437f7ac032b1627b6de1f9ae +EBUILD photivo-0_pre20131115.ebuild 1580 SHA256 5937d93ee3ceafdad0cf49790f73592dc2a95b43e92ca2d0fef17c8ebf06013f SHA512 1f988d767bc36aa7b2aabb14d1e95515088dbf59ef26cb7476024d905506012d8ce6b8588876ae218df7b4a778c0d433bad6def241323ae51f6752acf9d7cf42 WHIRLPOOL a3000210fde466750c6045860e3604248488f3336e5fe10574edf5f549303578d2efc5b7e8e3a1fdc9f45935820fa99070f2d7a03442906b0c83d9fcaf0c2cfd EBUILD photivo-9999.ebuild 1344 SHA256 e50e509030d2f74182e8f9f18c9c29a6210301341475531f77882c99b839b18e SHA512 a68b196a3de4aa1560b7f8532ef50195241f298adc4f83d35e04bb768f15afe3a8d8f28e74de7d28b6a48a978fc58a1a0864206d6c2ef687519cbf3ea1a046c0 WHIRLPOOL 32079b3a3905982515f9c1efd0124288a978e5b66547870fcd7fc2abf9edc82103c6550953b86079e4aa6f8647d6b18c5c93170d9eb0b754a49bd4f21934451c -MISC ChangeLog 1747 SHA256 f2dd141b37c12811cf9f31f52725aa20cea7216c4637a5ea4f872a322fa92cae SHA512 263ee522817869bf13a86e158b91e36e8cb03f30ff66bf8a1f659841e7e242aa804799e269404f5dac764014358f3c9679408e1bb1ab38a33f8619e20f1fa443 WHIRLPOOL 80b9d07e406a3159c25b108b1a5c56810a4fee1d7a7274e644033a08c94ce3b789f6a597c84f8550d402f0b4cd82264f64b23896f73528b87288b8de23acd330 +MISC ChangeLog 1868 SHA256 03e435100565dbacca7466015c3119e9933210a66564e938cdf241c30788005f SHA512 dc5cc6a810d5af360ac709c8f70535ad5eff6bff510d009a152e266f7927fff646e19adf6d061589628038435f68f0dd09a3f3c6c188ed04f4cdadd96feac39b WHIRLPOOL 3e2c72e35a4e871f009b7542cd9537f1bc8995934a2663e4c10ce6eb8e0934380bc02903abf7e9eb62816cf9a2ca55e9f7fa1f025ca45579ac106d430b6d9a30 MISC metadata.xml 420 SHA256 76dc4050a756471d85c8331ad4ecd4ea5aa329bc94dc049212c441f066639dbf SHA512 af8452ae43bcee6fc9d1b0d650058d68e84150cd6fb34f9e9d78d03d8b5367d143d13a26006f74e6d1be16bb62257bd66340c3c82c6cd15ea2350cf8f0091803 WHIRLPOOL d9d78e74766cc9207a980e1a12ed34c43ebabf50f91ed8913faede9517f85c94c9aa1acf53dc799c21d7e8a978e68696127378a7df1c811f4179d378d7b8ec87 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQJ8BAEBCABmBQJSsL5zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun887fgQAJTtLtHm+qMKTxdpDrMzLtfT -h3qtAZtaz2naXVdlFfQkTKgDOxh2KSmQ6EbPYMRyllLQeWOW3cHbzZIX4c4hMZXI -9vqNuoXC5EIx6Ybe8hLPqpplrpD/SV6T73PlBehOPxwk4ADyyJIpMW5eGSHLtYBc -LueHySj0e5Z+6qT1Q+ySdu6av47w8u5RwX42lZSOTBSxX0bntGNsygqkFLKBFsoh -2B58jvVKOHvSwlrkpnft3+mw2nrKLJbB0E+mZwNNmVBazJGEOj4JKp7No+krZkDk -sAAGi/QzQ6GWO5IP5fpKt4lpwpmIEu+DWNqIFd5EemLzwMz5uBizRsVKdUuc5wUr -NGKAMk4uVXBrhZ5WFVfuZiiqwYoWj5nM4RSUXCBvMwUB9/ZhbMM8tPKkF5cPSDNX -Ln/Lg4EDaKTMQEma+o+jylOVzjVaFPZdmfZg+cz1TobYSwaGHc7DlWW7/nmDG13x -YbIcHR61QotV5+4gMqRmjy29nNr9UqN9WWyvet6J95V1m+ODeMW2t5m/VNoixSYO -y0UmWOGFe6qVm+y47nD4VilBzmw392ic7/p3KjSw/ruwKRoD3Z/TMy+Q9qRxUu0j -rdTz9x2FuHlUeoHQpm3wo1PW7xPrFdfagIkt6qfPwbvwLIP2Gp4MKWFXi2YuaEO8 -5E4+odwgEvtoL6K+7od1 -=wVVI +iQIcBAEBCAAGBQJURBY7AAoJEJOE+m71LUu6VGgP/RBsswFLg3UDTTHelfR0xCeZ +uTAmtDZlPQJIbRAKmOBe2IBYxSvTJgw/c5BEMik+r4hlf6ODFZ3RCfMhpjvy0TLN +vkjB6JtEcIQqqzjSHMuRnWjlypKvjOgftePnuoaXrkR09Fij8uTkckpiH14EyShB +CrByoUSEWnP/5JJR1pm0muUPqtYcR6bY4XaA8TVzWR654IubAVECvDj3qdZrVm9F +TH6xXf8YJbTiFY2r3MvruXSFVeAQQNqIEF5QklIUt0ayqDHQCadcjqOGau40vZkl +RIxhp6QTSQ50VnLmplh0nfd/umsbn8ZBDKJqi9dCYGXzgIsXRCCaD4hyRbjCy+JJ +Vq8BYMY44pid7uEs7zsGR+Yen6DRiJoJ1mciJnjUqteZTNMxw6vJdYREbX2O0gy9 +GCSjY7qk8qLCJOqrhs4MPUYn0nZEDpKVdYDGF1AiijdO5ZGTgxBKWRVV98z+RkhE +K5h5nJ4p0zrQCYREXHs3fdTdefvbLDb/ClAAzWCnvT9DODpDITC3jvj1wIamskGT +jpaErSvtLfGzlLo5a5DRWFPP3QtcleeHizCMbcBPBFnG83iuxz3aIzQC8kxVfxt3 +4oUrJ8Jzw63bZZqUfb8VMWFC4n/bVOYxW/TiUJOdgS0Z53XtPbOGngd3nBpiKE6C +CmnkmIIq1kki7VPUqEPk +=44Bl -----END PGP SIGNATURE----- diff --git a/media-gfx/photivo/photivo-0_pre20131115.ebuild b/media-gfx/photivo/photivo-0_pre20131115.ebuild index c9840fe89c98..dc368517ecd8 100644 --- a/media-gfx/photivo/photivo-0_pre20131115.ebuild +++ b/media-gfx/photivo/photivo-0_pre20131115.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/photivo-0_pre20131115.ebuild,v 1.1 2013/11/17 18:39:02 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/photivo-0_pre20131115.ebuild,v 1.2 2014/10/19 19:50:03 blueness Exp $ EAPI=4 @@ -23,7 +23,7 @@ RDEPEND="dev-qt/qtcore:4 media-libs/libpng media-libs/cimg media-libs/lcms:2 - media-libs/lensfun + >=media-libs/lensfun-0.2.8-r1 sci-libs/fftw:3.0 media-libs/liblqr media-gfx/graphicsmagick[q16,-lcms] @@ -33,12 +33,15 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${PN}-${PV/0_pre/} src_prepare() { - # remove ccache dependency + # remove ccache dependency and fix lensfun header path local File for File in $(find "${S}" -type f); do if grep -sq ccache ${File}; then sed -e 's/ccache//' -i "${File}" fi + if grep -sq "lensfun.h" ${File}; then + sed -e 's/lensfun\.h/lensfun\/lensfun.h/' -i ${File} + fi done # useless check (no pkgconfig file is provided) |