gentoo resync : 20.12.2017

3 files changed, 2 insertions, 80 deletions

diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index becff888fc56..27aac3b5ee29 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -7,6 +7,5 @@ AUX gtkmathview-0.8.0-gcc47.patch 3123 BLAKE2B 8d2d93dcc3d0935ee4bbeaaec699e7dc3
 AUX gtkmathview-0.8.0-gcc6.patch 2043 BLAKE2B 5534acd718f3b4423a1325c109483de3111a5f12ef0ad0530c0ea6641e07b5fd5fd4cdb3984604ad887ad1b836ddba77300c3e383af0c23f04c15e9add74fba8 SHA512 c2a9d5b1bf14130ddea729a7cbe158f2029ba18ff5c3fd89882e1948e5eb1b903f4f4a7d3c02fb33f9fa9e3dff9db80516a6c3c895daa5f4b5612dfa2e5f4629
 AUX gtkmathview-0.8.0-underlinking.patch 1926 BLAKE2B 6f50638ebb9c2a6af55e3b0f13b438b97a2e606fc7639a2aa6d7e3467bfcdeb4661c6b18db200b727a3de87c457ea99013f32e49b76ebaaf0a5d9793828f280b SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d
 DIST gtkmathview-0.8.0.tar.gz 987328 BLAKE2B 1c8403fcfab828153911a40850bdfcfdd15c8c19da5dc1d7c015a8718c647b4adde2f7201ee0abc72d6c2b5acc79b8c852d6aa4f09021bbeaa827291d963b646 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb
-EBUILD gtkmathview-0.8.0-r2.ebuild 1986 BLAKE2B 99c552f5e2714aa2f683711b3ccbd4f31899ae5b9b3b6489e2fc7687be9a9871a7a6fcc90c2b613a99c0c62a1395e76c605a2ebf551e139bda0d7d6def779a16 SHA512 e4115e71579be885119f9e9ce20e5748d5dbdcd105b64c8a8a03d09f964a673b74e220de80f966a7437f79497537789bf9c9147bcd7b16a0b15a7fbf99857293
-EBUILD gtkmathview-0.8.0-r3.ebuild 1994 BLAKE2B ba6e0c6c9b33fee2670e30ad682bb93557685429f8d1f070ddac548bbd8298a2d23c167f9a6fb2f256242fa6243118a2f4b9a400ebabca0ca19e819b3701d29e SHA512 5faa6d395bd8a39a483c98c43a0fcd258896fc115485f2c51e3f7ed39ba1317c83c92782f473ba2f206c582f33df48e988355de3392983446d526cbb71ce3ab0
+EBUILD gtkmathview-0.8.0-r3.ebuild 1993 BLAKE2B ca3e63019922839bbd5b7634ad9f494a7487e32fdfcbffa9922660547ab311a40aeb3c1ad2395be7ca42fa6c13a7e97f1d8d0075ed5e2f5250f71ca714d17499 SHA512 f4167d1bdbbbb2a970cfc9286e7922880f9a158d97f19a646a2a92fee6abc39aa2452f0b56e6ce3fbb514648d980a15462f291bb55837aaf658ecbfa241f6e77
 MISC metadata.xml 413 BLAKE2B 795e9acaab179d9cf4e0ab6f3232dbf079b418420a55ff58d06f5b81b2fa785121a6b4bb734f45f4df9b15435b3af8bf26abf773100b70c362a98805057f8a38 SHA512 734ee7fb5aa123fb2794a22b1a374e514a92a640e7bbd35ee53de045126d0b330f177db4018ddf76e9932f984a2f5c1646d3a3f642b29972df0af88f64fb1352
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild
deleted file mode 100644
index 4b57785e9a43..000000000000
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Rendering engine for MathML documents"
-HOMEPAGE="http://helm.cs.unibo.it/mml-widget/"
-SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gtk mathml svg t1lib"
-
-RDEPEND=">=dev-libs/glib-2.2.1:2
-	>=dev-libs/popt-1.7
-	>=dev-libs/libxml2-2.6.7:2
-	gtk? ( >=x11-libs/gtk+-2.2.1:2
-		>=media-libs/t1lib-5:5
-		x11-libs/pango
-		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) )
-	mathml? ( media-fonts/texcm-ttf )
-	t1lib?	( >=media-libs/t1lib-5:5 )"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-DOCS="ANNOUNCEMENT AUTHORS BUGS ChangeLog CONTRIBUTORS HISTORY NEWS README TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-cond-t1.patch
-
-	# Fix building against libxml2[icu], bug #356095
-	epatch "${FILESDIR}"/${P}-fix-template.patch
-
-	# Fix building with gold, bug #369117; requires eautoreconf
-	epatch "${FILESDIR}/${P}-underlinking.patch"
-
-	epatch "${FILESDIR}/${P}-gcc47.patch"
-
-	# m4 macros from upstream git, required for eautoreconf
-	if [[ ! -d ac-helpers ]]; then
-		mkdir ac-helpers || die "mkdir failed"
-		cp "${FILESDIR}/binreloc.m4" ac-helpers || die "cp failed"
-	fi
-
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
-	AT_M4DIR=ac-helpers eautoreconf
-}
-
-src_configure() {
-	# --disable-popt will build only the library and not the frontend
-	# TFM is needed for SVG, default value is 2
-	econf $(use_enable gtk) \
-		$(use_enable svg) \
-		$(use_with t1lib) \
-		--with-popt \
-		--enable-libxml2 \
-		--enable-libxml2-reader \
-		--enable-ps \
-		--enable-tfm=2 \
-		--enable-builder-cache \
-		--enable-breaks \
-		--enable-boxml \
-		--disable-gmetadom \
-		--disable-static
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
index 60158b637ba8..07ae521431c3 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
 LICENSE="LGPL-3"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gtk mathml svg t1lib"
 
 RDEPEND="