From 7e34b3fc4e24759ef8d55d257554033c136fe7d9 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 29 May 2018 22:24:14 +0200 Subject: [PATCH] x11-libs/agg: Only apply new patches, not old (#656804) Package-Manager: Portage-2.3.38, Repoman-2.3.9 --- x11-libs/agg/agg-2.5-r3.ebuild | 2 +- .../0001-Fix-non-terminating-loop-conditions-when-len-1.patch | 0 ...2-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch | 0 ...3-Get-coordinates-from-previous-vertex-if-last-command.patch | 0 ...4-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch | 0 .../agg/files/{2.5 => 2.5-r3}/0005-Remove-VC-6-workaround.patch | 0 .../0006-Implement-grain-merge-blending-mode-GIMP.patch | 0 .../0007-Implement-grain-extract-blending-mode-GIMP.patch | 0 ...8-Declare-multiplication-and-division-operators-as-con.patch | 0 .../0009-Add-a-static-identity-transformation.patch | 0 .../{2.5 => 2.5-r3}/0010-Add-renderer_scanline_aa_alpha.patch | 0 .../0011-Avoid-division-by-zero-in-color-burn-mode.patch | 0 .../0012-Avoid-pixel-artifacts-when-compositing.patch | 0 ...3-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch | 0 ...4-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch | 0 ...5-Ensure-first-value-in-the-gamma-table-is-always-zero.patch | 0 16 files changed, 1 insertion(+), 1 deletion(-) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0001-Fix-non-terminating-loop-conditions-when-len-1.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0003-Get-coordinates-from-previous-vertex-if-last-command.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0005-Remove-VC-6-workaround.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0006-Implement-grain-merge-blending-mode-GIMP.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0007-Implement-grain-extract-blending-mode-GIMP.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0008-Declare-multiplication-and-division-operators-as-con.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0009-Add-a-static-identity-transformation.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0010-Add-renderer_scanline_aa_alpha.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0011-Avoid-division-by-zero-in-color-burn-mode.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0012-Avoid-pixel-artifacts-when-compositing.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch (100%) rename x11-libs/agg/files/{2.5 => 2.5-r3}/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch (100%) diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild index de2db3f9f25a..e4be2281ee44 100644 --- a/x11-libs/agg/agg-2.5-r3.ebuild +++ b/x11-libs/agg/agg-2.5-r3.ebuild @@ -32,7 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-autotools.patch "${FILESDIR}"/${P}-sdl-m4.patch "${FILESDIR}"/${P}-sdl-automagic.patch - "${FILESDIR}"/${PV} + "${FILESDIR}"/${PF} ) src_prepare() { diff --git a/x11-libs/agg/files/2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch b/x11-libs/agg/files/2.5-r3/0001-Fix-non-terminating-loop-conditions-when-len-1.patch similarity index 100% rename from x11-libs/agg/files/2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch rename to x11-libs/agg/files/2.5-r3/0001-Fix-non-terminating-loop-conditions-when-len-1.patch diff --git a/x11-libs/agg/files/2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch b/x11-libs/agg/files/2.5-r3/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch similarity index 100% rename from x11-libs/agg/files/2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch rename to x11-libs/agg/files/2.5-r3/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch diff --git a/x11-libs/agg/files/2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch b/x11-libs/agg/files/2.5-r3/0003-Get-coordinates-from-previous-vertex-if-last-command.patch similarity index 100% rename from x11-libs/agg/files/2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch rename to x11-libs/agg/files/2.5-r3/0003-Get-coordinates-from-previous-vertex-if-last-command.patch diff --git a/x11-libs/agg/files/2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch b/x11-libs/agg/files/2.5-r3/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch similarity index 100% rename from x11-libs/agg/files/2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch rename to x11-libs/agg/files/2.5-r3/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch diff --git a/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch b/x11-libs/agg/files/2.5-r3/0005-Remove-VC-6-workaround.patch similarity index 100% rename from x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch rename to x11-libs/agg/files/2.5-r3/0005-Remove-VC-6-workaround.patch diff --git a/x11-libs/agg/files/2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch b/x11-libs/agg/files/2.5-r3/0006-Implement-grain-merge-blending-mode-GIMP.patch similarity index 100% rename from x11-libs/agg/files/2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch rename to x11-libs/agg/files/2.5-r3/0006-Implement-grain-merge-blending-mode-GIMP.patch diff --git a/x11-libs/agg/files/2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch b/x11-libs/agg/files/2.5-r3/0007-Implement-grain-extract-blending-mode-GIMP.patch similarity index 100% rename from x11-libs/agg/files/2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch rename to x11-libs/agg/files/2.5-r3/0007-Implement-grain-extract-blending-mode-GIMP.patch diff --git a/x11-libs/agg/files/2.5/0008-Declare-multiplication-and-division-operators-as-con.patch b/x11-libs/agg/files/2.5-r3/0008-Declare-multiplication-and-division-operators-as-con.patch similarity index 100% rename from x11-libs/agg/files/2.5/0008-Declare-multiplication-and-division-operators-as-con.patch rename to x11-libs/agg/files/2.5-r3/0008-Declare-multiplication-and-division-operators-as-con.patch diff --git a/x11-libs/agg/files/2.5/0009-Add-a-static-identity-transformation.patch b/x11-libs/agg/files/2.5-r3/0009-Add-a-static-identity-transformation.patch similarity index 100% rename from x11-libs/agg/files/2.5/0009-Add-a-static-identity-transformation.patch rename to x11-libs/agg/files/2.5-r3/0009-Add-a-static-identity-transformation.patch diff --git a/x11-libs/agg/files/2.5/0010-Add-renderer_scanline_aa_alpha.patch b/x11-libs/agg/files/2.5-r3/0010-Add-renderer_scanline_aa_alpha.patch similarity index 100% rename from x11-libs/agg/files/2.5/0010-Add-renderer_scanline_aa_alpha.patch rename to x11-libs/agg/files/2.5-r3/0010-Add-renderer_scanline_aa_alpha.patch diff --git a/x11-libs/agg/files/2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch b/x11-libs/agg/files/2.5-r3/0011-Avoid-division-by-zero-in-color-burn-mode.patch similarity index 100% rename from x11-libs/agg/files/2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch rename to x11-libs/agg/files/2.5-r3/0011-Avoid-division-by-zero-in-color-burn-mode.patch diff --git a/x11-libs/agg/files/2.5/0012-Avoid-pixel-artifacts-when-compositing.patch b/x11-libs/agg/files/2.5-r3/0012-Avoid-pixel-artifacts-when-compositing.patch similarity index 100% rename from x11-libs/agg/files/2.5/0012-Avoid-pixel-artifacts-when-compositing.patch rename to x11-libs/agg/files/2.5-r3/0012-Avoid-pixel-artifacts-when-compositing.patch diff --git a/x11-libs/agg/files/2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch b/x11-libs/agg/files/2.5-r3/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch similarity index 100% rename from x11-libs/agg/files/2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch rename to x11-libs/agg/files/2.5-r3/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch diff --git a/x11-libs/agg/files/2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch b/x11-libs/agg/files/2.5-r3/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch similarity index 100% rename from x11-libs/agg/files/2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch rename to x11-libs/agg/files/2.5-r3/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch diff --git a/x11-libs/agg/files/2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch b/x11-libs/agg/files/2.5-r3/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch similarity index 100% rename from x11-libs/agg/files/2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch rename to x11-libs/agg/files/2.5-r3/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch -- 2.26.2