diff options
author | Justin Lecher <jlec@gentoo.org> | 2016-02-22 12:35:17 +0100 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2016-02-22 12:35:17 +0100 |
commit | fd80af8af63aa6ac64a35867c3731776e3e22355 (patch) | |
tree | 6a4e7eaf4f3f9f8115db74c4f627cd2643980d8d /x11-libs | |
parent | dev-cpp/growler-thread: Bump to EAPI=6 (diff) | |
download | sci-fd80af8af63aa6ac64a35867c3731776e3e22355.tar.gz sci-fd80af8af63aa6ac64a35867c3731776e3e22355.tar.bz2 sci-fd80af8af63aa6ac64a35867c3731776e3e22355.zip |
x11-libs/agg: Bump to EAPI=6
* Amend patches for -p1
* Drop usage of autotools-utils.eclass
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/agg/agg-2.5-r3.ebuild | 43 | ||||
-rw-r--r-- | x11-libs/agg/files/agg-2.4-depends.patch (renamed from x11-libs/agg/files/2.5/agg-2.4-depends.patch) | 0 | ||||
-rw-r--r-- | x11-libs/agg/files/agg-2.5-autotools.patch (renamed from x11-libs/agg/files/2.5/agg-2.5-autotools.patch) | 4 | ||||
-rw-r--r-- | x11-libs/agg/files/agg-2.5-pkgconfig.patch (renamed from x11-libs/agg/files/2.5/agg-2.5-pkgconfig.patch) | 0 | ||||
-rw-r--r-- | x11-libs/agg/files/agg-2.5-sdl-automagic.patch (renamed from x11-libs/agg/files/2.5/agg-2.5-sdl-automagic.patch) | 4 | ||||
-rw-r--r-- | x11-libs/agg/files/agg-2.5-sdl-m4.patch (renamed from x11-libs/agg/files/2.5/agg-2.5-sdl-m4.patch) | 4 |
6 files changed, 22 insertions, 33 deletions
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild index bc6eda331..d9d07db57 100644 --- a/x11-libs/agg/agg-2.5-r3.ebuild +++ b/x11-libs/agg/agg-2.5-r3.ebuild @@ -1,13 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -AUTOTOOLS_AUTORECONF=1 -AT_M4DIR="." - -inherit eutils autotools-utils +inherit autotools DESCRIPTION="High quality rendering engine library for C++" HOMEPAGE="http://antigrain.com/" @@ -32,28 +29,20 @@ DOCS=( readme authors ChangeLog news ) # patches taken from fedora PATCHES=( - "${FILESDIR}"/${PV}/agg-2.4-depends.patch - "${FILESDIR}"/${PV}/agg-2.5-pkgconfig.patch - "${FILESDIR}"/${PV}/agg-2.5-autotools.patch - "${FILESDIR}"/${PV}/agg-2.5-sdl-m4.patch - "${FILESDIR}"/${PV}/agg-2.5-sdl-automagic.patch - "${FILESDIR}"/${PV}/0001-Fix-non-terminating-loop-conditions-when-len-1.patch - "${FILESDIR}"/${PV}/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch - "${FILESDIR}"/${PV}/0003-Get-coordinates-from-previous-vertex-if-last-command.patch - "${FILESDIR}"/${PV}/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch - "${FILESDIR}"/${PV}/0005-Remove-VC-6-workaround.patch - "${FILESDIR}"/${PV}/0006-Implement-grain-merge-blending-mode-GIMP.patch - "${FILESDIR}"/${PV}/0007-Implement-grain-extract-blending-mode-GIMP.patch - "${FILESDIR}"/${PV}/0008-Declare-multiplication-and-division-operators-as-con.patch - "${FILESDIR}"/${PV}/0009-Add-a-static-identity-transformation.patch - "${FILESDIR}"/${PV}/0010-Add-renderer_scanline_aa_alpha.patch - "${FILESDIR}"/${PV}/0011-Avoid-division-by-zero-in-color-burn-mode.patch - "${FILESDIR}"/${PV}/0012-Avoid-pixel-artifacts-when-compositing.patch - "${FILESDIR}"/${PV}/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch - "${FILESDIR}"/${PV}/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch - "${FILESDIR}"/${PV}/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch + "${FILESDIR}"/agg-2.4-depends.patch + "${FILESDIR}"/${P}-pkgconfig.patch + "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${P}-sdl-m4.patch + "${FILESDIR}"/${P}-sdl-automagic.patch + "${FILESDIR}"/${PV} ) +src_prepare() { + default + mv configure.{in,ac} || die + AT_M4DIR="." eautoreconf +} + src_configure() { local myeconfargs=( --disable-ctrl @@ -64,5 +53,5 @@ src_configure() { $(use_enable truetype freetype) $(use_with X x) ) - autotools-utils_src_configure + econf ${myeconfargs[@]} } diff --git a/x11-libs/agg/files/2.5/agg-2.4-depends.patch b/x11-libs/agg/files/agg-2.4-depends.patch index 9d4f6e309..9d4f6e309 100644 --- a/x11-libs/agg/files/2.5/agg-2.4-depends.patch +++ b/x11-libs/agg/files/agg-2.4-depends.patch diff --git a/x11-libs/agg/files/2.5/agg-2.5-autotools.patch b/x11-libs/agg/files/agg-2.5-autotools.patch index b273477a3..1272b65bb 100644 --- a/x11-libs/agg/files/2.5/agg-2.5-autotools.patch +++ b/x11-libs/agg/files/agg-2.5-autotools.patch @@ -1,5 +1,5 @@ ---- configure.in~ 2013-02-22 09:30:00.000000000 -0600 -+++ configure.in 2013-02-22 09:30:49.030777571 -0600 +--- a/configure.in 2013-02-22 09:30:00.000000000 -0600 ++++ b/configure.in 2013-02-22 09:30:49.030777571 -0600 @@ -8,7 +8,7 @@ AC_PROG_CC AC_PROG_CXX diff --git a/x11-libs/agg/files/2.5/agg-2.5-pkgconfig.patch b/x11-libs/agg/files/agg-2.5-pkgconfig.patch index a303bfb90..a303bfb90 100644 --- a/x11-libs/agg/files/2.5/agg-2.5-pkgconfig.patch +++ b/x11-libs/agg/files/agg-2.5-pkgconfig.patch 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 index a0bfb78f4..19daaea06 100644 --- a/x11-libs/agg/files/2.5/agg-2.5-sdl-automagic.patch +++ b/x11-libs/agg/files/agg-2.5-sdl-automagic.patch @@ -1,5 +1,5 @@ ---- configure.in.orig 2013-08-06 16:35:30.740061017 -0700 -+++ configure.in 2013-08-06 16:40:47.511004499 -0700 +--- a/configure.in 2013-08-06 16:35:30.740061017 -0700 ++++ b/configure.in 2013-08-06 16:40:47.511004499 -0700 @@ -95,10 +95,14 @@ dnl ######### Check for SDL: ##################### 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 index 601d42264..2e2569f8b 100644 --- a/x11-libs/agg/files/2.5/agg-2.5-sdl-m4.patch +++ b/x11-libs/agg/files/agg-2.5-sdl-m4.patch @@ -1,5 +1,5 @@ ---- sdl.m4.orig 1969-12-31 16:00:00.000000000 -0800 -+++ sdl.m4 2008-01-24 07:50:20.000000000 -0800 +--- a/sdl.m4 1969-12-31 16:00:00.000000000 -0800 ++++ b/sdl.m4 2008-01-24 07:50:20.000000000 -0800 @@ -0,0 +1,183 @@ +# Configure paths for SDL +# Sam Lantinga 9/21/99 |