diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-22 14:25:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-22 14:25:03 +0100 |
| commit | 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (patch) | |
| tree | b041acef19bb9ae66c228d5c9d34d1e00aeb2b95 /media-gfx/gimp | |
| parent | 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (diff) | |
gentoo resync : 22.04.2018
Diffstat (limited to 'media-gfx/gimp')
| -rw-r--r-- | media-gfx/gimp/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.9.8-r1.ebuild | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 239010898e59..875e38f790e8 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -13,6 +13,6 @@ DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b755 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02 EBUILD gimp-2.8.22-r1.ebuild 5186 BLAKE2B 10a8d7c1074b14a4a7b79ec2e157a189597d16caaa1c225704f3c1c7a348cfaa53e711e7e8977f5eb21bf36d5bb2e465e4218e17402858484592c5c10a3b699b SHA512 ccfc14a7e358d66e100a5a4d2d47818a049eb93f64c01ec67f431e7113c4b23355420524413981d68ea4fd53545c9f126867201f0bebe57abfdf7ab3ee337d56 EBUILD gimp-2.8.22.ebuild 4739 BLAKE2B 1f9f5b643fa9c061a1b8bb982df80261c481b362ea7140f4f6921419fa6fa23487df7547976dfbdae9a61eed461199ed0059ab68ce6748f1169b637750638dd4 SHA512 6c6e4c124eb106a22d6a3149e190cb0e3acaad34948e46c3de6be581641667e5841e844f3f79ecd05d67706de5a96d33b098baf8ca9066040200288e3d627e9d -EBUILD gimp-2.9.8-r1.ebuild 5778 BLAKE2B 98759f612229ee280a0c0ae29a5b131ff311930670f8ab6cd23f7644a934a21d54741bf07f056daf64c1e7afc06ec2a4816623dce733f2f4477588ea02f49d39 SHA512 9d8a678cf5a1a5c1bcd96baa9c46eb3b5c3ce29752323868607d134ebc7e0709099a7bd8f26707fcbb2ebf35c8aa99ca31209329a3164b56d8223cb35ea0185c +EBUILD gimp-2.9.8-r1.ebuild 5734 BLAKE2B a176bcbabc8298b9e29b755f7d3dbdc26c3e6a77335e826762c6ce0273aeea38341378bc719df8e617a69bd6f8570442e46f92116119fd40043669201ecdcf50 SHA512 2778c83c74d87fd8492a1107b1b64aab8114ea167aaf8d7ca2290cec314ed9640d60096a04c7834b718159f242cf3e2a2c46c6293a03927d8084d834bc415ff5 EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0 diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild index fc1d80723b35..fd50f6600b1d 100644 --- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild +++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild @@ -85,23 +85,23 @@ pkg_setup() { fi } -src_prepare() { - epatch "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954 - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17785.patch # bug 641954 - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-1.patch # bug 641954 - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-2.patch # bug 641954 - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17787.patch # bug 641954 +PATCHES=( + "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17785.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-1.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-2.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17787.patch # bug 641954 # NOTE: CVE-2017-17788 already fixed upstream - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17789.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17789.patch # bug 641954 +) - eapply_user +src_prepare() { + gnome2_src_prepare sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too - gnome2_src_prepare - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test } |