From 420eeee727d39d869d864caddb04a80dafda7160 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 17 Oct 2017 17:51:45 +0100 Subject: gentoo resync : 17.10.2017 --- media-gfx/autopano-sift-C/Manifest | 2 +- .../autopano-sift-C/autopano-sift-C-2.5.1.ebuild | 7 +- media-gfx/cairosvg/Manifest | 4 +- media-gfx/cairosvg/cairosvg-1.0.22.ebuild | 2 +- media-gfx/cairosvg/cairosvg-2.0.3.ebuild | 2 +- media-gfx/converseen/Manifest | 4 +- media-gfx/converseen/converseen-0.6.4-r1.ebuild | 2 + media-gfx/converseen/converseen-0.6.8-r1.ebuild | 2 + media-gfx/exiv2/Manifest | 3 +- media-gfx/exiv2/exiv2-0.26_p20171013.ebuild | 8 +- .../exiv2/files/exiv2-0.26_p20171013-ccache.patch | 62 + media-gfx/freepv/Manifest | 4 +- media-gfx/freepv/freepv-0.3.0-r4.ebuild | 16 +- media-gfx/freepv/freepv-0.3.0-r5.ebuild | 4 +- media-gfx/krita/Manifest | 3 +- .../krita/files/krita-3.2.1-exiv2-0.26.1.patch | 11 + media-gfx/krita/krita-3.2.1.ebuild | 7 +- media-gfx/openmesh/Manifest | 2 +- media-gfx/openmesh/openmesh-4.1.ebuild | 2 + media-gfx/potrace/Manifest | 2 +- media-gfx/potrace/potrace-1.14.ebuild | 2 +- media-gfx/transfig/Manifest | 18 +- .../transfig/files/transfig-3.2.5-solaris.patch | 12 - .../files/transfig-3.2.5c-maxfontsize.patch | 44 - .../transfig/files/transfig-3.2.5d-MAXWIDTH.patch | 19 - .../files/transfig-3.2.5d-fig2mpdf-r1.patch | 1425 -------------------- .../transfig/files/transfig-3.2.5d-leadspace.patch | 19 - .../files/transfig-3.2.5d-libpng-1.5.patch | 39 - .../transfig/files/transfig-3.2.5d-precision.patch | 45 - .../transfig-3.2.5e-fprintf_format_warnings.patch | 55 - .../files/transfig-3.2.5e-man-hyphen.patch | 530 -------- .../transfig/files/transfig-3.2.5e-typos.patch | 25 - media-gfx/transfig/files/transfig-ru_RU.CP1251.ps | 298 ---- media-gfx/transfig/files/transfig-ru_RU.KOI8-R.ps | 298 ---- media-gfx/transfig/files/transfig-uk_UA.KOI8-U.ps | 298 ---- media-gfx/transfig/transfig-3.2.5d-r1.ebuild | 94 -- media-gfx/transfig/transfig-3.2.5e.ebuild | 23 +- 37 files changed, 134 insertions(+), 3259 deletions(-) create mode 100644 media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch create mode 100644 media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5-solaris.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5c-maxfontsize.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5d-MAXWIDTH.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5d-fig2mpdf-r1.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5d-leadspace.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5d-libpng-1.5.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5d-precision.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5e-fprintf_format_warnings.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5e-man-hyphen.patch delete mode 100644 media-gfx/transfig/files/transfig-3.2.5e-typos.patch delete mode 100644 media-gfx/transfig/files/transfig-ru_RU.CP1251.ps delete mode 100644 media-gfx/transfig/files/transfig-ru_RU.KOI8-R.ps delete mode 100644 media-gfx/transfig/files/transfig-uk_UA.KOI8-U.ps delete mode 100644 media-gfx/transfig/transfig-3.2.5d-r1.ebuild (limited to 'media-gfx') diff --git a/media-gfx/autopano-sift-C/Manifest b/media-gfx/autopano-sift-C/Manifest index e942ebe8c804..74cd20089cc9 100644 --- a/media-gfx/autopano-sift-C/Manifest +++ b/media-gfx/autopano-sift-C/Manifest @@ -1,6 +1,6 @@ AUX autopano-sift-C-2.5.1-lm.patch 512 SHA256 6cb5c72b476a7f7d8e0068d9dcb0bf8ab0d46bc7fa38374e48d648249d5b3b71 SHA512 35eb8d71f770f25a709599528679ac15e9a90c12ca3c34c1cd1411eaba852dbe9e627e4b8d8fb62adda7e2422c0de493538cbcbf14206e408b9921c895761856 WHIRLPOOL 58676b7aa80acecf25988971e246ab410b9e51018426d44a631d7a30c8d7f65109e1f78d3b2230a8015ec138bd8c14c80ecde91b021b8e76efe524679a93fa10 DIST autopano-sift-C-2.5.1.tar.gz 192267 SHA256 9a9029353f240b105a9c0e31e4053b37b0f9ef4bd9166dcb26be3e819c431337 SHA512 4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931 WHIRLPOOL 95f54d93cf5162b1b88dccb6750ed5b59f88ebbbfa4201d02d0fff14858beb89e98b474465c03104bb4c7a49dc5564fc60d446f185cf0cc9b8012e65d1fac483 -EBUILD autopano-sift-C-2.5.1.ebuild 720 SHA256 859ec1b3845cc8125ec713395caddeb642949abc84a689c33d6c4d0b9fb5c331 SHA512 d08c4e2fe859d9cf1bba338eebe00a64d967e91b5321f2da26ab058889b9c90d464bfc46e06e67961abf2eeb21b2a15fcc8f7f47b7573164e71332383605fe95 WHIRLPOOL 72df83d410a7adfa7fcff03f3199337c15286ec31f7b0fcc5eeccfdc94dd14f4af4c5964ecd06fb11d4fb4dc1e64f437c289c3a9754ba48b45d741b78f08f9e1 +EBUILD autopano-sift-C-2.5.1.ebuild 693 SHA256 64a4478b817ab2c5204f30caa98b979a85bd0f1d8fd134eb8bdd22833308bbd9 SHA512 77b28173a35f5c20be1cb72ec3b26bbaf2eb5e91ebeb41ae9aab988adb14a897f8d756d0809389236e80efd263c7ddf12d71bb18d9b93b506b398548c6ded6f3 WHIRLPOOL 2cfa7980eb4976ebd22341dc68fee9a809b54c71f95d35df7d76935cb01070a097742345efcff1919662ef8ac66edb320bc2e8934bf9fe38e41fd2a83e46af34 MISC ChangeLog 2493 SHA256 4a0e31c4a55d382f836574b9510dc6f628ca952fbf34c322dcc842a1d0f790ba SHA512 43bd20c07d3887ab99b65aaae1cb20305c2dff2c1ec9da2a6837425b99f06f8c123477b893552af365a940b5cf299f3df8e23f5a823995e44da3aa02bf66b6e7 WHIRLPOOL 26fc3e02439d04bb2679adcd6c0187d50ee0fade8649c677fc4aabe242a66947d37dd6cafde4ced9c7bfce1a42dc66bec0dffc40ec03334620c6da6b0f696515 MISC ChangeLog-2015 2622 SHA256 d20e62dc37c48749f82580f0259559a3294e4ce34a6cbefa66b965dbd6e0e773 SHA512 4cf6eba7c332997f38f4c50f9ca49183affac8d1097ae349c80a3bd13b59b01b123625bef9a0fdf656b4ebfa200668ffce03fe501d0e76ca337f30a14dbd2b91 WHIRLPOOL 8183e3d3954c31793ad38ee2a93fcc942a1cb0bb4dbec3099d6c33ac236c49fc4eccd6bd1b33b4e720c5b3c3004f8534473d249cf3b00867024ae228145bbbd5 MISC metadata.xml 472 SHA256 bb08972fa8929d26c0b9bf79871318761fccda0ccc82e5ffc995ce921254c7bb SHA512 28eab06295fba1917784743b7103fca9ce4a54806ac9609172653896426013f0f2b18a6a4428226aeafca8d0a5de6e493e6288985564331cbc3e0a3e3f2fbb6a WHIRLPOOL 95d04ce745c1a22e25d3468449fb1096d7e1321705f45cb32fa5706835ef6f43d6fd7087e816f3d4aa614bbbeba2348f99914ca246bdc8a03f604cf849acb241 diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild index 86f58e7e9b8e..311bb30b7b86 100644 --- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild +++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -24,7 +24,4 @@ RDEPEND="!media-gfx/autopano-sift virtual/jpeg:0" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-lm.patch - epatch_user -} +PATCHES=( "${FILESDIR}"/${P}-lm.patch ) diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest index 4894876f5063..5c8b3ded7409 100644 --- a/media-gfx/cairosvg/Manifest +++ b/media-gfx/cairosvg/Manifest @@ -2,10 +2,10 @@ DIST CairoSVG-1.0.22.tar.gz 30896 SHA256 f66e0f3a2711d2e36952bb370fcd45837bfedce DIST CairoSVG-1.0.7.tar.gz 29648 SHA256 2ccdfd8cdfc6797da1f63d8f15fd76fa72d482d618a4807bb02f0b37662bca39 SHA512 1b10657f1e53b486f624ec00e952c3d2ba2f28b2a5d6cb6f66eb6441e8c51190bd75315e7a537d37eadff5ce4e0a52d3f4ebd7b36d81b2e9fd804ac92f2d83db WHIRLPOOL aa7affdc656444c0558bcc9be9b66fb385a81e33d60c04aad81930041096782ecbbc40a4e26c4c76e1580d882411c3759244c85c23e0671dc48104224a99ba18 DIST CairoSVG-1.0.tar.gz 28573 SHA256 65f613e9521c37066b92e24532f702dbf4b7049ce0fa5fb75d21afa467a38b9b SHA512 26046de33feb5d7cbd8438d5fdf7f0e86e4f252c21478b51e764d7bf7800c8392a11a42a87666af6e008ad1e09f0749b57d06c566101d2a3e630e151703a3bb9 WHIRLPOOL 166c14d1c0ec9c1c455ded7c69c60940d102224c00a9bf1c6882ab1134b2a1eec415c9fe1f82bf9921a84feb8bc8f1055aa38830916dae233783fae551b31cb3 DIST CairoSVG-2.0.3.tar.gz 39371 SHA256 d2da5aaa31ded26affd5cdffc371ec4cc48800bc2d822a9c28504360482418a1 SHA512 b7ad7be9bd06059392f2004e7cd5c1df1667dbae78482c68d681990a8b3a4141a9c4b72aa4af5075a87ac6a1a4ddf8311d991512be98128b21b87d4355c1bd3d WHIRLPOOL 5b6da883f7b6c83574f3ac5c635f959fdc6d547a929b3a9ea8222ef6d0136f4d6c049c0aa65bef98835b0f5a484a5e093e6cbdfcd5fda418c33025f709fdc747 -EBUILD cairosvg-1.0.22.ebuild 716 SHA256 f382e91ba553fdd7527d1ad07d2061506e12df8af995e46e384a8ab8fdd6b7e1 SHA512 d0741930395e262b298edee7f6360791e78bb2e19d9c1d0ce1230a12a4b868a73a88b846957f8cf80cf0341eba88c414aa14788eae1e4bf6a14fa7c242f914b6 WHIRLPOOL 8b117aa3491124bf944cf1d039ea4fba25eb30191e97c10cd03c77693d50cb83495d993ee43653d38d5a3f98c40ec7a29b77051f5a8194ef5eb6d8c6c9a8e2f8 +EBUILD cairosvg-1.0.22.ebuild 715 SHA256 c412ff3f2c056f1ac61ca15f00941657ff4ac0eca404688c65072ef1cf56c300 SHA512 fb82fe199a72fb6c87ce17b0f4010844e7d3409dc42882bbc06d2f84f0923ce74a97b9310c4da62c5f75762185b1e3fc7738a34803c10bcf8e7124952eaac656 WHIRLPOOL 4e8a6801eb77ca434eeb4adc69a5ac9a640c9d024fc0e2ed773f216db5d6f3ed121637d08f5c77784074da0cc16ac7292c1c10cfb4bb9d6f0f477935bc5e2096 EBUILD cairosvg-1.0.7.ebuild 740 SHA256 86b4c9d51641e7d1fc3a4381406b31ca2c548761fd9159ae5dbfcac890077696 SHA512 3df680c2896c5f598af0e377df61c5df541549b743b6f9ab81c0fa1ef8c9c29b70679ef12e42c9201522ad364abfdc7fb6d9dc44fa043a7fa937685ea3b92343 WHIRLPOOL e40b81a33552f594bfcf46a3ec5f7a177e7b548b92f954af272e74586b7b1ed5a735c113ea5d802834d2553957fb93582e64cc88a1dfee51c5c86df5452b6a2f EBUILD cairosvg-1.0.ebuild 692 SHA256 15c17adb2ed227cc80fa1616fdf215f5c2858ad56d8f08235daf30c2e4adfff1 SHA512 cee1307e3cc5ca1838793485ea941ddc0cbcf55347ef6453998bd836dca360e3c3d671c454210edd4914cef5d0c03a292847aecc3399b50b51ba4281a6016a47 WHIRLPOOL 7e90185981bd3b6fb34c26344f686a9ff8ab8086a2b99de498c84f33d799754fd0126609bb31552531fcbe185919657869901d6b3e19c8795d58a51e9fa1b7c0 -EBUILD cairosvg-2.0.3.ebuild 714 SHA256 1da0ce3c3023a729ff291cb3788a334c5a6ff0ec626168ee89b4389fc79fbfea SHA512 19be35afd71cc53ece06fbad978ddffc9700522ae820d26c4735a16c8fde2ae5ee5440619a69274a8d6871813119f89ec82c93c40cb44060792001f073b073c3 WHIRLPOOL 8670e99bbf2e4e324abf95910659ec2ce8e68e730c3bb52157ae7de823fb2a27e2e155323888b6ee6592bdf4d745fe6290f74bbda2520c6abc97d4780afcfb0a +EBUILD cairosvg-2.0.3.ebuild 713 SHA256 5de5934eb8825354bd6a2a6753977ec7cfad56c82460df8e291b360f96b3a283 SHA512 132efb92419d171550cebb51245a306cb4e55b1af468078aabdd5487f3219575d37d91f8e5005756e975be91fee6b72fe8365678f29040d520f6101700046cf7 WHIRLPOOL f5d38aa591da1b1a1a52b9e61ba617e1b5c5b4f74e1a3ec164440e6c97ecf61d11ab87a4b4aec69166af4cdda666fc1de3e7efac097be46f4cebb87e3059d2b9 MISC ChangeLog 3223 SHA256 2f8b1d2ebf885d6deda06a3d7b35d3f2cf4e85433d8adb03c47024b434900ef4 SHA512 e4e3d680ef861f9ee49dca944b9697ffe20d5f4091c354abc62cb66ec664445ddf375a072a4c9a9f39b2fbec236a53f6b1b082acafd3335dfd6051f280ef649d WHIRLPOOL 7c14afa7dae05dfc81d43eac09e4ac952333c563b92da6e5a258494e0124797ba8d78a6fcd0cf782266141c4b51202e9a7380720689ff555a243d13f748698c9 MISC ChangeLog-2015 1016 SHA256 066975a5143323c60ee9e06d292ef3263cb1ecf491c172a08ec1ce60bace2723 SHA512 e33b7adf58d6d70321a0b4ba298cd14878f170b40570da1b5eaade2c96521f93a37b0aa9879b15a9b5e20204b5c53f4c165244958fdadbeb9f41c15fe9185e0a WHIRLPOOL 053b0c2200cf46db8b9cb27a10470c043818f43d7a6e97d0b10b541b71080a8d01615da1cb0427e974da7655cb4150d3d0be16665a245d1dc1eb69f05d7eb2ce MISC metadata.xml 340 SHA256 3b72b24591bf4b6e91c36d69540dad8ea2beb3bad3d7a5e6a67a7347262b7fa4 SHA512 48eddade88ce54234da4c04edc349a80d162f88ad6c96ee30b9434e792fe174654990efedabbe3927b78f54400c7aa61dcc8acd1776772d6e5bb31626cd31e4d WHIRLPOOL 7be6df2fb93a1eec4b3a8a0c4bead0f42d438dec6e0f8fee0d66fb4c59c03911fc067793b5a4021750885dfadb2ebbd0549dd2b7b111b291f567b6b629eef09d diff --git a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild b/media-gfx/cairosvg/cairosvg-1.0.22.ebuild index 08398d9ce370..a601d0ad3a5e 100644 --- a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild +++ b/media-gfx/cairosvg/cairosvg-1.0.22.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" RDEPEND="dev-python/lxml[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] diff --git a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild b/media-gfx/cairosvg/cairosvg-2.0.3.ebuild index 8931a2878267..75b59ac69a7d 100644 --- a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild +++ b/media-gfx/cairosvg/cairosvg-2.0.3.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" RDEPEND=" dev-python/cairocffi[${PYTHON_USEDEP}] diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest index c504c2eebaa6..765ae74d1920 100644 --- a/media-gfx/converseen/Manifest +++ b/media-gfx/converseen/Manifest @@ -1,7 +1,7 @@ DIST converseen-0.6.4.tar.bz2 223060 SHA256 eac85f576018080d4a0ce904e4e8bc8a37365a4bbfec6f1ba410d4ac67625ad3 SHA512 432403cf13bb5eb1b6d0438775379295e05b250902c259bf0117efea7e21d1768cb0fe4fb8ed9bffcdca4b055a5b95612fb5e3c24b3061813b10b6db736314a9 WHIRLPOOL 257a863d4faa77c6b304aba732cf8b04159e7da4ffb04dde65cc78505d24b6b963d5ed7bfd4f01de215fb8d710219b639bb0fe142eeb1690c727ff051fab51d4 DIST converseen-0.6.8.tar.bz2 226559 SHA256 e82c7c2cc494c7606d42e7ff2cafba8bb4d35cb5471912ae943a617ab2477e9e SHA512 add32cb213a708f5311a7b885a2f50333c9cc1b83fc08a4e4e836882eabcf7ce170e514b2de08cc6b66c1680873ed65f774bcb62c7f69c55ba061c37bbab2836 WHIRLPOOL 9d36b776faa837e9ab8ca792b14a14fdb23d53e3644b93052db53ee380b8f295ab39748f76496cb58af93f1c364890580b715b1dea1cd0430db7c2b999a8499a -EBUILD converseen-0.6.4-r1.ebuild 1160 SHA256 b48126790be8306c891963ecdbfa7f31bc4235ef38700146935a52f45e4ec6fd SHA512 c912ff6a8438f99c46c571aa456e227bf7ba9954592bf69f0dc320c628908f59e8dfcac67baa3ada66c7a790345686645baff8b546988858f25485034eae67d6 WHIRLPOOL 4134c59b9d0f1a7ef574cbcfe78d112807c4dbc4093a19ed6207cced93adec2a581cea208ecfb2dfe9673f7fac86aebcae53f916c3e76b8a01121538d0d3faee -EBUILD converseen-0.6.8-r1.ebuild 1183 SHA256 8b1facd6923a16b6569c539b0e592f844b4922a21fc7cd8d719df2eb2406f38e SHA512 8af788220d80390b54c8bc059aa825b6c72bdc69e72a63e99aec07c660e367e1f43d7b2e4ed6a284e342683e6fce158228456db06653092eb752f036f6d90930 WHIRLPOOL 30beedd8d70353a93c8af347d9818883884dd962554e8d71aa9bbea93c751883ebf22d2f74ef5c4b178903f659b714c076055c2e87b7c865e2aa9dbb984194f7 +EBUILD converseen-0.6.4-r1.ebuild 1186 SHA256 e843dbd9406fba0e288296cbc88d4d4e0fcb544188c76b6e3aefb63ae43ab970 SHA512 47cd56b54a61c3c485c10df6f66331ec72ca4e3f83955b921112da684ae450a3e84c7ddb64f2379c4c0f818bf57d2154c97164d488cc5b49bc43ee02d25ae72c WHIRLPOOL c37b99ecdf46157396d54da6d253369f72d278b4193dee32dacbf06358a535a26f2517ff78db332cca8d7a546fc5778730c1f5a896ddb8ff714f07c1a80de5df +EBUILD converseen-0.6.8-r1.ebuild 1209 SHA256 aabaf0dd938b3340a9318116f67d95c4ab5b48735bf9529fae2578c632d10bd7 SHA512 62dc4f994dd276745d2bd4aa1620c574d19ccad94944e43361e762e9e3f5a2a8152d82c2700be90cfa1697162ea91d332b5b13b2376cb55656087e4c6a2901bc WHIRLPOOL c9043432996436708ca30b73168d569db51d8480f3b25cf568658800da12d87a8b2acfdf1a083741c3c188325464cc40ae818868869e8b82551751d355585830 MISC ChangeLog 2495 SHA256 6afaaf3dac41ec10f67897863901793bda625291c6c81268b2173bbaaa5e2306 SHA512 57db812cbe3cb511b0170f2c0b7f7fae18938029a9e6b9a7817792890c78d2556b958982363d8a3ccc354feb127e47ce50cc019e7a91e3f8b827dd099f6a0f60 WHIRLPOOL 225cae93a153559073d12fd4741cbfed8ad17dcfe51ea4089157f587da2edfdce2c4c55bcdcb1c87601568ba94341a92545298a735865e9e637b61b512a2ff7e MISC ChangeLog-2015 2356 SHA256 c3cad6798c294d655224a627d4af9025aac90ef55c561574d3e142fcb3e751c0 SHA512 5450ec5fb7b55996cb36d831d345d98df9cbb2a2ac6baf421558a89bcea0eaff712618ba562bf6bb2a30ef766c00813663734cf35dba98ce691d44df51641f97 WHIRLPOOL 56b1c7b13e377bbf7140c2ec3c09586691bc5cbd6db04be114ff52eb2568d5e5bdcf058af653b172ec46884710401a9ee86d1c259a8ef6981c758dfae05a1476 MISC metadata.xml 329 SHA256 b1d481928fd547f94303f4dd5d5cf20351e6cd32ff338c3641993fb18d485a54 SHA512 860c27750ae06a87f0400fd7b12a92150cc00d4d25767a2b8c8b49640d17b1f7124b523905352ad5f76a2df1746d92706c26d6f882576e27cfec411d5eeafcd6 WHIRLPOOL 81d86c10fcc597431482fa1f2549465f19891a451fa6b74b18423486365e40f9d9d23ad93fba37c019b198b38893eb74e10168076db2f5206e85a91e7ee0cece diff --git a/media-gfx/converseen/converseen-0.6.4-r1.ebuild b/media-gfx/converseen/converseen-0.6.4-r1.ebuild index 44faf8dac25f..f991f2a22381 100644 --- a/media-gfx/converseen/converseen-0.6.4-r1.ebuild +++ b/media-gfx/converseen/converseen-0.6.4-r1.ebuild @@ -33,6 +33,8 @@ DEPEND="${RDEPEND}" DOCS=( README.md ) src_prepare() { + cmake-utils_src_prepare + for x in ${LANGSLONG}; do if use !linguas_${x%_*}; then rm -f "loc/${PN}_${x}."* || die diff --git a/media-gfx/converseen/converseen-0.6.8-r1.ebuild b/media-gfx/converseen/converseen-0.6.8-r1.ebuild index a782fa6ec38b..3d335da5513f 100644 --- a/media-gfx/converseen/converseen-0.6.8-r1.ebuild +++ b/media-gfx/converseen/converseen-0.6.8-r1.ebuild @@ -34,6 +34,8 @@ DEPEND="${RDEPEND}" DOCS=( README.md ) src_prepare() { + cmake-utils_src_prepare + for x in ${LANGSLONG}; do if use !linguas_${x%_*}; then rm -f "loc/${PN}_${x}."* || die diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 59fd90229efb..cd5df633840c 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -4,11 +4,12 @@ AUX exiv2-0.25-fix-without-zlib.patch 662 SHA256 66618de00ba07ec660675e2dff99138 AUX exiv2-0.25-fvisibility-hidden.patch 700 SHA256 2d0eb374e3df7dd58a513b616786e9421f63e575c2812d0b3980e0af29d03d96 SHA512 7dd251fa6e09ecc0493899fdc24431f636e56bf86d33fd4cf4b46fc27b14ce7a68cb4021a3799260398f48b256f403e00b86d143a012d3871e0de5bf57db9205 WHIRLPOOL af10468fad08e51f16141e70409e5ec718d5d669db8203df6a09de2fd824eb46376f87195cf1e744c60c567943c24d54afe388d54eeb5c240f876ebbcbd59514 AUX exiv2-0.25-hide-symbols.patch 4098 SHA256 b6fe63951717360caad547275c3810c42803ef2d8dea25c75e02b45b9d7add9e SHA512 aed6746329b12769d8084ca79a99eccd6b52449b80c0b3d1c1d6b22294c2b62398366f0715efa207e2ace0ed52740a8eb81af58d17322d42a4674336fd24e725 WHIRLPOOL ac8e900303ac0b19f24b5eff13791dd42459395763d4c8795ff978c1f2c05431b3f3586dedd2b7df375452d3826d7356fc190c4ba3bc8fc4713792bc9d31d033 AUX exiv2-0.25-tools-optional.patch 1332 SHA256 6c9a3ed5c2b9acff10c3b2f2dd2ca639936beaf6263526b9d85ede579a1d67e1 SHA512 14a8703b86dc4a7a1f210e26bd6532c529f850dd1b25ef116c703a576c389a120e3f8b1087e289cd8b44073071ac88a97503dc2c0cf72f21d32094b2cabbc58c WHIRLPOOL dc7efa7ddcaf1be665cd79aff0b36a0f2b135a87a3a93f9cb6091105b965b4b009e569c447d54d602482410ec59d674d99a71bee2699e8007575b8e2cc727998 +AUX exiv2-0.26_p20171013-ccache.patch 2615 SHA256 863f2c71bc93ff51cdd4748b6299b5e81b48ce141a3659e848ffbade9a0a318c SHA512 5ad182d374d56a83f8edb5d33333f971d5f266934258db545f1f8e2a7d55aa9835105d43cd718810126c7f560b0e6d2e0f8e4feda55dcf6760b9ad407b2e44bc WHIRLPOOL d7152400bb675b41e8e59026871f087aa69202686142237e2e76ccf1740a7941b91739ee34d313c7a8ade5d7fdae8d14305c92a770618dfc18654781c7128736 AUX exiv2-0.26_p20171013-cmake.patch 1633 SHA256 1e1d09e876b78e77b4fccccda19cbf3ed4ca782b06805cb4f43a0c6c83af0961 SHA512 7b168242c6524107bafb13b7675d74cb87e20205568e80259d99c46d7328d8c48295977a2f08cc5195bbbaf865ff1e751a22dc7ba0dadbe32d1dbba7b908f9b7 WHIRLPOOL db047f78aaf48cb6d1963175441f0641f5ee29df15312df3726b3b8f306b3f16c3fb3ee75b4c752243e98f1936182337cea786444b2c13d2878cfd53ab5499b3 DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac DIST exiv2-0.26_p20171013.tar.gz 25801252 SHA256 137178f0dfc2734b174ba71b8b18d5852fcd5c6f7835eeb1b58f42b93eed7317 SHA512 4e8b10b8593a80615f5deb9fed3420f118338f1161b99c0b86456686fe8d511bb5df956ee25ed5edf990b34bab9efda64be5c80f6efbd78e6e497cb85e2a3ad5 WHIRLPOOL e32b9d98fa5be77bbf50bf275a95db8e9d15b0d40d762bdf512cb8d02f009fc452921df194121cd32d9780de1c83afd0da5cd75ef653a9ba1459f18884f71ffe EBUILD exiv2-0.25-r2.ebuild 3067 SHA256 74c21aab30f50186256977871d495681c93e41c8044adc052c518a49b42e1fdd SHA512 30a8a1afbb91ec8b226ea16621cacbd9726f31cd9ebddfda4c7771786a4902123b5674ac9221c990b99464eb0d471f694bf57eebc7e3a22d65ad5e61f4805dfc WHIRLPOOL fc5b37699ba112488230aa7fdd8913318e7527c772cb214b87ecd612775f3fffd6686b8db1baee3dc949fbf8ce856607205776aaea50cf67634b6bb7c74f2b0f -EBUILD exiv2-0.26_p20171013.ebuild 2920 SHA256 266ed17819513603bf24cf76a361fa1e829ecf846d7418ede626e9bde2b20267 SHA512 695478c1a0c2ef7b352ecae022118852c5ab34d4b4761ecd6fdd72c118febc59cfbe8916c344f926794ad3cf2524b639feccd3c746be57796628c1e3a210fe56 WHIRLPOOL 1558a607e90e3396cbf272b730c57ac1726e42e7a19546b4da0a75579b1046ddb745ccf1e76d3a148bab9a5c6d671c043bab8df1f60e6fa372bdbab692869f05 +EBUILD exiv2-0.26_p20171013.ebuild 2994 SHA256 5968a6ebd00409a9fc73cabf0edd724683c07c449debbbba9a527df7a00a4088 SHA512 0b007508c22ff48b294e8acf8d0a256da56873221ce76bffaa946cfa7e6fd93de14ba021523721f0d27d22b6a319c342dae747ca41c1e76b07a833470b66f84d WHIRLPOOL e58971af6351d34e5cd0066c6f47f053ff79d61c863001db7cc3b11851d4007d1259a9975a5a8024aa960b062a35580f535b400bd2b237526c7ea1301f03803d MISC ChangeLog 6407 SHA256 169192c62c5737f3e30c0f97815a85216ef6c50714d94759089db57cc60468c4 SHA512 dbadbe62c5c985e88553f788bf6b22c98f9c4001d53882d8cff3a0e7fd23aa49dbc9e9dc72854578e711f5041f2f0182226d236946042f349a9ebc015b2a89fb WHIRLPOOL eb2926f593eb897554b5e4c77d4287f7718134e5d88b56ba4c48161d04834a8cd706989b456ba1c707303d6603270ae4cfb6d358c8c2f91bc8f3209caa9e2947 MISC ChangeLog-2015 18145 SHA256 5a973e551b2244f4f36a767d98cf41bc8bb61789fc40a7809cc5a98ebe80097d SHA512 3d54f43d175e49db9e5d727eadd616fbae08e2fd1017ea6382b818bf6ec300b782d62eb037b4859b190996e63fb963da4eb7862c00c5f24fee7da05a875d69f2 WHIRLPOOL 2ed9a6717cf228be16bd1aaf6cf4820b02afbd77952685c4d8fe7cb49707c61f504c05053bcb5223626ce9b0ea22ea9e7d308b35a7a80a0c15676b9f8ca5af8c MISC metadata.xml 612 SHA256 2700f3a6eb0fea03635790e9e55611f58a19dace74c70d0e0106bd70ef825c60 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 WHIRLPOOL 0996d01f595fe4ab40a65fcc19d2eced4dc31a1c8efddddca353828447ff3ca974499dcc81482d47a3470d9530a1886abde9acfaa2ac75df0e845f1a70402056 diff --git a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild index 9aa6302ffd0d..edc5b1631383 100644 --- a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild +++ b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild @@ -41,7 +41,10 @@ DEPEND="${RDEPEND} DOCS=( README.md doc/ChangeLog doc/cmd.txt ) -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-ccache.patch" # bug 634302 +) pkg_setup() { use doc && python-any-r1_pkg_setup @@ -82,7 +85,8 @@ src_prepare() { multilib_src_configure() { local mycmakeargs=( - -DEXIV2_BUILD_SAMPLES=NO + -DBUILD_WITH_CCACHE=OFF + -DEXIV2_BUILD_SAMPLES=OFF -DEXIV2_BUILD_PO=$(usex nls) -DEXIV2_ENABLE_NLS=$(usex nls) -DEXIV2_ENABLE_PNG=$(usex png) diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch new file mode 100644 index 000000000000..ece62cedce9c --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch @@ -0,0 +1,62 @@ +From 9686aa8857bcd992ee4f23d20e80dfc31679f67a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 15 Oct 2017 09:28:09 +0200 +Subject: [PATCH] Add build switch to disable auto ccache + +Current usage of ccache leads to sandbox issues. +Be able to switch it off for package managers that already can +make use of ccache for build. +--- + CMakeLists.txt | 1 + + config/findDependencies.cmake | 12 +++++++----- + config/printSummary.cmake | 1 + + 3 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 80fa907c..a60d4b2e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,7 @@ option( EXIV2_ENABLE_SSH "USE Libssh for SshIo" + option( EXIV2_BUILD_SAMPLES "Build sample applications" ON ) + option( EXIV2_BUILD_PO "Build translations files" OFF ) + option( EXIV2_BUILD_EXIV2_COMMAND "Build exiv2 command-line executable" ON ) ++option( BUILD_WITH_CCACHE "Use ccache to speed up compile time" ON ) + + if ( EXIV2_ENABLE_WEBREADY ) + set ( EXIV2_ENABLE_CURL ON ) +diff --git a/config/findDependencies.cmake b/config/findDependencies.cmake +index 16967763..d6af9488 100644 +--- a/config/findDependencies.cmake ++++ b/config/findDependencies.cmake +@@ -58,9 +58,11 @@ if( EXIV2_ENABLE_BUILD_PO ) + endif() + endif() + +-find_program(CCACHE_FOUND ccache) +-if(CCACHE_FOUND) +- message(STATUS "Program ccache found") +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) ++if( BUILD_WITH_CCACHE ) ++ find_program(CCACHE_FOUND ccache) ++ if(CCACHE_FOUND) ++ message(STATUS "Program ccache found") ++ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) ++ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) ++ endif() + endif() +diff --git a/config/printSummary.cmake b/config/printSummary.cmake +index 21e444a4..62ba4e98 100644 +--- a/config/printSummary.cmake ++++ b/config/printSummary.cmake +@@ -40,6 +40,7 @@ endif() + OptionOutput( "Building exiv2 command: " EXIV2_BUILD_EXIV2_COMMAND ) + OptionOutput( "Building samples: " EXIV2_BUILD_SAMPLES ) + OptionOutput( "Building PO files: " EXIV2_BUILD_PO ) ++OptionOutput( "Using ccache: " BUILD_WITH_CCACHE ) + + + message( STATUS "------------------------------------------------------------------" ) +-- +2.14.2 + diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest index e7032dfd5598..182299fe82ad 100644 --- a/media-gfx/freepv/Manifest +++ b/media-gfx/freepv/Manifest @@ -5,8 +5,8 @@ AUX freepv-0.3.0-noplugin.patch 1099 SHA256 31b2c15f15a314e005ede81387d02a1f6f74 AUX freepv-0.3.0-stringh.patch 273 SHA256 de462bebc3460011b4f30af986f417b2836a3c9171d0da9919af824523f1acf6 SHA512 b368117f3a675df53e76ada4b13aa6d99f2744f006b2a8d6e37c96c5a1c62f48383042a519e82d03bd569192615de94f1b87dfa851178924d6b002522372b67f WHIRLPOOL 90af79693d7f10180dbf119bf2a6d6f64105f0662ccce026998ea8ddc901cdb184dd6f877f2d7db70e6fa0037ab2cdcc085b5315aa8797cd6de52f7d0c44909a AUX freepv-0.3.0-unsigned_short.patch 1787 SHA256 59f8ca984d1f184577b265870f5424f28f49f19582ca57ab56d3d18e981d2dec SHA512 aba4a7b0d882ebce73b5ec823e8a51cec2788efdc4d9000c9d48a3c07a77e88dbee1e24ffdb1a57b2a4ae45b9310b25cf0157c15d73f8fffdf0a2582e8b88078 WHIRLPOOL bb73a0a0c6087b2079cc44981959d0ed0628dcae53cd2adc60d4ca9bd95fbae25aa923c806ec936dd5f43cc69a65e1e188152781b9cd12356e38407cfb113f75 DIST freepv-0.3.0.tar.gz 175545 SHA256 a66c58616cbe814b2e23c6fe109c3de906dad83a8faa32ea219c182bf15229f0 SHA512 0b207dc25c51b19fd76637743adb8e395c6098d03611612086d66d3f1aa6e4d0c5700aa0e23210082d6aa7495f19d1c3d8f0f93ad11a5236df86d709d5f71a7d WHIRLPOOL 993378bb9ef25e1a1064f9402c4608d0a54588f035f23fc67024b857705ff978a403f86e5140e9ed88b83a6d9ae7a74aa86bf9c0239eb07348904d1eeb9ef749 -EBUILD freepv-0.3.0-r4.ebuild 960 SHA256 a433c8d4fd5626135881719c04d279a2c6f3d8421bd03b0134b75a4c032d9ced SHA512 4a62f5afea9a03d680a0d504c8339cd17ef17c50365bf0825f03546713a12b3d98e9d1d79211d6d522fb2248b412c60571bdd584d7038f8278e0aee8ffbbc23b WHIRLPOOL f17693dd21575a2bdd7a7d9de4303f3ff42d1f1d028fcd70530ac225f37f7dceb17e1a3a652515d8acabd19d1920f66bf240a6164c1599cde5fc6ca663f1a4e0 -EBUILD freepv-0.3.0-r5.ebuild 947 SHA256 0837ac2473d1c448828cbad47e075356cb23c68d72d7b4e1bccbd18f7e3b8ab4 SHA512 785a40403ca2eec1903881c96f42dd796ef562080be308f8e03385eb8a7f1bd73d6256aebe57ba6416464972827f5ba378fe6157f82dad3adea1886515ebd961 WHIRLPOOL 8f45893bf902dfd9a5a79a005405af8b127617eede8c36c52557f12cf6aa93a553fd07d0c5ec75606521d23ddc43f0d3a2854f651d3bbb8ccee8eb34b430a017 +EBUILD freepv-0.3.0-r4.ebuild 979 SHA256 e2141c5b9ebc1d8a8cbfd55d6ef71d1f169bf11ea114729fc52146a071afca27 SHA512 7e5243b3abfbcbfbe8a766f581950439e9609bf3ecb899f951df21851acdde5ee955388d89ff9a0ef18e748c30a3d12d41f214d37a01d7955d652837cd4e4f3a WHIRLPOOL 7a1468bf212586dc33d57e9c8aae5384b52730349f34e3b2dc6c4e9cddc29f44adbee0a2408ec8b6e326ccbc7352b4bfaeaf6bfc1f5612434f8d825d05eda840 +EBUILD freepv-0.3.0-r5.ebuild 963 SHA256 6b0a284958d0029abdf9d23b3567f2c8946beb99b427a61b5fbd7e81a346a068 SHA512 162b7095e1fa1f37e3525d75cec993112d4d5aada164fcab1f8354b5522aaaa91087db49709dc810f0ea3c3c86151bf08603c21293c1fb83887d5ccff98af1f0 WHIRLPOOL a2543d1248a6cff166fd5a33bafa0e7901efa04b9c12a3a9087c9548114330e302366d13b624316c9ab9c5b6eca9f09d94b2fe8220944a6f37e67386b7a7a248 MISC ChangeLog 2357 SHA256 6c66dcbb837604ebe9e7cd8c2c6d048b459c47c61a11826db44d882c40b3e6a3 SHA512 2418782b8d38aef14f120f4b3b256b3fc10eb8c0cf7a58b3afd584a20df92c67e4863cb0c2389598bffaa43766ba7c6ca723b992d2c16d3c9ab690770b09f815 WHIRLPOOL e2cbcbcd185dacaacfd2e91c97e73cb2149d36dd912501312267f8572ad866804dd0b77d79cc5dbca4571d204b66f455f8cb4c677cc91f0f326a93c4dbf4068e MISC ChangeLog-2015 3391 SHA256 9452c6aa5b8c5b16013d7c5d943900ee5ae9857bd1db94e7277c0dadd5220a9a SHA512 2e656dbcd16f1c33c2bf336f7bce9bf157316c5ad6638a3d5ff524addc0d40b53dc77ea490681861db0451cf19afffba631782cea5d837f31da43a05ae4f519d WHIRLPOOL dd1ed03ee3402e1879fafadbb105bef47ccc08c1d6d5f9a2a88af77221a958e9e6c2c18d81d289d0397a32c2416fb9f7854c308d86e66f0499aa6c401164b305 MISC metadata.xml 474 SHA256 8892cb002be9ecac033d26cb60b86ceba7d2011b79b541e4cc45229a17ca02cf SHA512 4466402d68177a660716acf3afdb8ddc2074e8ac7ad35f2ad6b31adc9fe938b39cc999dc082fa07f8787be8798a053a6248dac12091a22d32d9fb83a1022b421 WHIRLPOOL d6c4055abefdfc503c1c51319626b573fc5e4ed2924956c5d8ef976958e78bcbb0dea4a42caa8fad2e0d429075e3788e267d18cb47d118e5897738474b68c065 diff --git a/media-gfx/freepv/freepv-0.3.0-r4.ebuild b/media-gfx/freepv/freepv-0.3.0-r4.ebuild index e3ce52045164..464bdb32ea38 100644 --- a/media-gfx/freepv/freepv-0.3.0-r4.ebuild +++ b/media-gfx/freepv/freepv-0.3.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,12 +23,16 @@ DEPEND="dev-libs/libxml2 x11-libs/libXxf86vm" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-gcc44.patch + "${FILESDIR}"/${P}-gcc46.patch + "${FILESDIR}"/${P}-noplugin.patch + "${FILESDIR}"/${P}-libpng14.patch + "${FILESDIR}"/${P}-stringh.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-gcc46.patch \ - "${FILESDIR}"/${P}-noplugin.patch \ - "${FILESDIR}"/${P}-libpng14.patch \ - "${FILESDIR}"/${P}-stringh.patch + cmake-utils_src_prepare sed -i \ -e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \ diff --git a/media-gfx/freepv/freepv-0.3.0-r5.ebuild b/media-gfx/freepv/freepv-0.3.0-r5.ebuild index 412a59122a04..fb4eeffb23c1 100644 --- a/media-gfx/freepv/freepv-0.3.0-r5.ebuild +++ b/media-gfx/freepv/freepv-0.3.0-r5.ebuild @@ -33,11 +33,11 @@ PATCHES=( ) src_prepare() { + cmake-utils_src_prepare + sed -e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \ -i src/libfreepv/JpegReader.cpp || die sed -e 's:^INSTALL(.*)::' \ -i src/libfreepv/CMakeLists.txt || die - - default } diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 9173876a3f97..80c807bae39c 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,9 +1,10 @@ AUX krita-3.1.4-qt-5.9.patch 722 SHA256 9180d7841675832b2d55f5b18755d926699963fbbf8853d0cad99321f7fc5733 SHA512 265b4bdc3b75ac346dac24fad6824dd713f7c40855bb10ab8373b18a55943a67c1b203676689a49d1a34cd682059c70d9371ba463a0e0e16496c67d5b19389c7 WHIRLPOOL 55f103ea73b638cb5ccce60cd48dc85a66751cf4578be4c7974a5223878031c357a2ad09c92e584d5ea11e9119aed80abfad22cd1a5d552f34f7b0b6745393f8 AUX krita-3.2.0-tests-optional.patch 8806 SHA256 839bf01eccee18c6dec2cf2b0ab5d47884648edc7dab872ddd9c0162cb6f30ca SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34 WHIRLPOOL bc84ebb1803065672285047e76dcea2357b461b83779c138db3ca3462c0ad626b9820ed2dab333087d23709590f82f14ffdb07eb35794e2807a5bcdd10c18b0e +AUX krita-3.2.1-exiv2-0.26.1.patch 298 SHA256 a0fdc9b00abbbf4afa5b42a2494c093995069f03ce383c39cd27c5346b5d910e SHA512 3188f4903dccd2e18ebcd7847a9d56e0291495bcf3fca9ec06af768068b69452e7e0116ed5ef8827071a3380aa0ad39f401fbb993bf8265dbdcfba84e65a0080 WHIRLPOOL bda16d8a2bd67d84474d58ab444a72b490f8ad3da988488e2c5b4e0574f86673c0ea01758630696dbafc0da41981b0fae771c2e339a8f2b54cfab0f1c0e27054 AUX krita-vc-fix-gcc49-abi.patch 539 SHA256 c2d38b00853df1fccd2b161b53f8b7b65cc81777ef33a6ee6a9e62d6bac76615 SHA512 41e750c336ce2869d5653fd47ce951977af74bd9d8cd0da6fb3d1bcb770759ca531dfe5bcf9f6d1cb4cdb914f7d374b97c9b3a59fa318f121fccf7527654dd2b WHIRLPOOL f47005d4446f5986517b54fc1979138119ffd99edeb7f7f4cf17967e979fe97fe30eb8dca2a71d3d35c02b791de58d63069f18edc35abea4e07775cc5275e45a DIST krita-3.1.4.tar.gz 209778186 SHA256 741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df WHIRLPOOL 9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7 DIST krita-3.2.1.tar.gz 207014866 SHA256 ef06cee677d75861edca0e1f825bca42ff59b7200aeb827e16f8d1fb5ef14e39 SHA512 ddc7153a3fcef072de762cd48d4d6df765cc88b7a413028b3aec5690382c1ab7f61f6ae37070c78ef2be1bdc26107908d288976bfa12d14ca35934ce33fb10a3 WHIRLPOOL 79bc89b7ebf63b2a31bac726e91e4b77bf7b2a6eafe15a6bf15baf935f2bf56e2f612359fc16c7129251623dfe4d7fe53cd9d2f42d423385487a832309afd17e EBUILD krita-3.1.4.ebuild 2551 SHA256 d56beb770f09e4ddd3907dad4aab1ed3dbb13a0dc36bddf2beca1b64315d6b9c SHA512 74661e02ea49dac6f78a996f839520ebd9e29787293b3585c78c4c5b4faa46f13d31a2dd26765c058f964b925e59fa5ebdf81b95cbc24c7093ae61e84afec022 WHIRLPOOL 629c8eb72b3ebca52674ad569e17558f5337cfbe3e49f551ad4393cc3231d34d1ecfddd187c96ddf47c7088760585b0067d98673e4d01a6bb07835309253e0e3 -EBUILD krita-3.2.1.ebuild 2532 SHA256 e9e620230349be4702b5c5e03410d6ac6911143a93276491538c3236526e459e SHA512 7606da963f518188d2e7b951ffb3095b4e2a69604cfc24ca7251854fab6f0823a6ca54d56eb2d8b4524cb2601ed49fae5ace5c1406ff0d4758d8953535ca09d8 WHIRLPOOL 662c66fcb9c366be39f346612fa879845b5821de9de25c37b9e1e5d1b88bfdc455c0a1ce6562d2821e292fd38891366e17d36c5da437900a0d2e3ce7a1fe0219 +EBUILD krita-3.2.1.ebuild 2589 SHA256 1a7fa580aeed5be3bc709268ceef102d0c155c682080c02ad32acb9f90dc1dff SHA512 68bcebb3e4677f487613266cd10c46f36ee6e03275e264d803c64ac787849697a1f3084280d4d7e8edb1d0809ccd6582ec173fe165c863420a0b8cf6a4e64ac3 WHIRLPOOL 66ef1a9852958dfd59b7d27ac3b5f07f16dfdb7574d9d69332bf809ad7aa85ec7648d829c2d28e05bc6ba13da900b760a45b2b143824cba6a11c8ecc202a16c0 MISC ChangeLog 1347 SHA256 0842c6da6c74f58c2bf65ea5842f75857f7339daaa702947fef7625893487030 SHA512 51fbe12ec66ca91dcb60cb00d8c0563a7d033da26b9ada5188e94bcaac9852648191e700b62ec8a6f40af2773b1b566bc3de394bccf0d96b716dcc8f72a9460e WHIRLPOOL 8b7a12f8c82b8fcad1bb59e9438a722c5da203a386b97b8b8970b09cc3450fa53887f6354c027fbf0802887b678276dddb76db163e3548a6c702637d3105196b MISC metadata.xml 569 SHA256 734de7cdb3cd12de975cf7fa2a02370178fbe8ec8c9f6ea3b424f5bff1fed336 SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27 WHIRLPOOL 67a8f8f9c346a040683a568a63cd3230bcf1a9fa613ceebd3d185179d750d8a050c8b1abb96758e5bd27e70c08683c6727d52c266e63fb22292e3619a4283a39 diff --git a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch new file mode 100644 index 000000000000..22c3858f4c66 --- /dev/null +++ b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch @@ -0,0 +1,11 @@ +--- a/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:09:56.908903726 +0200 ++++ b/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:10:23.956192118 +0200 +@@ -17,7 +17,7 @@ + #include "kis_xmp_io.h" + + #include +-#include ++#include + + #include "kis_exiv2.h" + diff --git a/media-gfx/krita/krita-3.2.1.ebuild b/media-gfx/krita/krita-3.2.1.ebuild index 7c6ab717abaa..12b520bc5c56 100644 --- a/media-gfx/krita/krita-3.2.1.ebuild +++ b/media-gfx/krita/krita-3.2.1.ebuild @@ -40,7 +40,7 @@ COMMON_DEPEND=" $(add_qt_dep qtx11extras) $(add_qt_dep qtxml) dev-libs/boost:= - media-gfx/exiv2:= + >=media-gfx/exiv2-0.26_p20170713:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib @@ -72,7 +72,10 @@ RDEPEND="${COMMON_DEPEND} !app-office/calligra-l10n:4[calligra_features_krita(+)] " -PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch + "${FILESDIR}"/${P}-exiv2-0.26.1.patch +) src_configure() { local mycmakeargs=( diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest index e7ab4395d5f9..0fd23733c563 100644 --- a/media-gfx/openmesh/Manifest +++ b/media-gfx/openmesh/Manifest @@ -1,5 +1,5 @@ DIST OpenMesh-4.1.tar.bz2 24728164 SHA256 3e30cd7325db6367175e2e88c7516c23b7f90c9e1ff739c7d62e7de21228bb8e SHA512 064a4d5cb467589869baf4a302e6c620bd84de874b24019252b97ef863b59e83f2fe23ea45e4a5162a7765847da19f75f563f084cf2b3ae77c7e704b4c859b71 WHIRLPOOL 6989d0ff9dd24bf5b8252e6fc0a416258015d1b5a6202b4e7583c1f2eefe59826a5e2aaa6d50f105083f43680431a67e1cab5b81ace06b119d4e3737267f79ee -EBUILD openmesh-4.1.ebuild 1707 SHA256 abf6d562a36cc897252e92f28e01b1ffd62b436d7d3c0b769dc003b1d01d2415 SHA512 4d60c7c02574fe6d7310ffb3423db963b5b45d58f198c9cd5bb7b5549d070a78bfc09af27e6c33ae1337786eadf28279dbd3ac5b6b5c2aaa95099215c8d0bb7d WHIRLPOOL 9ac625d497c75cb5478e67c2046b074f1ea6d02beacc8ddf4714b6aac2fbfab9e259d415c114f2daca7c9fd0f81ed24df76ff4eb1f907ba80b7a4db56c29f5ad +EBUILD openmesh-4.1.ebuild 1733 SHA256 80f8d79d22fb7052a672180dcdc5b0a2d1d32034d34b1c7d9e73db1beef2ab89 SHA512 b46ef104b2581798f5e49e94f2369e07389523d9cc6b5455fd82f92efb5ab5524c1c080d5c7bfdd223cca0ffe1a28150f693492d48d4dffe2611c9fe3af70136 WHIRLPOOL 94104d3e360216f0a05eadbe5d1cee2138a339f98589bf7dbe6e3131f6c3641820804af7747382fffe5df7c20ddd84c8d9933576910be01152eefde7451e340c MISC ChangeLog 2937 SHA256 2229071e998ed82dedfbbf2281201c0ed830440330842a235f638198831dd858 SHA512 886d8555d071c9a986003bfd892b57825f4b0e50500024119080277f65f57ed443aac9ffb907e52e2c82e35a61abb694682b08bfe35cb61a7877e327f9d21074 WHIRLPOOL 2d3631d0cddf66e842211f030dc22ba1edc909d6584c3cd081704d3155f8171f3229d1520466574c2bd508dc38738208d6e03ca461fbd0f6356cb2213f09a30b MISC ChangeLog-2015 5807 SHA256 9d69315ed137dda3a86388dfc927bef051e1a61a4123571255c903e0505111ab SHA512 91069a1a91748a3cf87769cb4b1c3e029c9e9f17a8d0bea4ea8468824661bfc47cbf70f37ce5ef803d68a04ef5adbf3eed81dc72ce8ef089deaa3aec649543ad WHIRLPOOL 154c33bf8efcb287bde4f352093eb5f4007eaa085e407dd9d557dd5bfc29ee77738ac3ec4ee3ceda96c5f0c99b79d7905de0ff9853620c620907147edd257571 MISC metadata.xml 648 SHA256 000599fdce7c00c19d50dea5c568ca297de1a037c183eb0f2962119acaba54e1 SHA512 24e414a301d38d43961c5de285fc2fe2638a5a7c1d606d3f89efb5f701399d743382a0761f72f4aaf1d143755349a5a0f0cd49171a36137f65c1b7b8d3ccdcef WHIRLPOOL a2c6163f724a1eaae55fac08106066e0023d869764f712075e09a4c3080d367462f985e136ee7853284af54fcc3225b4d9f0fb5e09fbb2192a8258eef322b221 diff --git a/media-gfx/openmesh/openmesh-4.1.ebuild b/media-gfx/openmesh/openmesh-4.1.ebuild index bf2121f0a09e..212d2d93cb76 100644 --- a/media-gfx/openmesh/openmesh-4.1.ebuild +++ b/media-gfx/openmesh/openmesh-4.1.ebuild @@ -25,6 +25,8 @@ DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" src_prepare() { + cmake-utils_src_prepare + # Fix libdir and remove rpath. sed -i \ -e "s|\(set (ACG_PROJECT_LIBDIR \"\).*|\1$(get_libdir)/\")|" \ diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest index 3ed49437960f..973a766e2dd2 100644 --- a/media-gfx/potrace/Manifest +++ b/media-gfx/potrace/Manifest @@ -2,7 +2,7 @@ DIST potrace-1.13.tar.gz 605931 SHA256 6252438b6b6644b9b6298056b4c5de3690a1d4e86 DIST potrace-1.14.tar.gz 649685 SHA256 db72b65311cfdcb63880b317f610d84485f086e15f88ca2346012d49414cd97e SHA512 ade5e18adfbfccbc1298d0bd416fe3ef49ebe0284b81d43e0dd0040498d0ef6995e6ac9dac0a1eb5c251921bc97c32db3213dbe0ab40365d87f92013dcdc99b5 WHIRLPOOL e4e08ff6228281baddcd927e8fc6db2fa7e22c613366a088c36d256cba6275cc285fcdee193d097e2163e95d20f5f7eae94db72d618968a587a1c921d4c95d19 DIST potrace-1.15.tar.gz 650840 SHA256 a9b33904ace328340c850a01458199e0064e03ccaaa731bc869a842b1b8d529d SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02 WHIRLPOOL 6b5718dea33fb5597a56d8a8893198a342f6cf1c612ed4ea7b94417b9aabf31b3ecfec69a2dfcedb48430cfa09fdf987ab083a4b1298e73c4d163de93d48c8ee EBUILD potrace-1.13.ebuild 830 SHA256 38039d47f32b3a609d55ec3172bf468149ef3c9a5da63c4cff09e09da8858768 SHA512 50d4a9ae0d69dd85cbc22aed2a862e649b2bc17883e1bd782e9d4976d97807dbb7e69b67c073c800bd14bd92eb024af2f42b58e58c57f1d156e1ec72403fc268 WHIRLPOOL 26df7fed083ea4b31bc12d43dec22b47fe96c5d3e69344db19a709f49bd37b4b9b5c9722d28b99d4dd5a820d9a95fba706abba6fe1cfcbd435b921898447c7b9 -EBUILD potrace-1.14.ebuild 838 SHA256 3d9001016f2e2330a5e85eb836007d46407438c00405640a8bb98eed8b7997b3 SHA512 43d983d413c6077ad70f7211e9b9f467afadb9b4ad0613cf5f7ff110b713620e242b6cf9f9e1c557d3c3ce2593eeb0343ec1917bbb2302e7e990faf800eaaaf2 WHIRLPOOL 5528b04ee0b1d3d499653c543502ff0d8f70b212f34a564159f16737ad2324ff6bfad8c000ece395d47894bff1176f9d1d283f32f4a3ab909e910cef07cfaa5a +EBUILD potrace-1.14.ebuild 837 SHA256 72f311d037a3543576f28bdd7172a71988635440e8f76def597508dfb948e431 SHA512 93cecd52cab437f70eed160a7b8f12789aaf98e3c9d9adf4615b64924806dfa16a80747678d97d9343eefdeaae30e6c1d951f562f6911a0ea45f28a571132c08 WHIRLPOOL 9f8aebe38abef0c0586a3fdc4036669cbbfe08aca0301d5e3324c491febd821484f0401f5b145b2b7b942ca253e265819b11e89f17ee81163853650e679c68a6 EBUILD potrace-1.15.ebuild 833 SHA256 a3bdd3a97cfcd5bba54fd94fbd122569ce735c4fe165404712a0fef64ca75883 SHA512 36f6cfe6f7644b1fc460bd21a59274179397dbdbe151b87459b9b2250d795bcf75714262dff441351e48759c5ae24bc6cb4c0dae99fc01ae97648e84c1c14a0c WHIRLPOOL 5165b34652cd4714e64815114832c8aade1e5c8b9cc57fa7aa4a452213b4f4cf77490d7a423bc9dedf88b817cb36d606c80968bac6e9c25ad29294ff0fdffee3 MISC ChangeLog 5086 SHA256 64488097ac31f9a46d377e30ea525b4aee1be34dd0379f5f085e07cf50048497 SHA512 cbefb651a0d1ae719eac60f5c3f99ba687afae36fc78ca65bd639bd4cdc0b8ff79b70e7438024ac07b4927e3e34aa92381b3086e231119a798a9b55b21d99c01 WHIRLPOOL 4670fdeaed00a769216a5d2a62500b49389c72acbbcd4416539f4373e2ddd092dee1651a05212306f6482bf3cba181cc1d0205a0064c5aa484b8eae9bfb6ef37 MISC ChangeLog-2015 7442 SHA256 94d6987bdff3012328e7b4a6990d5af3401780651106d75e8261f08920216984 SHA512 d125d31f06c6466804296fd42d445a97908bb1074c04cd478ce5080dedddaa5a462b908be002351e84d88aaef3895c587cf389fd8d1501b46bf074e77f84be4a WHIRLPOOL 20bd35440fc87380d77e3ffc581f50ea215a85173b3f7f2603aaa776b68a660e37abfe4d5587550d6fc7fac091ffab5009b225b9ae98320a93cb6266af208785 diff --git a/media-gfx/potrace/potrace-1.14.ebuild b/media-gfx/potrace/potrace-1.14.ebuild index f8bf164ed65b..848cd6abb3c0 100644 --- a/media-gfx/potrace/potrace-1.14.ebuild +++ b/media-gfx/potrace/potrace-1.14.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="metric static-libs" RDEPEND="sys-libs/zlib" diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest index d34481bb2cd1..b59c2b2e5266 100644 --- a/media-gfx/transfig/Manifest +++ b/media-gfx/transfig/Manifest @@ -1,21 +1,7 @@ -AUX transfig-3.2.5-solaris.patch 263 SHA256 ef80b926734637eea2cf55c35746d5c1f405ddcbcce989136d223d79668fa995 SHA512 ea76ae31b050a80bf8321a554d0d5c0f1a300cc27b063b5cda6194c465757f7fd00916fee08d69369740a59850fa978a700e7c780911db5fcf04a1c23818f8f2 WHIRLPOOL 69b897dda43c1d56c35b1c0476c93b953bdf3dbcc61717d991f415c6d8ffd93a3e4bb94c086635ad706a5d1d33a4902fca62e015819c4012f19d670ca4c6cabc -AUX transfig-3.2.5c-maxfontsize.patch 1956 SHA256 b3f1ff76e940a7912f7617a62355d1cc0aec6cc793da1d2472fb3dcb4c2744c6 SHA512 f135d99d69988d5d4f0ab803ece9d2d88e1ef2e0605887328a92d3cbca561dc20869dbd8f6aa3eee9e59d74786eafcd3552e2076bff46b1c8002724c94a6247a WHIRLPOOL 0e6fe8b9164e771f447b454dda148f54234571a977fadee1b4c733e45c6d9d430e03b88ae6ff55b76fd3e1028cf4530f6ab5d85b42569bf95ee62a51923aa371 -AUX transfig-3.2.5d-MAXWIDTH.patch 637 SHA256 0a9ea3f1aabf2110e348e8cd789bd9863b3f9ec5ce729041b491d13beca71df4 SHA512 fe5d4afca4b57e6cde61f91d6ddf4be4ed83fee2ecb07c796ad95c8a5a96a19592abec0b520505030e0d00bd1bb1192bb90a9f0f0c95eb3f6c70266e598492a6 WHIRLPOOL eab17b7e3a03421a1b7f191e5ea01bec7e0804c47a1318089250922c8a5b6e0d0be562c503c622ed05d61f0b1f8aa22883e9f6c9fa0c31ab607a7c290ea49541 -AUX transfig-3.2.5d-fig2mpdf-r1.patch 41613 SHA256 13360b2bd5916b459b3b1debf18f66fbe8abead874b2eea1c77e09ffa404a85a SHA512 cac4ce672f1c9ba0f97243d8e550e9191676006f8ad6a3584a48e3f557af1e2ade1584f652fe812bf07250ad0e56fffd8f2d63b4827921e98a120ef635c62fc2 WHIRLPOOL 7467996c4b2ef5a1730d7595df6227b133c561793e327bf3bbf14b295c8cd2167cb94a002ba3711973adab38fa4d54dc380d8774ed15aa81e4b2a21deb6f94ae -AUX transfig-3.2.5d-leadspace.patch 725 SHA256 dbb22b727835186d5c9422decf130cf2b292b7fde288aa212b9e52144de4f79f SHA512 70b3f171f028febee8689bcbca66d67de524c734bd09a978eae40b9c15ade06d884380e77dccd69518a2af286e4f3033b1aedd188871b4a5c701e020fc2607d5 WHIRLPOOL a14b46505dc2f2ccb6ce15dca16f3b0ff9f10b3c544302d691341dc83529d3736769b56a5b8d42e95e7a084dc2ad3b934f3b393cbc4430f7870daae3c27b6357 -AUX transfig-3.2.5d-libpng-1.5.patch 1449 SHA256 8621fc408f700225ff9498f0743afabb135c729b244a2bcafd3418692d2a4230 SHA512 66c0018a62a22cec02df59ac80326e0d77399190b66a7df125886bb76d1e682655ef1a498e940b7ab0a5e12e2156dc98b3d88a5d81513a47154ebf4c62ba02dc WHIRLPOOL cccf802ab472fb76ed4f1e306a60560927bdcca647f339da3038790664092e41a61f1a6fdc17aee00833f474c66e43ea8d83ef4d0a9f8afc1fdca53f42a7d955 -AUX transfig-3.2.5d-precision.patch 1633 SHA256 e2d4c992e438df5271d462cae48c5472a485517fb4093577c4461b6f97e45bb0 SHA512 8ed38b2f295da48a56049368f0643b8e1c26d06c3a340c81999e67608ec70854d72703ae81be89006efb54a0a9a4145b71100c4dc48d9602dd1cb86545cf2763 WHIRLPOOL dc27333136aeeb83082d2e857dba2086ddd0f80ebfda24447bd8e6290ce069daa8db0ad9d6ff6ec1e07ecd021526a457d7fdd68038512bdb3103136677396bad -AUX transfig-3.2.5e-fprintf_format_warnings.patch 1463 SHA256 359845d2da3b7273d8e85d7a4fe8b9ec39b0cdfea02fb2da3276b353c937d6d1 SHA512 28d85316b96d371fb1c8459ebcccf5f482f66c94edc7b11830007c10d7fb0d444430af36f951bde1c49f4b313fce4585454913bce179814de20154bf755647cf WHIRLPOOL d0a58d5664123c22e4b325d6ccd32985a6bc52cdee2deb97e25c221dbe9e38835474899990e3badd7de426a840d15963138a0728f2a5a90b635c120eebc6a902 -AUX transfig-3.2.5e-man-hyphen.patch 16349 SHA256 85d64fcc42bf0e1c14ac4a621535e1a778e9164f840f2c2d077c5d42fadc0266 SHA512 61a0ee8b5e91929806d1255cf18e4431142c59855285c381fb983241ebda8b6c4c9186a152f1cd448190cb144ffb8a5c7d8b8d7d17c789909edebdb0bd71ab32 WHIRLPOOL b8ddbf572c6d317d9fcc549f7cf725740ede1887e0de32e14c3cdd284d3188fffcb8ff62c1f401681a2ac26221a6e8e264d5aca2e8a7e4b0f0e96760a37624e8 -AUX transfig-3.2.5e-typos.patch 801 SHA256 755994323cff774c7f6e48834a98048998fdabd44de9ce152cf2035fd0cc5e86 SHA512 2cdc36f2361a2606164688d18ae8a2e23debb6d16b656bf0f3762d52a2a6175c7b279bb6ee3226f3f884ca043b03ce39aec9870800890eff017f6734486c3707 WHIRLPOOL 0f7dff1b45a789e03f83027ae49ffc1fdb14619c2b396d5f0c537de58f17dd90036697e81c654da4638cba4bafd94bf96b74c132c2cb5ab2932b330959ef9c02 -AUX transfig-ru_RU.CP1251.ps 6079 SHA256 8b3ce8f098776fb8ed1623903fe4af70e439d708e6b58444c72023c2b4d45a3c SHA512 aba314ed3ec3ff2f2b07c97195d1059c0c64f6c5dbfeb41b93bc0d3bb77becffffbaae8aecf552d27f3fc337d23e150601c0dd703997bba9fc18b154c89ddda1 WHIRLPOOL 4c4cc3c24d8b6f84533262abc795fc47ea7e848447b6ea72c8fcb98d3673523d90baaf04731f3ff40f78143a0492763bd7258247690d1cd560d2736290e3165e -AUX transfig-ru_RU.KOI8-R.ps 6015 SHA256 af71380057217460eb476e9a6800e3c7bbe22db44420d0d5d6939bd3321a4c86 SHA512 1222403ca7fa7e1a796e46e9693237d9a7afa8889e66af17b5c705f0383ab32382a21a499059f0fef5b6a3640385f74da77e5d1a8e4406ef1c635e48a551885d WHIRLPOOL 6c661b755be14a959d62f2f7fbe9e6fad8d335bc8fa32686b5b1042dd5057b45025303f1f8fe493b7783e888f6d3b0a78249d381846a6903c9f55dba79f33f94 -AUX transfig-uk_UA.KOI8-U.ps 6023 SHA256 b71427fb5e938ee285aea7290af41bcfc1f6820520f5ca7a2746dd51c00b5eee SHA512 e7dd914414594e27e38905c114e9ce86a29a551facadf08ba8beb7087e5e30e400a3e3cc4472d31dce3b2f0cf1b864806915c71efd76b518d3a815a98bb2d020 WHIRLPOOL eb1f5579de8c4845db836a4cb418bf9205a47d2c938626ff6b4a4bf59241c833d6967d5b40c32fdaf6965fabb62090a596586be0b272dc6636aec2d13e46eaec DIST fig2mpdf-1.1.2.tar.bz2 191438 SHA256 35f02293592244d5ff4a7a60e00023696c05dec855495871226c67669ba4daf3 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 WHIRLPOOL 73f98e0c8f26a0a9f5a06ba38169a107587dd09ecce69c69d251d46274697db7a1923479030693bf9079705820ce67b3df62d0de54492039acd0ac71f4f22fa7 -DIST transfig.3.2.5d.tar.gz 497451 SHA256 ae81214177fb05f91f6e43b0b42633b6e0024570cbc6591a3858e12100ce8aaa SHA512 6e9b9551bf3bff7a94d6a0d8bac336c36b2721f9babc4cf38472737ac737afd27f93dcb012e510d6c439c6aaeed95ba03b19508b4229386915c0dc0751daac10 WHIRLPOOL ca503a9ba228f54d20a6771dfca9dd0e6bb127618db8bc94bf1a62149e007627786fe2eee8f15a47723781d8381950cfac97264b5846550f7c669a8d8c82a1f2 +DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 SHA256 47cba917dee66b1a8a3fe97c8658000acd66aee378a65537ce29bee6aae16162 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97 WHIRLPOOL 6fba3859fb8768f56cd9bea6acbdd2a0855b285c1a513f05ee7ab50e8651fcf7f262abb7b52167c84dedffd4472cb0f37f2ca38cda91e03e24e289b1984f14f3 DIST transfig.3.2.5e.tar.gz 531256 SHA256 8ec5a8f13254dd155622ed3ee0fda1382b1e2b5882d83b9aca1871f12a3e7744 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e WHIRLPOOL a781dd6fd85ff7ff12219444a8fbc91fc8c7f6fe1b4628cc1fd6bb3feae29392edc62a8f3a4db0945bdf2e67a67af7046864826024acdbaa8a8581a873cdb82f -EBUILD transfig-3.2.5d-r1.ebuild 2701 SHA256 9be7d58284c642cdc319296cc520e19aac33392e5dfb20b141d67ccdd94a27fe SHA512 fc31324d34c7fad3f117018162abc8d945efceb819ad7572df9368d00d6d4c77cd47114a4a915c0dcb41cf70f18db7e21ef4126b298fae05c31fdf422c718cc7 WHIRLPOOL d7de72d5d97e449401c70ad8ca5e17fc71e7035441065dd0605c0e5850d09ac76d7e33407d7734bfad0d309c50e85758f986902075b386d523edca51c4f2b206 -EBUILD transfig-3.2.5e.ebuild 2702 SHA256 80b07c142896fbf0b47a36520786a0dedf9a8d98851206c1701a500feb776014 SHA512 1ce1d7e1473553ccf7bee8a5e8b2e677da6c2347b6a272528e6596cabea100ab2d9565d8954473e812d561fd2da24779d8bc7fd8c64584a3369386c09661043b WHIRLPOOL 3de68fc233d35f2607fdc1735992b8540ba92e64c164bf655e9c634648397b93b0b5997bc83939a58cfa4ee12f03b6cf93c1d5c84d9a7570e0f738817d1ae536 +EBUILD transfig-3.2.5e.ebuild 2946 SHA256 cc7c411dfbbb8efe17109eb521a9d538148f256444fc6936059b0b1175ddda27 SHA512 83202a1804a380485ba77d5a1f0a755c215b1cec408bc81e83928a6b2984ede40f534abd100dc336371463df0e475464e265dabf06dffd344fbcc284b382a68d WHIRLPOOL 5319d93af2fbc564db83a584d25fb0afb0d16a4f5d4201ed1c45221b8d11e21c5e0d66949b64bda40020e0a9a5b89242a8966bd9486f0bfd774c0e6ae8c259f3 MISC ChangeLog 2938 SHA256 6403e9d91d7ce6cafd604d5397bf606d26d279ab2fb0fa52dccb13827ea4d90d SHA512 7dca29c5c4796e1780441376b73373f0a6881b6829dc2198c038de23c4480cc815d62eb0cfe912c9c856282b13c89d793e36c69d414f5cb9305d532262f50ce6 WHIRLPOOL 61a5715ce41e7aaec78b9ad8d0a10679d0ec3e6c21315240b70cdf81997bbac4da495e0761516e29dd11bb75935b67d69ea8647043745e1451d12c80448fc486 MISC ChangeLog-2015 12854 SHA256 df42b41e6259d566fa4f7ba91f8d09f88881f39d3b05740a2046e927ac12bb05 SHA512 9474319e26af282a9d52befb8dc569b6464efd8bb704cf986d8d85a7f3cdcbbd64569c9e8ded50510d9868438b6ca26547818581da08993d3b378f39bfc15419 WHIRLPOOL 1ee16d1fcd5f8199e1a96988d7b9bdb980e3ee23a592ceedcc20f069ec36409a579198af1ab4aecdd107846ba7f7caa7f15180fc0d708bbaca4c388f86996d81 MISC metadata.xml 212 SHA256 00d100e8d1bbfee4c0e3dcd7695c183150d06133fddd672e246c21bc02c4c8d7 SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22 WHIRLPOOL 1fd2058c94f0e8891205ed1e106759e99c8bd0f765618fc2fc801e566241b062a1219f5044b8b7ed1299b28a189846c2d125ea86b71f72e9fa403ad3f0dea4b3 diff --git a/media-gfx/transfig/files/transfig-3.2.5-solaris.patch b/media-gfx/transfig/files/transfig-3.2.5-solaris.patch deleted file mode 100644 index 680a0591f1cf..000000000000 --- a/media-gfx/transfig/files/transfig-3.2.5-solaris.patch +++ /dev/null @@ -1,12 +0,0 @@ -Fixes complation error on both Darwin and Solaris - ---- fig2dev/fig2dev.h -+++ fig2dev/fig2dev.h -@@ -20,6 +20,7 @@ - #include "patchlevel.h" - #include - #include -+#include - #include - #include - #include diff --git a/media-gfx/transfig/files/transfig-3.2.5c-maxfontsize.patch b/media-gfx/transfig/files/transfig-3.2.5c-maxfontsize.patch deleted file mode 100644 index 9ce105fe9355..000000000000 --- a/media-gfx/transfig/files/transfig-3.2.5c-maxfontsize.patch +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09_maxfontsize.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: For fonts >=42pt use the given font size in TeX instead of -## DP: restricting this to 42pt. This allows to create posters using -## DP: \usepackage{type1cm}. See -## DP: http://linuxgazette.vlsm.org/issue96/artime.html and Bug#343139 - -@DPATCH@ -diff -urNad transfig~/LATEX.AND.XFIG transfig/LATEX.AND.XFIG ---- transfig~/LATEX.AND.XFIG -+++ transfig/LATEX.AND.XFIG -@@ -55,7 +55,7 @@ - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LaTeX Preamble %%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - --\documentstyle[12pt,bezier,amstex]{article} % include bezier curves -+\documentclass[12pt,bezier,amstex]{article} % include bezier curves - \renewcommand\baselinestretch{1.0} % single space - \pagestyle{empty} % no headers and page numbers - \oddsidemargin -10 true pt % Left margin on odd-numbered pages. -@@ -72,7 +72,9 @@ - \usepackage{epsfig} - - \usepackage{graphicx} % Graphics package -- -+ -+\usepackage{type1cm} % Necessary for fonts bigger than 42pt -+ - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Document Beginning %%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -diff -urNad transfig~/fig2dev/dev/texfonts.h transfig/fig2dev/dev/texfonts.h ---- transfig~/fig2dev/dev/texfonts.h -+++ transfig/fig2dev/dev/texfonts.h -@@ -86,6 +86,7 @@ - - #define TEXFONTSIZE(S) (texfontsizes[((S) <= MAXFONTSIZE) ? (int)(round(S))\ - : (MAXFONTSIZE-1)]) -+#define TEXFONTSIZE(S) (((S) <= MAXFONTSIZE) ? texfontsizes[(int)(round(S))] : (S)) - #define TEXFONTMAG(T) TEXFONTSIZE(T->size*(rigid_text(T) ? 1.0 : fontmag)) - - void setfigfont( F_text *text ); /* genepic.c */ diff --git a/media-gfx/transfig/files/transfig-3.2.5d-MAXWIDTH.patch b/media-gfx/transfig/files/transfig-3.2.5d-MAXWIDTH.patch deleted file mode 100644 index 3ac14818655a..000000000000 --- a/media-gfx/transfig/files/transfig-3.2.5d-MAXWIDTH.patch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 23_MAXWIDTH.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Increasese MAXWIDTH of embedded images from 8K to 16K (Closes: #610466) - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/dev/psencode.c transfig/fig2dev/dev/psencode.c ---- transfig~/fig2dev/dev/psencode.c -+++ transfig/fig2dev/dev/psencode.c -@@ -18,7 +18,7 @@ - - #include "fig2dev.h" - --#define MAXWIDTH 8192 -+#define MAXWIDTH 16384 - - #define put_string nc=strlen(s); for(i=0;i -## -## All lines beginning with `## DP:' are a description of the patch. - -## DP: creating multilayered or singlelayer PDF or EPS figures for -## DP: including into LaTeX documents. -## DP: http://p3f.gmxhome.de/fig2mpdf/fig2mpdf.html - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/doc/fig2dev.1 transfig/doc/fig2dev.1 ---- transfig~/doc/fig2dev.1 -+++ transfig/doc/fig2dev.1 -@@ -53,8 +53,8 @@ - \fBbox, cgm, epic, eepic, eepicemu, emf, eps, gbx (Gerber beta driver), gif, ibmgl, jpeg, - latex, map (HTML image map), mf (MetaFont), - mp (MetaPost), mmp (Multi-MetaPost), --pcx, pdf, pdftex, pdftex_t, pic, pictex, png, ppm, ps, --pstex, pstex_t, pstricks, ptk (Perl/tk), -+pcx, pdf, pdftex, pdftex_t, pdftex_p, pic, pictex, png, ppm, ps, -+pstex, pstex_t, pstex_p, pstricks, ptk (Perl/tk), - shape (LaTeX shaped paragraphs), sld (AutoCad slide format), - svg (beta driver), textyl, - tiff, tk (tcl/tk), tpic, xbm and -@@ -1062,6 +1062,62 @@ - font. Option 1 sets LaTeX font size only. Option 2 issues no font - commands at all. - -+.SH PSTEX_P and PDFTEX_P OPTIONS -+The \fBpstex_p\fR language has the same intention as -+the combination of \fBpstex\fR and \fBpstex_t\fR. -+The only reason to use \fBpstex_p\fR is that you have partially overlayed texts. -+\fBpstex_p\fR splits the Fig file concerning the depths of existing texts. Because -+of it's necessary to get the resulting size of the figure for the pdf document -+you have to specify the target document format -+(i.e. using \fBpstex_p\fR rsp. \fBpdftex_p\fR). -+.br -+Two files results by using this language: -+.br -+.HP +.3i -+1) A bash script for creating and removing the necessary graphics files. -+Extension: \fB.create\fR -+.HP +.3i -+.HP +.3i -+2) The latex code which includes all graphics files and special texts. Content is -+put to stdout. -+ -+.TP -+The \fBpstex_p\fR driver has the following special options: -+ -+.TP -+.B \-p basename -+specifies the basename of the files to be created (see (1) above). This option -+is mandatory. -+.TP -+.B "\-d dmag" -+Set a separate magnification for the length of line dashes to -+.I dmag. -+.TP -+.B \-E num -+Set encoding for latex text translation (0 no translation, 1 ISO-8859-1, 2 ISO-8859-2) -+.TP -+.B "\-l lwidth" -+Sets the threshold between LaTeX thin and thick lines to -+.I lwidth -+pixels. -+LaTeX supports only two different line width: \\thinlines and \\thicklines. -+Lines of width greater than -+.I lwidth -+pixels are drawn as \\thicklines. -+Also affects the size of dots in dotted line style. -+The default is 1. -+.TP -+.B \-v -+Verbose mode. -+.TP -+.B \-F -+Don't set the font face, series, and style; only set it's size and the -+baselineskip. By default, fig2dev sets all 5 font parameters when it -+puts some text. The disadvantage is that you can't set the font from your -+LaTeX document. With this option on, you can set the font from your LaTeX -+document (like "\fB\\sfshape \\input picture.eepic\fR"). -+ -+ - .SH TK and PTK OPTIONS (tcl/tk and Perl/tk) - .TP - .B \-l dummy_arg -@@ -1107,6 +1163,13 @@ - .PP - Rotated text is only supported in the IBM-GL (HP/GL) and PostScript (including eps) - languages. -+.PP -+In \fBpdftex_p\fR language \fIfig2dev\fR can not determine the exact sizes of -+the special texts set by pdflatex afterwards. If these texts are bigger than -+expected the calculated bounding box might be too small so that some texts passes -+over the figure boundaries. If this happen you have to put an invisible -+rectangle (line width 0) around the text or the entire figure. -+ - .SH COPYRIGHT - Copyright (c) 1991 Micah Beck - .br -@@ -1187,3 +1250,7 @@ - The GBX (Gerber) driver was written by - .br - Edward Grace (ej.grace@imperial.ac.uk). -+.sp -+The PSTEX_P and PDFTEX_P drivers (overlayed LaTeX texts) was written by -+.br -+Michael Pfeiffer (p3f@gmx.de) -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/dev/genpstex.c transfig/fig2dev/dev/genpstex.c ---- transfig~/fig2dev/dev/genpstex.c -+++ transfig/fig2dev/dev/genpstex.c -@@ -70,7 +70,307 @@ - genps_end (); - - static char pstex_file[1000] = ""; -+static int iObjectsRead = 0; -+static int iTextRead = 0; -+static int iObjectsFileNumber = 0; -+static int iStartDepth; -+static int iLastDepth; -+static FILE * ptCreateFile; -+static char szFileName[1000]; -+static int iLength; -+static int iPdfOutputs = 0; -+ -+#ifdef never -+static double unitlength; -+static double dash_mag = 1.0; -+ -+static int (*translate_coordinates)() = NULL; -+static int (*translate_coordinates_d)() = NULL; -+#else -+extern double unitlength; -+extern double dash_mag; -+ -+extern int (*translate_coordinates)(); -+extern int (*translate_coordinates_d)(); -+#endif -+ -+#define TOP 840 -+#define SWAP(x,y) {tmp=x; x=y; y=tmp;} -+#define TRANS(x,y) (*translate_coordinates)(&x,&y) -+#define TRANS2(x1,y1,x2,y2) (*translate_coordinates)(&x1,&y1); \ -+ (*translate_coordinates)(&x2,&y2) -+#define TRANSD(x,y) (*translate_coordinates_d)(&x,&y) -+ -+static void genpstex_p_finalize_objects(int depth); -+ -+/************************************************************************* -+ *************************************************************************/ -+static -+translate2(xp, yp) -+ int *xp, *yp; -+{ -+ *xp = *xp + 1; -+ *yp = (double)(TOP - *yp -1); -+ } -+ -+static -+translate1_d(xp, yp) -+ double *xp, *yp; -+{ -+ *xp = *xp + 1.0; -+ *yp = *yp + 1.0; -+ } -+ -+static -+translate2_d(xp, yp) -+ double *xp, *yp; -+{ -+ *xp = *xp + 1.0; -+ *yp = (double)TOP - *yp -1.0; -+ } -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_option(opt, optarg) -+char opt, *optarg; -+{ -+ if (opt == 'p') -+ { -+ strcpy(pstex_file, optarg); -+ } -+ else -+ genlatex_option(opt, optarg); -+} -+ -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_start(objects) -+ F_compound *objects; -+{ -+ int tmp; -+ struct stat tStat; -+ long lUnitLength; -+ -+ if (*pstex_file == '\0') -+ { -+ put_msg("Argument -p is mandatory to pstex_p."); -+ exit(1); -+ } -+ -+ strncpy(szFileName, pstex_file, 900); -+ iLength = strlen(szFileName); -+ -+ sprintf(szFileName + iLength, ".create"); -+ ptCreateFile = fopen (szFileName, "wb"); -+ -+ if ( ! ptCreateFile) -+ { -+ put_msg("Couldn't open %s for writing", szFileName); -+ exit(1); -+ } -+ fstat(fileno(ptCreateFile), & tStat); -+ fchmod (fileno(ptCreateFile), tStat.st_mode | ((tStat.st_mode & (S_IRUSR | S_IRGRP | S_IROTH)) >> 2)); -+ fprintf(ptCreateFile, "#!/bin/bash\n\n", szFileName); -+ -+ fprintf(ptCreateFile, "while getopts \"r\" Option\n"); -+ fprintf(ptCreateFile, "do\n"); -+ fprintf(ptCreateFile, " case $Option in\n"); -+ fprintf(ptCreateFile, " r) iOptRemove=1;;\n"); -+ fprintf(ptCreateFile, " *) echo \"illegal option -$Option\"\n"); -+ fprintf(ptCreateFile, " esac\n"); -+ fprintf(ptCreateFile, "done\n"); -+ fprintf(ptCreateFile, "shift $(($OPTIND - 1))\n"); -+ -+ texfontsizes[0] = texfontsizes[1] = -+ TEXFONTSIZE(font_size != 0.0? font_size : DEFAULT_FONT_SIZE); -+ -+ unitlength = mag/ppi; -+ dash_mag /= unitlength*80.0; -+ -+ translate_coordinates = translate2; -+ translate_coordinates_d = translate2_d; -+ -+ TRANS2(llx, lly, urx, ury); -+ if (llx > urx) SWAP(llx, urx) -+ if (lly > ury) SWAP(lly, ury) -+ -+ /* LaTeX start */ -+ -+ /* print any whole-figure comments prefixed with "%" */ -+ if (objects->comments) { -+ fprintf(tfp,"%%\n"); -+ print_comments("% ",objects->comments, ""); -+ fprintf(tfp,"%%\n"); -+ } -+ -+ lUnitLength = (long) (round(4736286.72*unitlength)); -+ fprintf(tfp, "\\setlength{\\unitlength}{%lisp}%%\n", -+ lUnitLength); -+ /* define the SetFigFont macro */ -+ define_setfigfont(tfp); -+ -+ sprintf(szFileName + iLength, ".size"); -+ fprintf(ptCreateFile, "if [ \"$iOptRemove\" == \"\" ]; then\n"); -+ if (iPdfOutputs) -+ fprintf(ptCreateFile, " echo \"\\setlength\\pdfpagewidth{%3.2fpt}\\setlength\\pdfpageheight{%3.2fpt}\" > %s\n", -+ (float) lUnitLength / 65536 * (urx - llx), (float) lUnitLength / 65536 * (ury - lly), szFileName); -+ else -+ fprintf(ptCreateFile, "echo -n\"\" > %s\n", szFileName); -+ fprintf(ptCreateFile, "else\n rm -f %s\nfi\n", szFileName); -+} -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpdftex_p_start(objects) -+ F_compound *objects; -+{ -+ iPdfOutputs = 1; -+ genpstex_p_start(objects); -+} -+ -+ -+/************************************************************************* -+ *************************************************************************/ -+int genpstex_p_end() -+{ -+ if (iTextRead) -+ { -+ fprintf(tfp, "\\end{picture}%%\n"); -+ iTextRead = 0; -+ } -+ if (iObjectsRead) -+ { -+ genpstex_p_finalize_objects(iLastDepth); -+ iObjectsRead = 0; -+ } -+ -+ /* LaTeX ending */ -+ fprintf(tfp, "\\begin{picture}(%d,%d)\n", urx-llx, ury-lly); -+ fprintf(tfp, "\\end{picture}%%\n"); -+ -+ fclose(ptCreateFile); -+ -+ /* all ok */ -+ return 0; -+} -+ -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_finalize_objects(depth) -+int depth; -+{ -+ char szFileName[1000]; -+ int iLength; -+ -+ strncpy(szFileName, pstex_file, 900); -+ iLength = strlen(szFileName); -+ -+ -+ sprintf(szFileName + iLength, "%03d", iObjectsFileNumber++); -+ fprintf(ptCreateFile, "if [ \"$iOptRemove\" == \"\" ]; then\n"); -+ if (iPdfOutputs) -+ { -+ fprintf(ptCreateFile, " %s -L pstex -D +%d,%d %s", prog, depth, iStartDepth, from, szFileName); -+ fprintf(ptCreateFile, " | epstopdf -f > %s.pdf\n", szFileName, szFileName); -+ } -+ else -+ fprintf(ptCreateFile, "%s -L pstex -D +%d,%d %s %s.eps\n", prog, depth, iStartDepth, from, szFileName); -+ fprintf(ptCreateFile, "else\n rm -f %s.", szFileName); -+ if (iPdfOutputs) -+ fprintf(ptCreateFile, "pdf"); -+ else -+ fprintf(ptCreateFile, "eps"); -+ fprintf(ptCreateFile, "\nfi\n"); -+ -+ fprintf(tfp, "\\begin{picture}(0,0)%%\n"); -+/* newer includegraphics directive suggested by Stephen Harker 1/13/99 */ -+#if defined(LATEX2E_GRAPHICS) -+# if defined(EPSFIG) -+ fprintf(tfp, "\\epsfig{file=%s.eps}%%\n",szFileName); -+# else -+ fprintf(tfp, "\\includegraphics{%s}%%\n",szFileName); -+# endif -+#else -+ fprintf(tfp, "\\special{psfile=%s.eps}%%\n",szFileName); -+#endif -+ fprintf(tfp, "\\end{picture}%%\n"); -+} -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_object(depth) -+int depth; -+{ -+ if (iTextRead) -+ { -+ fprintf(tfp, "\\end{picture}%%\n"); -+ iTextRead = 0; -+ } -+ if (iObjectsRead == 0) -+ { -+ iStartDepth = depth; -+ iObjectsRead = 1; -+ } -+ iLastDepth = depth; -+ -+} - -+void genpstex_p_arc(obj) -+F_arc *obj; -+{ -+ genpstex_p_object(obj->depth); -+} -+ -+ -+void genpstex_p_ellipse(obj) -+F_ellipse *obj; -+{ -+ genpstex_p_object(obj->depth); -+} -+ -+void genpstex_p_line(obj) -+F_line *obj; -+{ -+ genpstex_p_object(obj->depth); -+} -+ -+void genpstex_p_spline(obj) -+F_spline *obj; -+{ -+ genpstex_p_object(obj->depth); -+} -+ -+ -+ -+/************************************************************************* -+ *************************************************************************/ -+void genpstex_p_text(t) -+F_text *t; -+{ -+ -+ if (!special_text(t)) -+ genpstex_p_object(t->depth); -+ else -+ { -+ if (iObjectsRead) -+ { -+ genpstex_p_finalize_objects(iLastDepth); -+ iObjectsRead = 0; -+ } -+ if (iTextRead == 0) -+ { -+ fprintf(tfp, "\\begin{picture}(0,0)(%d,%d)\n", llx, lly); -+ iTextRead = 1; -+ } -+ genlatex_text(t); -+ } -+ -+} -+ -+/************************************************************************* -+ *************************************************************************/ - void genpstex_t_option(opt, optarg) - char opt, *optarg; - { -@@ -112,6 +412,8 @@ - else genlatex_text(t); - } - -+/************************************************************************* -+ *************************************************************************/ - void genpstex_text(t) - F_text *t; - { -@@ -128,6 +430,32 @@ - genlatex_option(opt, optarg); - } - -+struct driver dev_pstex_p = { -+ genpstex_p_option, -+ genpstex_p_start, -+ gendev_null, -+ genpstex_p_arc, -+ genpstex_p_ellipse, -+ genpstex_p_line, -+ genpstex_p_spline, -+ genpstex_p_text, -+ genpstex_p_end, -+ INCLUDE_TEXT -+}; -+ -+struct driver dev_pdftex_p = { -+ genpstex_p_option, -+ genpdftex_p_start, -+ gendev_null, -+ genpstex_p_arc, -+ genpstex_p_ellipse, -+ genpstex_p_line, -+ genpstex_p_spline, -+ genpstex_p_text, -+ genpstex_p_end, -+ INCLUDE_TEXT -+}; -+ - struct driver dev_pstex_t = { - genpstex_t_option, - genpstex_t_start, -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/drivers.h transfig/fig2dev/drivers.h ---- transfig~/fig2dev/drivers.h -+++ transfig/fig2dev/drivers.h -@@ -30,8 +30,10 @@ - extern struct driver dev_pdf; - extern struct driver dev_pdftex; - extern struct driver dev_pdftex_t; -+extern struct driver dev_pdftex_p; - extern struct driver dev_pstex; - extern struct driver dev_pstex_t; -+extern struct driver dev_pstex_p; - extern struct driver dev_pstricks; - extern struct driver dev_textyl; - extern struct driver dev_tk; -@@ -75,6 +77,7 @@ - {"pdf", &dev_pdf}, - {"pdftex", &dev_pdftex}, - {"pdftex_t", &dev_pdftex_t}, -+ {"pdftex_p", &dev_pdftex_p}, - {"pic", &dev_pic}, - {"pictex", &dev_pictex}, - {"png", &dev_bitmaps}, -@@ -82,6 +85,7 @@ - {"ps", &dev_ps}, - {"pstex", &dev_pstex}, - {"pstex_t", &dev_pstex_t}, -+ {"pstex_p", &dev_pstex_p}, - {"pstricks", &dev_pstricks}, - {"ptk", &dev_ptk}, - {"shape", &dev_shape}, -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2dev/fig2dev.c transfig/fig2dev/fig2dev.c ---- transfig~/fig2dev/fig2dev.c -+++ transfig/fig2dev/fig2dev.c -@@ -651,6 +651,18 @@ - #endif /* NFSS */ - printf(" -p name name of the PostScript file to be overlaid\n"); - -+ printf("PSTEX_P and PDFTEX_P Options:\n"); -+ printf(" -p name basename of the files to be created\n"); -+#ifdef NFSS -+ printf(" -F don't set font family/series/shape, so you can\n"); -+ printf(" set it from latex\n"); -+#endif /* NFSS */ -+ printf(" -d dmag set separate magnification for length of line dashes to dmag\n"); -+ printf(" -E num set encoding for text translation (0 no translation,\n"); -+ printf(" 1 ISO-8859-1, 2 ISO-8859-2)\n"); -+ printf(" -l lwidth set threshold between thin and thick lines to lwidth\n"); -+ printf(" -v verbose mode\n"); -+ - printf("SHAPE (ShapePar driver) Options:\n"); - printf(" -n name Set basename of the macro (e.g. \"face\" gives faceshape and facepar)\n"); - printf("Tcl/Tk (tk) and Perl/Tk (ptk) Options:\n"); -@@ -778,6 +790,12 @@ - int rec_comp(r1, r2) - struct obj_rec *r1, *r2; - { -+ if (r2->depth == r1->depth) -+ { -+ if ((r1->gendev == dev->text) ^ (r2->gendev == dev->text)) -+ return ((r1->gendev == dev->text) * 2 - 1); -+ return (0); -+ } - return (r2->depth - r1->depth); - } - -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2mpdf/copyright.txt transfig/fig2mpdf/copyright.txt ---- transfig~/fig2mpdf/copyright.txt -+++ transfig/fig2mpdf/copyright.txt -@@ -0,0 +1,25 @@ -+The following files contain copyright and license info for -+the code they contain: -+fig2mpdf, fig2mpdf.1, transfig.3.2.4.patch, transfig-3.2.5-alpha7.patch -+ -+-- fig2mpdf copyright begins here -- -+ -+ fig2mpdf/pdftex_p and pstex_p driver of fig2dev -+ Copyright (C) 2006 Michael Pfeiffer -- p3fff@web.de -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ (Author's note: the license is in the file gpl.txt, which is included -+ in the archive.) -diff -urNad '--exclude=CVS' '--exclude=.svn' transfig~/fig2mpdf/fig2mpdf transfig/fig2mpdf/fig2mpdf ---- transfig~/fig2mpdf/fig2mpdf -+++ transfig/fig2mpdf/fig2mpdf -@@ -0,0 +1,653 @@ -+#!/bin/sh -+ -+unset POSIXLY_CORRECT -+ -+gawk ' -+######################################################################### -+######################################################################### -+BEGIN { -+ -+ cmdGawk = "gawk"; -+ cmdCat = "cat"; -+ cmdLess = "less"; -+ cmdRm = "rm" -+ cmdMv = "mv" -+ cmdLatex = "latex"; -+ cmdPdftex = "pdflatex"; -+ cmdEpsToPdf = "epstopdf"; -+ cmdDvips = "dvips"; -+ cmdFig2dev = "fig2dev"; -+ cmdTouch = "touch"; -+ -+ szVersion = "1.1.2"; -+ iError = 0; -+ iGapWidth = 1; -+ -+ -+ # get the options -+ szOptString = "&l%e&m$p%i%I$s$H$g%G%v%V%d"; -+ getopt(szOptString); -+ -+ if (aOptions["d"]) -+ { -+ aOptions["v"] = "-"; -+ for (iI = 0; iI < ARGC; iI++) -+ printf("ARGV[%d]=%s\n", iI, ARGV[iI]); -+ -+ iDim = split(szOptString, aOpts, "[$%&]"); -+ for (iI = 2; iI <= iDim; iI++) -+ debug("aOptions[%s] = >%s<\n", aOpts[iI], aOptions[aOpts[iI]]); -+ } -+ -+ -+ -+ if (aOptions["V"] != "") -+ { -+ printf("fig2mpdf: version %s\n", szVersion); -+ iError = 1; -+ exit(0); -+ } -+ -+ szTmpPrefix = "_fig2mpdf" -+ -+ iLine = -1; -+ iInString = 0; -+ iDepths = 1; -+ -+ iInvalidDepth = -2 -+ iAdminDepth = 2000 -+ -+ szBase = ARGV[1]; -+ szOrigFile = ARGV[1]; -+ szOrigPath = ARGV[1]; -+ -+ # set default switch state -+ iDoMultiLayer = 0; -+ iDoLatex = 0; -+ iDoPdftex = 1; -+ iIncludeLowestRange = 1; -+ -+ # set iDoLatex and iDoMultiLayer concerning the given suffix -+ match(szBase, /\.[^\.\/]+$/); -+ if (RLENGTH != -1) -+ { -+ szSuffix = substr(szBase, RSTART); -+ if (szSuffix == ".lfig") -+ iDoLatex = 1; -+ else if (szSuffix == ".mfig") -+ iDoMultiLayer = 1; -+ else if ((szSuffix == ".mlfig") || (szSuffix == ".lmfig")) -+ { -+ iDoLatex = 1; -+ iDoMultiLayer = 1; -+ } -+ } -+ -+ ################################ -+ # evalutate options -+ -+ # set toggle latex -+ if (aOptions["l"] == "-") -+ iDoLatex = 1; -+ if (aOptions["l"] == "+") -+ iDoLatex = 0; -+ -+ # set multilayer flag -+ if (aOptions["m"] == "-") -+ iDoMultiLayer = 1; -+ if (aOptions["m"] == "+") -+ iDoMultiLayer = 0; -+ -+ # set toggle pdftex -+ if (aOptions["e"] == "-") -+ iDoPdftex = 0; -+ -+ # evaluate do not include lowest layer in all figs -+ iIncludeLowestRange = (aOptions["i"] == "-"); -+ -+ # evaluate include all lower ranges in the sub figs -+ iIncludeAllLowerRanges = (aOptions["I"] != "-"); -+ -+ # check consistencies -+ # if there are ranges given -> do multilayer -+ if (aOptions["p"] != "") -+ iDoMultiLayer = 1; -+ -+ -+ if (aOptions["g"] != "") -+ { -+ if ( ! match (aOptions["g"], /^[0-9]+$/)) -+ usage(); -+ -+ iGapWidth = aOptions["g"] + 1; -+ } -+ -+ # get the basename of the source -+ gsub(/\.[^\/]+$/, "", szBase); -+ gsub(/^.*\//, "", szBase); -+ -+ # get the path to the original -+ gsub(/[^\/]+$/, "", szOrigPath); -+} -+######################################################################### -+######################################################################### -+ -+( iInString != 0) { -+ aszLine[iLine] = sprintf("%s\n%s", aszLine[iLine], $0); -+ iInString = (match($0, "\\\\001$") == 0); -+ iSubLine++; -+ next; -+} -+ -+/^[135][ ]/ { -+ iCmd = $1; -+ iSubCmd = -1; -+ iSubLine = 0; -+ aiDepth[++iLine] = fnGetDepth($1); -+ aszLine[iLine] = $0; -+ next; -+} -+ -+/^[2][ ]/ { -+ iCmd = $1; -+ iSubCmd = $2; -+ iSubLine = 0; -+ aiDepth[++iLine] = fnGetDepth($1); -+ aszLine[iLine] = $0; -+ next; -+} -+ -+ -+/^[4][ ]/ { -+ iCmd = $1; -+ iSubCmd = $2; -+ iSubLine = 0; -+ aiDepth[++iLine] = fnGetDepth($1); -+ aszLine[iLine] = $0; -+ iInString = (match($0, "\\\\001$") == 0); -+ next; -+} -+ -+/^(6[ ])|(-6)/ { -+ iCmd = $1; -+ iSubCmd = -1; -+ iSubLine = 0; -+ next; -+} -+ -+/^[^ ]/ { -+ iCmd = -1; -+ aiDepth[++iLine] = fnGetDepth("A"); -+ iSubLine = 0; -+ aszLine[iLine] = $0; -+ next; -+} -+ -+/^[ ]/ { -+ iSubLine++; -+ if ((iCmd == 2) && (iSubCmd == 5) && (iSubLine == 1)) -+ { -+ if (match($0, "^\t[01] ")) -+ { -+ szFileName = substr($0, RSTART + RLENGTH); -+ if ( ! match(szFileName, /^\//)) -+ szFileName = sprintf("%s%s", szOrigPath, szFileName); -+ aszLine[iLine] = sprintf("%s\n\t%s %s", aszLine[iLine], $1, szFileName); -+ } -+ else -+ aszLine[iLine] = sprintf("%s\n%s", aszLine[iLine], $0); -+ } -+ else -+ aszLine[iLine] = sprintf("%s\n%s", aszLine[iLine], $0); -+} -+ -+ -+END { -+ iLine++; -+ iLowestLayer = 0; -+ iFirstRange = 0; -+ -+ if (iError == 0) -+ { -+ -+ -+ if (iDoMultiLayer) -+ { -+ asort(aiDepths, aiSortedDepth); -+ -+ # check for ranges as options -+ if (aOptions["p"] != "") -+ { -+ # we have explicit ranges -+ gsub(/-/, ":", aOptions["p"]); -+ iRanges = split(aOptions["p"], aszRanges, ","); -+ } -+ else -+ { -+ if (iDepths < 4) -+ { -+ iRanges = 1; -+ aszRanges[1] = "1:999"; -+ } -+ else -+ { -+ iRanges = 0; -+ iLastRange = aiSortedDepth[iDepths - 2] + 0; -+ iRangeStart = iLastRange; -+ for (iI = iDepths - 3; iI > 0; iI--) -+ { -+ aiSortedDepth[iI] += 0; -+ if ((aiSortedDepth[iI] < iLastRange - iGapWidth) || (iI == 1)) -+ { -+ if (aiSortedDepth[iI] >= iLastRange - iGapWidth) -+ iLastRange = aiSortedDepth[iI]; -+ -+ if (iLastRange != iRangeStart) -+ aszRanges[++iRanges] = sprintf("%d:%d", iLastRange, iRangeStart); -+ else -+ aszRanges[++iRanges] = sprintf("%d", iRangeStart); -+ iRangeStart = aiSortedDepth[iI]; -+ -+ if ((iI == 1) && (aiSortedDepth[iI] < iLastRange - iGapWidth)) -+ aszRanges[++iRanges] = sprintf("%d", aiSortedDepth[iI]); -+ } -+ iLastRange = aiSortedDepth[iI]; -+ } -+ } -+ } -+ -+ -+ # check for a multilayer file with only one range -+ if ((iRanges == 1) && iIncludeLowestRange) -+ { -+ iIncludeLowestRange = 0; -+ } -+ -+ szInitRangeList = " -D "; -+ szSep = ""; -+ -+ if (iIncludeLowestRange) -+ { -+ szInitRangeList = sprintf("%s+%s", szInitRangeList, aszRanges[1]); -+ szSep = ","; -+ } -+ szRangeList = szInitRangeList; -+ -+ # step through the ranges -+ for (iI = iIncludeLowestRange; iI < iRanges; iI++) -+ { -+ szFileBase = sprintf("%s-%d", szBase, iI - iIncludeLowestRange); -+ -+ if (aOptions["I"]) -+ { -+ szRangeList = sprintf("%s%s+%s", szRangeList, szSep, aszRanges[iI + 1]); -+ szSep = ","; -+ } -+ else -+ szRangeList = sprintf("%s%s+%s", szInitRangeList, szSep, aszRanges[iI + 1]); -+ -+ -+ if (iDoLatex) -+ szTargetFile = fnDoTexFig(szFileBase, szOrigFile, szRangeList, (iDoPdftex != 0)); -+ else -+ szTargetFile = fnDoNormalFig(szFileBase, szOrigFile, szRangeList, (iDoPdftex != 0)); -+ -+ -+ if (aOptions["G"]) -+ { -+ match(szTargetFile, /\.[^.]*$/); -+ szCommand = sprintf("%s %s %s.page%d%s", cmdMv, szTargetFile, szBase, iI - iIncludeLowestRange, substr(szTargetFile, RSTART, RLENGTH)); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ } -+ } -+ } -+ else -+ { -+ szRangeList = ""; -+ -+ if (iDoLatex) -+ szTargetFile = fnDoTexFig(szBase, szOrigFile, szRangeList, (iDoPdftex != 0)); -+ else -+ szTargetFile = fnDoNormalFig(szBase, szOrigFile, szRangeList, (iDoPdftex != 0)); -+ } -+ } -+} -+ -+ -+ -+######################################################################### -+######################################################################### -+function debug(str, arg0, arg1, arg2, arg3, arg4) -+{ -+ if (aOptions["v"]) -+ printf (str, arg0, arg1, arg2, arg3, arg4); -+} -+ -+######################################################################### -+######################################################################### -+function fnGetDepth (iControl) -+{ -+ -+ if (iControl == 1) -+ { -+ iReturn = sprintf("%04d", $7); -+ } -+ else if (iControl == 2) -+ { -+ iReturn = sprintf("%04d", $7); -+ } -+ else if (iControl == 3) -+ { -+ iReturn = sprintf("%04d", $7); -+ } -+ else if (iControl == 4) -+ { -+ iReturn = sprintf("%04d", $4); -+ } -+ else if (iControl == 5) -+ { -+ iReturn = sprintf("%04d", $7); -+ } -+ else if ((iControl == 6) || (iControl == -6)) -+ { -+ iReturn = sprintf("%04d", iInvalidDepth); -+ } -+ else -+ { -+ iReturn = sprintf("%04d", iAdminDepth); -+ } -+ -+ if (iReturn >= 0) -+ { -+ if (ahDepths[iReturn] == 0) -+ { -+ ahDepths[iReturn] = 1; -+ aiDepths[iDepths++] = iReturn; -+ } -+ } -+ -+ return (iReturn); -+ -+} -+ -+######################################################################### -+######################################################################### -+function fnDoNormalFig(szFileNameBase, szFigFile, szRangeList, iPdf, -+ szEpsFile, szPdfFile, szTargetFile, szCommand) -+{ -+ -+ debug("FileNameBase >%s< FigFile >%s< Pdf:%d\n", szFileNameBase, szFigFile, iPdf); -+ -+ if (iPdf) -+ szEpsFile = sprintf("%s%s.eps", szTmpPrefix, szFileNameBase); -+ else -+ { -+ szEpsFile = sprintf("%s.eps", szFileNameBase); -+ szTargetFile = szEpsFile; -+ } -+ -+ szCommand = sprintf("%s -L eps %s %s %s 2> /dev/null", cmdFig2dev, szRangeList, szFigFile, szEpsFile); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ -+ if (iPdf) -+ { -+ szPdfFile = sprintf("%s.pdf", szFileNameBase); -+ szTargetFile = szPdfFile; -+ szCommand = sprintf("%s --outfile=%s %s", cmdEpsToPdf, szPdfFile, szEpsFile); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ -+ -+ if ( ! aOptions["d"]) -+ { -+ szCommand = sprintf("%s -f %s", cmdRm, szEpsFile); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ } -+ } -+ -+ -+ return (szTargetFile); -+} -+ -+ -+######################################################################### -+######################################################################### -+function fnDoTexFig(szFileNameBase, szFigFile, szRangeList, iPdf, -+ szEpsFile, szPdfFile, szTexDoc, szTexPdf, szTexLog, szTexAux, szTexInp, szTmpPs, szTmpPdf, szTexSiz, szTmpEps, szCommand, szHeader) -+{ -+ -+ debug("FileNameBase >%s< FigFile >%s< Pdf:%d\n", szFileNameBase, szFigFile, iPdf); -+ -+ szEpsFile = sprintf("%s.eps", szFileNameBase); -+ szPdfFile = sprintf("%s.pdf", szFileNameBase); -+ szTexDoc = sprintf("%s%s_doc.tex", szTmpPrefix, szFileNameBase); -+ szTexPdf = sprintf("%s%s_doc.pdf", szTmpPrefix, szFileNameBase); -+ szTexDvi = sprintf("%s%s_doc.dvi", szTmpPrefix, szFileNameBase); -+ szTexLog = sprintf("%s%s_doc.log", szTmpPrefix, szFileNameBase); -+ szTexAux = sprintf("%s%s_doc.aux", szTmpPrefix, szFileNameBase); -+ szTexInpPref = sprintf("%s%s_inp", szTmpPrefix, szFileNameBase); -+ szTexInp = sprintf("%s.tex", szTexInpPref); -+ szTexCreator = sprintf("%s.create", szTexInpPref); -+ szTexSiz = sprintf("%s.size", szTexInpPref); -+ -+ if (iPdf) -+ szCommand = sprintf("%s -L pdftex_p %s -p %s %s %s", cmdFig2dev, szRangeList, szTexInpPref, szFigFile, szTexInp); -+ else -+ szCommand = sprintf("%s -L pstex_p %s -p %s %s %s", cmdFig2dev, szRangeList, szTexInpPref, szFigFile, szTexInp); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ -+ szCommand = sprintf("./%s", szTexCreator); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ -+ # check if there is an own hederfile to include -+ if (aOptions["s"] == "") -+ aOptions["s"] = "times"; -+ -+ if (aOptions["H"] == "") -+ { -+ szHeader = sprintf("\\documentclass{article}\n\ -+\\usepackage{german,amssymb,amsmath}\n\ -+\\usepackage{%s}", aOptions["s"]); -+ } -+ else -+ szHeader = sprintf("\\input{%s}\n", aOptions["H"]); -+ -+ szHeader = sprintf("%s\n\ -+\\usepackage{color}\n\ -+\\usepackage{ifpdf}\n\ -+\\setlength{\\textwidth}{100cm}\n\ -+\\setlength{\\textheight}{100cm}\n\ -+\\setlength{\\topmargin}{-1in}\n\ -+\\setlength{\\headsep}{0pt}\n\ -+\\setlength{\\headheight}{0pt}\n\ -+\\setlength{\\oddsidemargin}{-1in}\n\ -+\\parindent=0cm\n\ -+\\ifpdf\n\ -+\\usepackage[pdftex]{graphicx}\n\ -+\\DeclareGraphicsExtensions{.pdf,.png,.jpg}\n\ -+\\usepackage{epsfig}\n\ -+\\input{%s}\n\ -+\\else\n\ -+\\usepackage{graphicx}\n\ -+\\usepackage{epsfig}\n\ -+\\fi\n\ -+", szHeader, szTexSiz); -+ -+ szCommand = sprintf("%s > %s << EOF\n\ -+%s\\begin{document}\n\ -+\\pagestyle{empty}\n\ -+\\input{%s}\n\ -+\\end{document}\n\ -+EOF", cmdCat, szTexDoc, szHeader, szTexInp); -+ if (aOptions["d"] != "") -+ debug("%s\n", szCommand); -+ system(szCommand); -+ -+ if (iPdf) -+ { -+ -+ szCommand = sprintf("%s -interaction batchmode %s", cmdPdftex, szTexDoc); -+ debug("%s\n", szCommand); -+ iReturn = system(szCommand); -+ -+ if (iReturn) -+ { -+ szCommand = sprintf("%s %s | %s +G", cmdCat, szTexLog, cmdLess); -+ system (szCommand); -+ } -+ else -+ { -+ szCommand = sprintf("%s %s %s", cmdMv, szTexPdf, szPdfFile); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ } -+ -+ } -+ else -+ { -+ szCommand = sprintf("%s -interaction batchmode %s", cmdLatex, szTexDoc); -+ debug("%s\n", szCommand); -+ iReturn = system(szCommand); -+ if (iReturn) -+ { -+ szCommand = sprintf("%s %s | %s +G", cmdCat, szTexLog, cmdLess); -+ system (szCommand); -+ } -+ else -+ { -+ szCommand = sprintf("%s -q -E %s -o %s 2>&1 > /dev/null", cmdDvips, szTexDvi, szEpsFile); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ } -+ } -+ -+ if ( ! aOptions["d"]) -+ { -+ szCommand = sprintf("./%s -r", szTexCreator); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ } -+ -+ if ( ! aOptions["d"]) -+ { -+ szCommand = sprintf("%s -f %s %s %s %s %s %s %s", cmdRm, szTexDoc, szTexLog, szTexAux, szTexDvi, szTexInp, szTexCreator, szTexPdf); -+ debug("%s\n", szCommand); -+ system(szCommand); -+ } -+ -+ if (iPdf) -+ return (szPdfFile); -+ else -+ return (szEpsFile); -+} -+ -+ -+######################################################################### -+######################################################################### -+function getopt(sOptions, n, m, fHuntParam, iSearchMinus, iSPos, iCLen, iHuntSwitches, szSwChar, szOptChar) { -+# Options: Flagoptions: %f -+# Parameter: $p -+ -+ n = 1; # index in argv -+ m = 1; # processed entries in argv finally it points to the firs$ -+ iSearchMinus = 1; # indicate that a switch leading sign minus is expected -+ -+ # check for initial -- to separate the gawk switches from the script switches -+ if (ARGV[n] == "--") -+ n++; -+ -+ -+ while (n < ARGC) -+ { -+ iHuntSwitches = 0; -+ iCLen = length(ARGV[n]); -+ -+ szSwChar = substr(ARGV[n], 1, 1); -+ if ((szSwChar == "-") || (szSwChar == "+")) -+ { -+ if ((iSearchMinus == 0) || fHuntParam) -+ usage(); -+ iHuntSwitches = 1; -+ iSPos = 2; -+ fHuntParam = 0; -+ } -+ else -+ { -+ iSPos = 1; -+ -+ if (fHuntParam == 0) -+ iSearchMinus = 0; -+ } -+ -+ while (iSPos <= iCLen) -+ { -+ if (iHuntSwitches) -+ { -+ szOptChar = substr(ARGV[n], iSPos, 1); -+ iOPos = index(sOptions, szOptChar); -+ if (iOPos == 0) -+ { -+ printf("unknown option \"%s\"\n", szOptChar); -+ usage(); -+ } -+ if ((substr(sOptions, iOPos - 1, 1) == "&") || ((substr(sOptions, iOPos - 1, 1) == "%") && (szSwChar == "-"))) -+ { -+ aOptions[szOptChar] = szSwChar; -+ iSPos = iSPos + 1; -+ } -+ else if ((substr(sOptions, iOPos - 1, 1) == "$") && (szSwChar == "-")) -+ { -+ fHuntParam = 1; -+ iHuntSwitches = 0; -+ iSPos = iSPos + 1; -+ } -+ else -+ usage(); -+ -+ } -+ else if (fHuntParam) -+ { -+ fHuntParam = 0; -+ aOptions[szOptChar] = substr(ARGV[n], iSPos, iCLen + 1 - iSPos); -+ iSPos = iCLen + 1; -+ } -+ else -+ { -+ ARGV[m++] = ARGV[n]; -+ iSPos = iCLen + 1; -+ } -+ } -+ n = n + 1; -+ } -+ ARGC = m; -+} -+ -+ -+######################################################################### -+######################################################################### -+function usage() { -+ print "usage: fig2mpdf [-|+lm] [-eiIGvV] [-p ] [-g ] [-s