1 |
commit: fd80af8af63aa6ac64a35867c3731776e3e22355 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 22 11:35:17 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 22 11:35:17 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fd80af8a |
7 |
|
8 |
x11-libs/agg: Bump to EAPI=6 |
9 |
|
10 |
* Amend patches for -p1 |
11 |
* Drop usage of autotools-utils.eclass |
12 |
|
13 |
Package-Manager: portage-2.2.27 |
14 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
15 |
|
16 |
x11-libs/agg/agg-2.5-r3.ebuild | 43 ++++++++-------------- |
17 |
x11-libs/agg/files/{2.5 => }/agg-2.4-depends.patch | 0 |
18 |
.../agg/files/{2.5 => }/agg-2.5-autotools.patch | 4 +- |
19 |
.../agg/files/{2.5 => }/agg-2.5-pkgconfig.patch | 0 |
20 |
.../files/{2.5 => }/agg-2.5-sdl-automagic.patch | 4 +- |
21 |
x11-libs/agg/files/{2.5 => }/agg-2.5-sdl-m4.patch | 4 +- |
22 |
6 files changed, 22 insertions(+), 33 deletions(-) |
23 |
|
24 |
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild |
25 |
index bc6eda3..d9d07db 100644 |
26 |
--- a/x11-libs/agg/agg-2.5-r3.ebuild |
27 |
+++ b/x11-libs/agg/agg-2.5-r3.ebuild |
28 |
@@ -1,13 +1,10 @@ |
29 |
-# Copyright 1999-2014 Gentoo Foundation |
30 |
+# Copyright 1999-2016 Gentoo Foundation |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
# $Id$ |
33 |
|
34 |
-EAPI=5 |
35 |
+EAPI=6 |
36 |
|
37 |
-AUTOTOOLS_AUTORECONF=1 |
38 |
-AT_M4DIR="." |
39 |
- |
40 |
-inherit eutils autotools-utils |
41 |
+inherit autotools |
42 |
|
43 |
DESCRIPTION="High quality rendering engine library for C++" |
44 |
HOMEPAGE="http://antigrain.com/" |
45 |
@@ -32,28 +29,20 @@ DOCS=( readme authors ChangeLog news ) |
46 |
|
47 |
# patches taken from fedora |
48 |
PATCHES=( |
49 |
- "${FILESDIR}"/${PV}/agg-2.4-depends.patch |
50 |
- "${FILESDIR}"/${PV}/agg-2.5-pkgconfig.patch |
51 |
- "${FILESDIR}"/${PV}/agg-2.5-autotools.patch |
52 |
- "${FILESDIR}"/${PV}/agg-2.5-sdl-m4.patch |
53 |
- "${FILESDIR}"/${PV}/agg-2.5-sdl-automagic.patch |
54 |
- "${FILESDIR}"/${PV}/0001-Fix-non-terminating-loop-conditions-when-len-1.patch |
55 |
- "${FILESDIR}"/${PV}/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch |
56 |
- "${FILESDIR}"/${PV}/0003-Get-coordinates-from-previous-vertex-if-last-command.patch |
57 |
- "${FILESDIR}"/${PV}/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch |
58 |
- "${FILESDIR}"/${PV}/0005-Remove-VC-6-workaround.patch |
59 |
- "${FILESDIR}"/${PV}/0006-Implement-grain-merge-blending-mode-GIMP.patch |
60 |
- "${FILESDIR}"/${PV}/0007-Implement-grain-extract-blending-mode-GIMP.patch |
61 |
- "${FILESDIR}"/${PV}/0008-Declare-multiplication-and-division-operators-as-con.patch |
62 |
- "${FILESDIR}"/${PV}/0009-Add-a-static-identity-transformation.patch |
63 |
- "${FILESDIR}"/${PV}/0010-Add-renderer_scanline_aa_alpha.patch |
64 |
- "${FILESDIR}"/${PV}/0011-Avoid-division-by-zero-in-color-burn-mode.patch |
65 |
- "${FILESDIR}"/${PV}/0012-Avoid-pixel-artifacts-when-compositing.patch |
66 |
- "${FILESDIR}"/${PV}/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch |
67 |
- "${FILESDIR}"/${PV}/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch |
68 |
- "${FILESDIR}"/${PV}/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch |
69 |
+ "${FILESDIR}"/agg-2.4-depends.patch |
70 |
+ "${FILESDIR}"/${P}-pkgconfig.patch |
71 |
+ "${FILESDIR}"/${P}-autotools.patch |
72 |
+ "${FILESDIR}"/${P}-sdl-m4.patch |
73 |
+ "${FILESDIR}"/${P}-sdl-automagic.patch |
74 |
+ "${FILESDIR}"/${PV} |
75 |
) |
76 |
|
77 |
+src_prepare() { |
78 |
+ default |
79 |
+ mv configure.{in,ac} || die |
80 |
+ AT_M4DIR="." eautoreconf |
81 |
+} |
82 |
+ |
83 |
src_configure() { |
84 |
local myeconfargs=( |
85 |
--disable-ctrl |
86 |
@@ -64,5 +53,5 @@ src_configure() { |
87 |
$(use_enable truetype freetype) |
88 |
$(use_with X x) |
89 |
) |
90 |
- autotools-utils_src_configure |
91 |
+ econf ${myeconfargs[@]} |
92 |
} |
93 |
|
94 |
diff --git a/x11-libs/agg/files/2.5/agg-2.4-depends.patch b/x11-libs/agg/files/agg-2.4-depends.patch |
95 |
similarity index 100% |
96 |
rename from x11-libs/agg/files/2.5/agg-2.4-depends.patch |
97 |
rename to x11-libs/agg/files/agg-2.4-depends.patch |
98 |
|
99 |
diff --git a/x11-libs/agg/files/2.5/agg-2.5-autotools.patch b/x11-libs/agg/files/agg-2.5-autotools.patch |
100 |
similarity index 60% |
101 |
rename from x11-libs/agg/files/2.5/agg-2.5-autotools.patch |
102 |
rename to x11-libs/agg/files/agg-2.5-autotools.patch |
103 |
index b273477..1272b65 100644 |
104 |
--- a/x11-libs/agg/files/2.5/agg-2.5-autotools.patch |
105 |
+++ b/x11-libs/agg/files/agg-2.5-autotools.patch |
106 |
@@ -1,5 +1,5 @@ |
107 |
---- configure.in~ 2013-02-22 09:30:00.000000000 -0600 |
108 |
-+++ configure.in 2013-02-22 09:30:49.030777571 -0600 |
109 |
+--- a/configure.in 2013-02-22 09:30:00.000000000 -0600 |
110 |
++++ b/configure.in 2013-02-22 09:30:49.030777571 -0600 |
111 |
@@ -8,7 +8,7 @@ |
112 |
AC_PROG_CC |
113 |
AC_PROG_CXX |
114 |
|
115 |
diff --git a/x11-libs/agg/files/2.5/agg-2.5-pkgconfig.patch b/x11-libs/agg/files/agg-2.5-pkgconfig.patch |
116 |
similarity index 100% |
117 |
rename from x11-libs/agg/files/2.5/agg-2.5-pkgconfig.patch |
118 |
rename to x11-libs/agg/files/agg-2.5-pkgconfig.patch |
119 |
|
120 |
diff --git a/x11-libs/agg/files/2.5/agg-2.5-sdl-automagic.patch b/x11-libs/agg/files/agg-2.5-sdl-automagic.patch |
121 |
similarity index 86% |
122 |
rename from x11-libs/agg/files/2.5/agg-2.5-sdl-automagic.patch |
123 |
rename to x11-libs/agg/files/agg-2.5-sdl-automagic.patch |
124 |
index a0bfb78..19daaea 100644 |
125 |
--- a/x11-libs/agg/files/2.5/agg-2.5-sdl-automagic.patch |
126 |
+++ b/x11-libs/agg/files/agg-2.5-sdl-automagic.patch |
127 |
@@ -1,5 +1,5 @@ |
128 |
---- configure.in.orig 2013-08-06 16:35:30.740061017 -0700 |
129 |
-+++ configure.in 2013-08-06 16:40:47.511004499 -0700 |
130 |
+--- a/configure.in 2013-08-06 16:35:30.740061017 -0700 |
131 |
++++ b/configure.in 2013-08-06 16:40:47.511004499 -0700 |
132 |
@@ -95,10 +95,14 @@ |
133 |
|
134 |
dnl ######### Check for SDL: ##################### |
135 |
|
136 |
diff --git a/x11-libs/agg/files/2.5/agg-2.5-sdl-m4.patch b/x11-libs/agg/files/agg-2.5-sdl-m4.patch |
137 |
similarity index 98% |
138 |
rename from x11-libs/agg/files/2.5/agg-2.5-sdl-m4.patch |
139 |
rename to x11-libs/agg/files/agg-2.5-sdl-m4.patch |
140 |
index 601d422..2e2569f 100644 |
141 |
--- a/x11-libs/agg/files/2.5/agg-2.5-sdl-m4.patch |
142 |
+++ b/x11-libs/agg/files/agg-2.5-sdl-m4.patch |
143 |
@@ -1,5 +1,5 @@ |
144 |
---- sdl.m4.orig 1969-12-31 16:00:00.000000000 -0800 |
145 |
-+++ sdl.m4 2008-01-24 07:50:20.000000000 -0800 |
146 |
+--- a/sdl.m4 1969-12-31 16:00:00.000000000 -0800 |
147 |
++++ b/sdl.m4 2008-01-24 07:50:20.000000000 -0800 |
148 |
@@ -0,0 +1,183 @@ |
149 |
+# Configure paths for SDL |
150 |
+# Sam Lantinga 9/21/99 |