[gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-gfx/pstoedit/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-gfx/pstoedit/

[Michał Górny]

commit:     8af535d81fd1f9cde078d78be5c1973252b707e9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  6 13:00:26 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep  6 13:07:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af535d8

media-gfx/pstoedit: Remove media-libs/ming dep

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/pstoedit/metadata.xml            | 1 -
 media-gfx/pstoedit/pstoedit-3.70-r1.ebuild | 9 ++++-----
 profiles/base/package.use.mask             | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/media-gfx/pstoedit/metadata.xml b/media-gfx/pstoedit/metadata.xml
index b2d783b728a..6bf9a32c523 100644
--- a/media-gfx/pstoedit/metadata.xml
+++ b/media-gfx/pstoedit/metadata.xml
@@ -11,7 +11,6 @@
   </maintainer>
   <use>
     <flag name="emf">Enable <pkg>media-libs/libemf</pkg> support</flag>
-    <flag name="flash">Enable <pkg>media-libs/ming</pkg> SWF support</flag>
     <flag name="pptx">Enable support for generating PowerPoint pptx files</flag>
   </use>
   <upstream>

diff --git a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
index 6ce7a5d378c..b42c1daabf4 100644
--- a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,13 +12,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="emf flash imagemagick plotutils pptx static-libs"
+IUSE="emf imagemagick plotutils pptx static-libs"
 
 RDEPEND="
 	>=media-libs/gd-2.0.35-r1:=
 	>=app-text/ghostscript-gpl-8.71-r1
 	emf? ( >=media-libs/libemf-1.0.3 )
-	flash? ( >=media-libs/ming-0.4.3 )
 	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] )
 	plotutils? ( media-libs/plotutils )
 	pptx? ( dev-libs/libzip )
@@ -49,8 +48,8 @@ src_configure() {
 		$(use_with emf) \
 		$(use_with imagemagick magick) \
 		$(use_with plotutils libplot) \
-		$(use_with flash swf) \
-		$(use_with pptx)
+		$(use_with pptx) \
+		--without-swf
 }
 
 src_install() {

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 82413ef6a62..b8cbc409a28 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -35,7 +35,6 @@ sys-cluster/openmpi openmpi_fabrics_open-mx
 
 # Aaron Bauman <bman@gentoo.org> (2019-08-04)
 # media-libs/ming will be removed in 30 days
-media-gfx/pstoedit flash
 sci-chemistry/wxmacmolplt flash
 
 # Thomas Deutschmann <whissi@gentoo.org> (2019-08-03)