gentoo resync : 07.10.2018

3 files changed, 20 insertions, 6 deletions

diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index d287a1edc6c6..0574f2101098 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -17,10 +17,11 @@ AUX 2.5/02_maintainer_mode.patch 590 BLAKE2B 61804fbb72b05975b1bf4470e466ae39eac
 AUX 2.5/04_no_rpath.patch 359 BLAKE2B c78f3555f371203c8355a2b8e6ac3c300b9757a1d74e14f3bfdbe58abc1332ed76f8486963b0b484a50ffd8fb48deea315a09b5cf7b44ac0156488a8b7fb251b SHA512 f44a98258cef2bdb1ed86a2614162d749f7d191ac3e7c642fe8055bdc757e65d8b7a26ad44ea3f7b760776b308dd9d07af3100826504c5547c8a111a3dbdbc8e
 AUX agg-2.4-depends.patch 2154 BLAKE2B ecea231011d0779bd3fa42f8364cd31ac9d2dc17f9de2aff98045abcde5e562b04ca5da295d35ac2aef8924eb65a4bbcd42b54ce8da4453383f5b0bcac2e85e3 SHA512 22b15f495c313417e05431516239bd04889d26b05c559b4905f0ad0aac3b8e4053a6bdc19e1c8e0c192f3b65c200cf5e3074db15011e01e4deaa4c13070418ef
 AUX agg-2.5-autotools.patch 277 BLAKE2B 9579b23d043b151f5404cd6f97586c3f1b1098b23d3aacfc1c287431c3b52b654c1c4057859f5708afc5fdfe0fd57e24538d6865f156b345c87240cf48a2ba3f SHA512 facfb36e8de3987153d988d4ff4227da6531a1508c2263d85364809b5dc3b564e76469a134084b2d020709fc32cfd319141126653b700dc38e266b68528c8f47
+AUX agg-2.5-gcc8.patch 816 BLAKE2B b959d281e57111ca74fd981a9d0a06f2ab9d0e05ef69fd2e7cd15c5385d860141400aebf2b89124022468f9c21633bc449b7802084112be68c078818503dbb0e SHA512 92cb8742068e839143094dccf77b81b37484d7a521c45d8bdb6653f2dc9055ed0b65fc2554234e1f635221f6624d4259dd86b7b3bbc5fc9edf29cc86cc58e360
 AUX agg-2.5-pkgconfig.patch 387 BLAKE2B 7f0034bf791618bf3fdc59ec60210732f582b54d933a11399c10d7c8ad63a419e44a1f8430acdcdfef5268600e088664cc8bbbc9a5513b3170f62cba86f07d4b SHA512 113ac9deb4d0992ef4bdaeb1654f5c1ab199d3865b525c573926b73b2351e9c551f2a7b77082f87fd78bcdab3036621b72bba9502028c35b28dc8f18acf11f53
 AUX agg-2.5-sdl-automagic.patch 811 BLAKE2B 9cb34b0efc6980b5269f6d82e524ddde3557b11e369bcb5e351b4b7d814d92a52bc13cd9a1b85487ce9d3d42b897712e93fdb17fa191e0f8850160402acaa415 SHA512 11166f6b8ca9cdaef2e510c7752c643ee6c7a56051c6214111e56dd0274f2e0023be073014a806ecf9ffc086b1436adefd04b563fc82cdd53f9910d281fe2b8e
 AUX agg-2.5-sdl-m4.patch 6797 BLAKE2B 1050aa706618ad34f03d437105449b071478b37655b6799be0258fb5afe27238dfbd029aae77e339847372a97ab99946078a677d691895e05a046389e618b3d7 SHA512 880594c3ea43846e79529444608301b323acbec4dc1bb883880ae4610f8041e95ac31743f0edd042be7d70d36928295b571265910e9342f2538ee68e557406bd
 DIST agg-2.5.tar.gz 564313 BLAKE2B 6451688dad51fe9d0433218109fd555fcaea3dd5933ebb13bc5c6d935640885f007b5dba8607cf45c94f58f0974391ca4fcd2ea9fda954334c8a4309b881d994 SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
 EBUILD agg-2.5-r2.ebuild 1414 BLAKE2B 34d9946175b2dcea675588fc74597f4e87c8e2b1f270657f49811afaac08ce9ccac721ab7f21a401c0b683209117436f9aa127fdd1b3bc7a9b5975ff9f71f482 SHA512 5d0f131ccb63c448e1a767b206f3bb98a86dfc1705962455b31a409d15edb151cec991d01b7395c7285642676f9e85eb91ed633166eb8076dded576c3708ff7d
-EBUILD agg-2.5-r3.ebuild 1310 BLAKE2B b38e25771857f92a380258ede6e816595f69944f332c3b08d347b45cd0dd2f4bf82062159a945497f2dfead1de0d545794612e0cc3ad4ecd6e5ab22489cc207a SHA512 65b75c8ada4e082900e91790e64534412d0f771be45f4ea18a5aafe022ca1fd751a1b9fb1f752f88b769bcb15ab55fc030c7c0908b75ec2002dee8d44caeec7c
+EBUILD agg-2.5-r3.ebuild 1347 BLAKE2B ffc1e449b15e237ae544c5d85ac1e6b9806e897cfec021406865474799f773f22772ce4227dd979a3f6f51e8ecbb39b73f88a8b4a23c109454866f17cbda6545 SHA512 deb1e61acae6a43f9a205d0fcd6192b339c3c5f6475e0c584bb9f479926a7d3ce330241293f084e276c2cbe47f1a0503b4f9d29439b86bb594eb2ff527571b00
 MISC metadata.xml 335 BLAKE2B 4f8f3f570b1640e3dd48210e17eba5e9e0749313f4ba21d1d2f2565d8dbb2a7ec16ad73852ddeb0dd11f25887319bbbc44b9bc1c7397e02e43c36123789d186a SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index 0925c837a906..a8beefe015cf 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools ltprune
+EAPI=7
+inherit autotools
 
 DESCRIPTION="High quality rendering engine library for C++"
 HOMEPAGE="http://antigrain.com/"
@@ -10,7 +10,7 @@ SRC_URI="http://antigrain.com/${P}.tar.gz"
 
 LICENSE="GPL-2 gpc? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+gpc sdl static-libs +truetype +X"
 
 # preffer X with enabled xcb, really
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-sdl-m4.patch
 	"${FILESDIR}"/${P}-sdl-automagic.patch
+	"${FILESDIR}"/${P}-gcc8.patch
 	"${FILESDIR}"/${PVR}
 )
 
@@ -56,5 +57,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/agg/files/agg-2.5-gcc8.patch b/x11-libs/agg/files/agg-2.5-gcc8.patch
new file mode 100644
index 000000000000..2e43d0bf79b3
--- /dev/null
+++ b/x11-libs/agg/files/agg-2.5-gcc8.patch
@@ -0,0 +1,12 @@
+diff -uprN agg-2.5/include/agg_renderer_outline_aa.h agg-2.5-fixed/include/agg_renderer_outline_aa.h
+--- agg-2.5/include/agg_renderer_outline_aa.h	2018-08-25 02:02:52.507254241 +0800
++++ agg-2.5-fixed/include/agg_renderer_outline_aa.h	2018-08-25 02:04:15.291175316 +0800
+@@ -1375,7 +1375,7 @@ namespace agg
+         //---------------------------------------------------------------------
+         void profile(const line_profile_aa& prof) { m_profile = &prof; }
+         const line_profile_aa& profile() const { return *m_profile; }
+-        line_profile_aa& profile() { return *m_profile; }
++        const line_profile_aa& profile() { return *m_profile; }
+ 
+         //---------------------------------------------------------------------
+         int subpixel_width() const { return m_profile->subpixel_width(); }