From 79eec3ea9ef0bac8362e9e18cbc55c603b98b312 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 12 Feb 2015 10:43:12 +0000 Subject: [PATCH] Avoid file collisions Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- dev-lang/ifc/ChangeLog | 5 ++++- dev-lang/ifc/Manifest | 32 +++++++++++++++--------------- dev-lang/ifc/ifc-15.0.2.164.ebuild | 5 ++++- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dev-lang/ifc/ChangeLog b/dev-lang/ifc/ChangeLog index c4b616dd9cc6..4a84f88ddaf7 100644 --- a/dev-lang/ifc/ChangeLog +++ b/dev-lang/ifc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/ifc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.79 2015/02/12 08:14:32 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.80 2015/02/12 10:43:08 jlec Exp $ + + 12 Feb 2015; Justin Lecher ifc-15.0.2.164.ebuild: + Avoid file collisions *ifc-15.0.2.164 (12 Feb 2015) diff --git a/dev-lang/ifc/Manifest b/dev-lang/ifc/Manifest index 1635e68bd7a1..71dca3ba56dc 100644 --- a/dev-lang/ifc/Manifest +++ b/dev-lang/ifc/Manifest @@ -34,25 +34,25 @@ EBUILD ifc-14.0.2.144.ebuild 893 SHA256 e25b4d3d6c1fa5878bdfd2a4412d66cdff05a6e2 EBUILD ifc-14.0.3.174.ebuild 893 SHA256 6522354c2b7e17fd0558c8b1ebb2eaaf6f07ad560b376506097d4e87265773a3 SHA512 9395f1f073914db33f4810c0c2e275de06e77f0854a5390dfa3fb05e7555b4bcdb482eb7881cbf96f7fae5750fba30846e89b8b055f09574e6408d0b0344e6b7 WHIRLPOOL 0b4edbccc049961f1c57ca63bd41531b3e33149047ce181e7793fb66f3451cd6e780ced25a5c0686db61d00d44f4c2557f6e1325046cac2374ef5c51bb54440f EBUILD ifc-15.0.0.090.ebuild 899 SHA256 c6e8511c17c64b2183ef12dc1797f039bb9eefe1aa0e279fdd4fb763ae331efa SHA512 02c331e94c0c2e39713bad50474b2a55bbb523db6312037c7a58f013c81856248613b27ed74fdcd623414ac2388f9a2962a700fba2b49686cf80c8a3b357c848 WHIRLPOOL 2b282a6098c9a473fec0bd14c6b263a4a61c868477d2c52e47321721ecb35bc2e3a8ea3df49b00a1372718a5289e5f716df05c85675ee3bd07a09c4db8819dd0 EBUILD ifc-15.0.1.133.ebuild 907 SHA256 4a2c8017bc8d271edbe3ce60a131d9bd2597353262dba4fe82eccf3c2b7c79ef SHA512 f28f7900e5f430d77717c37b8eb7d2323273d4cdd57531d3bf9f59c8cbccd4508126e81496eb25667a481507ef7b6df0f752fd6a08f3ed4c553e4bdff86aae52 WHIRLPOOL a460799070a565545ba2c2205536abe8d20b5d5c92ce5d38a34c363440493a35fbd738a35c6cbbbeb8b5ba1dc3c1551ae90ea557cec7656bc7c687d4b3e5e39b -EBUILD ifc-15.0.2.164.ebuild 907 SHA256 43b5932dc5b9cd0a04076a908585aebd94a0eac385e9a0ff8c5722baed27ab13 SHA512 ae9775642c75c928ac7d2262d784baca45f6c17b8e2d1e1cf116bcb56223bdb71646e29c25103380879ac727d6a9440fc9318b04786d73a89a5adfd295562beb WHIRLPOOL c2e367cad87f66412777f7a06756c4d860e321867a702666776be7598be0be7ecbaef9d6f2e8ef2e82c86a33b63ed2e94337e952b7c276acec36bc5e9df222d7 -MISC ChangeLog 9721 SHA256 38dfa466e5b3e15fe93cb30f4b080a64ba849330d8b42b3a922780bcb674377d SHA512 d23bfb1c1b59d8db8623649954cddabdf7068f7e4bcd7f0018202b6e2366da3d4bcd19bccb91c8630dadb04ba3ba04db995eaec73ff9f09d84e3306bd7236d1e WHIRLPOOL 98541995397ab19c5ed580f1941218aa778e659035e8cae4e99acc663bf7454b770c35d944ecfde8968189f47a6f4149977818c284f500226eef8a093da9b087 +EBUILD ifc-15.0.2.164.ebuild 1005 SHA256 65ac2f8c87845fbaa3210ed7a86d5da00f3c157d2e36c5abbefdf00a73c0fa8f SHA512 9d98b6a13f37fa31c5096e93e11edd7a1649e21c701114243dce626c4c60a5ff1b03ba036e6316e94290bf616e64cf290dc3e4b12bd38154ccde55a444123cc0 WHIRLPOOL b881789b3fd55ebe18acea56eabcc61ce85628678d7f9ef6bd887daf068782631f746734d1c4c3653f2f81d50211a24041ffc4a67f0d9c794eb90244ca4e7e13 +MISC ChangeLog 9816 SHA256 d9544a5f1c376f759c8a6a2c448dac16e8d51129e939d5ac1ec31dc2b8c6a0e7 SHA512 08cbba9e19c2739ded0202a08e03d709b70b72a4cbcb1d1dfc1dfe757c1e109ef9509a9dfde0f9c04af81cbe2c45042b839d74d6ae1fe849b08b08dd443e0974 WHIRLPOOL 5acc8916c00248ece9b2c780266b06a059d3c3fc050d1e467db7d946b07ba57c0b9275a285953f5908da812fb3bb4dc967f8ea6f879b3fa49aba03ae67139a2e MISC metadata.xml 673 SHA256 1a11ccabdc57c7ec4bb9203aacd1e4ddef32704e0c9ae8ccc3b60473836d2118 SHA512 3ef0414a830220caccdd37db9843874f7a16e1f8aae8f06fe929cc4dae3230681accfac3c7db62d3fbbf4c3f1cb08dbe053c8e145bf3a77c7d03fd06205886f3 WHIRLPOOL be61e97aec4ddb7835d1f3bc2be93167e18cf7b228af8eacfc8348e7da12e8e27d479468c1b697df761bd48873f48ef79572e0b70431e501a898daaf1b162475 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJU3GHhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJU3ISwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirqqwP/AvsAnzHjuEcsfoPzSmI4cDV -7poJIAwNcc3HXm3hnR/HYat1gt4LVZRhEVdou+h1MxP3adcok+nzpxwozQltDLah -5eT0nsuxtc1XAx0XlzgHr0+oKS4RLgA1D/9wf6FBaFDy4L5LyMrVQglLSz4GtcvI -Igo+3W7NytEY4ZvsEdPEeUYHnQ0orNrKANhsNPjR+LYVUoKmOV24kq36j+tKSbGK -Ote0nMx2uFVQ18zTFc8MRqzzDxaJIwPxWfyECQqhHqiM/AFUiifXWtW/wI6xeK1J -kTsEjEB3CNMVgP9GT2OhbuoHOty5x8/xnSGTVKVffycN/gEsH2sdJiij0HvSky1h -I5zHp4ZPns1McQSxAmGaA6rmy39XVrahDjf9opt5eTOLjKZqnJyN9+RtG9BgblKW -Lw6Obl20uFJawO0zcEqQiYrUFe3WKbD0/ZVlIyk3yFzv3mwQKJ4ECmjlBH+7cIYk -kIAo0LOT1wzQmtrzSyMpgINVqAcdX6CrXod4F8RzuryKo3D6M9vDrYacsE4O+Hvn -vU8WT4rjmGONTfqAgmpaMSjaTw4NeNwn5K4IHRj45cGCDWm5VYl9xTi6U8hGy/R4 -FhMR5rO2TI0cq9Ctb6lhHL+A/pyfAyi/xdcOItrtPIniPcuj0H5maKQQmkBHvvan -81jKQz74DU1UOJVdVG3a -=Hv8J +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirPasQAIqhxULqGhj6FQ8SmFFGFvwu +U9597lppaGry7tiwabEpgW5+WNJ8Ka22YaH+H0RVaB/n9B8b5X1tpnABxamQNOjT +2l130j3ygAX/3qmMT9gaOyUBYvTpsA/DuFeHUE8tHY8jgWYxs7vnnNvxgUQg8rkT +XhpS/SQeDvlz6pxjuZDvVjvRldwPbhmGR0fl9Rk65vA/An7pCB85on/FVmkqD+Qw +lQla19jUnBZ8vLukW+L4AYojmMk9yaJj69j1knJTM0IklbeJIzaVHIBYDyk/wW0h +W5mnEa9F7fSquibEqXP/RytmYP3SqRd7E99Vf0Dfq+MuUAcm1d9Mx1WcWXfETg7u +M/rVuUsZPX0WjrpSrxrvCg1ET3cAXj05Qh2NJiucB0wctqRo1UAsfpnpUZKGMXGH +8L1LHxC8+0B5SCTDJBLUrt66stnnDItH+HB7EK9SoMnto/ZyzjD3DwGvQwqEpc+J +4BRuFF5/7EhkkLBxbdF1/yYroR2hYwPBJYAF6e0zMdMiWo0XtrIjxTROxqal8biT +1j8FclbSGNe2ICjBBbMbw8s55x3YWii1YmXtOprSJzeRRQI2xW0SYaGu+gSDLj/X +OrLCctB+K03pDK2LqfKtXvZh/EpljWb5ks+OriwxRlHQ7fk3iqc4qeRGnUz5z/9K +S5mPxxEOyENsWgx9J4f8 +=CY+5 -----END PGP SIGNATURE----- diff --git a/dev-lang/ifc/ifc-15.0.2.164.ebuild b/dev-lang/ifc/ifc-15.0.2.164.ebuild index 98c0b976eb5c..436c4d4a456a 100644 --- a/dev-lang/ifc/ifc-15.0.2.164.ebuild +++ b/dev-lang/ifc/ifc-15.0.2.164.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-15.0.2.164.ebuild,v 1.1 2015/02/12 08:14:32 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-15.0.2.164.ebuild,v 1.2 2015/02/12 10:43:08 jlec Exp $ EAPI=5 @@ -31,5 +31,8 @@ src_install() { if ! use linguas_ja; then find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die fi + + rm opt/intel/composerxe-2015_update2.2.164/documentation/en_US/third-party-programs.txt || die + intel-sdp_src_install } -- 2.26.2