gentoo resync : 22.10.2018

3 files changed, 2 insertions, 62 deletions

diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index 0574f2101098..e3305848f769 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -22,6 +22,5 @@ AUX agg-2.5-pkgconfig.patch 387 BLAKE2B 7f0034bf791618bf3fdc59ec60210732f582b54d
 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 1347 BLAKE2B ffc1e449b15e237ae544c5d85ac1e6b9806e897cfec021406865474799f773f22772ce4227dd979a3f6f51e8ecbb39b73f88a8b4a23c109454866f17cbda6545 SHA512 deb1e61acae6a43f9a205d0fcd6192b339c3c5f6475e0c584bb9f479926a7d3ce330241293f084e276c2cbe47f1a0503b4f9d29439b86bb594eb2ff527571b00
+EBUILD agg-2.5-r3.ebuild 1346 BLAKE2B 2385cb5a987a8ed519eff4aaf00c846985ede913b49a7d9334a18772842a2baf1d5379dcfab16cc304cfb5b77606dad25f02fc1c252789d6a38b84433fc69e7b SHA512 8c572853428ba46d2c3048997e66a5348dd3d0b1b1fd6c29f801ace6e546cc5fe193f263981c868334e36a88bf05d99ce440b63cdebb961191f47eef100e593e
 MISC metadata.xml 335 BLAKE2B 4f8f3f570b1640e3dd48210e17eba5e9e0749313f4ba21d1d2f2565d8dbb2a7ec16ad73852ddeb0dd11f25887319bbbc44b9bc1c7397e02e43c36123789d186a SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f
diff --git a/x11-libs/agg/agg-2.5-r2.ebuild b/x11-libs/agg/agg-2.5-r2.ebuild
deleted file mode 100644
index 8228f01acbce..000000000000
--- a/x11-libs/agg/agg-2.5-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools base
-
-DESCRIPTION="Anti-Grain Geometry - A High Quality Rendering Engine for C++"
-HOMEPAGE="http://antigrain.com/"
-SRC_URI="http://antigrain.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="+gpc +truetype +X"
-
-# preffer X with enabled xcb, really
-RDEPEND="
-	media-libs/libsdl[X?]
-	X? ( >=x11-libs/libX11-1.3.99.901 )
-	truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# taken from debian
-PATCHES=(
-	"${FILESDIR}/${PV}/02_maintainer_mode.patch"
-	"${FILESDIR}/${PV}/04_no_rpath.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	sed -r -i \
-		-e 's:^(.*)  -L@.*:\1:' \
-		src/platform/X11/Makefile.am || die "Failed to sed"
-	# fix building against automake-1.12, bug 420701
-	sed -i '/^AM_C_PROTOTYPES/d' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# examples are not (yet) installed, so do not compile them
-	# sdl is harddep only sdl-tests are optional so we enable them anyway
-	econf \
-		--enable-ctrl \
-		--enable-sdltest \
-		--disable-examples \
-		--disable-dependency-tracking \
-		$(use_enable gpc gpc) \
-		$(use_enable truetype freetype) \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc readme authors ChangeLog news
-}
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index a8beefe015cf..98492c566a25 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -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