gentoo resync : 28.04.2019

3 files changed, 2 insertions, 115 deletions

diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 097356e1f527..dae93bd4f970 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,6 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
 AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r6.ebuild 2758 BLAKE2B 3f2da42e0f8619f587962fc64bcfef793e243c478907cf3d5e3a0843a70e7a68e4a17c77ac959220ea340e83c84e4849650ffe0ff7ba66d65ee1e54118ddb2ca SHA512 0ed88a4ac51bf4c8ebca0bba2d43f936b8232b5f367012fb20e8423b2bd729a23c79931906bdc042db1789e4454d241fdca8bf49f99835bddfbeacf6a43da7b4
-EBUILD libwmf-0.2.8.4-r7.ebuild 2572 BLAKE2B c10238280ae82494c110aec7c226c67375b5a21b7de7cc235b157ae5ef567dff4b22f5997ccc0ac6f7b194df0ae390a7f087b47b43b485c8911ebac2da1f1765 SHA512 70f061e0e46da2bc354967853ad52e89aa1fde173232c1b269c6c7eb811d9af52b2f1effc875178b8ba5514bcae50539ed43dd466602966ef27b7259bc8ebf82
+EBUILD libwmf-0.2.8.4-r7.ebuild 2570 BLAKE2B c5e1248ae289ccd5928ab7a930af8b2663f8744c756d5bd058bad1940d3536677a0e7c00736b1868db7d3d751850244664cd3aff637f901d55c087bd4a996b33 SHA512 a21c5e888cd3c5dfb98bc93c9cec25a28d2437e166711e9bf736d45db020991ea3cbcbc9765d5b700bc235d92764c49b49a0e7ec882cff4eafead46a7604fd05
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
deleted file mode 100644
index 0418fee876c3..000000000000
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome2-utils
-
-#The configure script finds the 5.50 ghostscript Fontmap file while run.
-#This will probably work, especially since the real one (6.50) in this case
-#is empty. However beware in case there is any trouble
-
-DESCRIPTION="library for converting WMF files"
-HOMEPAGE="http://wvware.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="X debug doc expat xml"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	media-fonts/urw-fonts
-	media-libs/freetype:2=
-	>=media-libs/libpng-1.4:0=
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2[X?]
-	virtual/jpeg:0=
-	xml? (
-		expat? ( dev-libs/expat )
-		!expat? (  dev-libs/libxml2 )
-	)
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-libs/libXt
-		x11-libs/libXpm
-	)"
-# plotutils are not really supported yet, so looks like that's it
-
-REQUIRED_USE="expat? ( xml )"
-
-DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-intoverflow.patch
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-pngfix.patch
-	"${FILESDIR}"/${P}-libpng-1.5.patch
-	"${FILESDIR}"/${P}-use-system-fonts.patch
-	"${FILESDIR}"/${P}-gdk-pixbuf.patch
-	"${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch
-	"${FILESDIR}"/${P}-CVE-2015-4695.patch
-	"${FILESDIR}"/${P}-CVE-2015-4696.patch
-	)
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES='modules'
-
-src_prepare() {
-	if ! use doc ; then
-		sed -e 's:doc::' -i Makefile.am || die
-	fi
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-	# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
-	# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
-	# we're explicitly disabling gd use w.r.t. bug 268161
-	if use expat; then
-		myeconfargs+=( --without-libxml2 )
-	else
-		myeconfargs+=( $(use_with xml libxml2) )
-	fi
-
-	myeconfargs+=(
-		--disable-static
-		$(use_enable debug)
-		$(use_with X x)
-		$(use_with expat)
-		--disable-gd
-		--with-sys-gd
-		--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts
-		--with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	autotools-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 76de7e12caaf..be9a5235f948 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"