[gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/

[Jonas Stein]

commit:     a81a3b085b209da75ec62419edb97065ed545397
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 23 12:45:35 2017 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Thu Nov 23 12:45:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a81a3b08

media-gfx/inkscape: Remove obsolete and broken dep

Remove obsolete and broken dependency on app-text/libwpd
this fixes in this ebuild
Bug: https://bugs.gentoo.org/638440
Package-Manager: Portage-2.3.16, Repoman-2.3.5

 media-gfx/inkscape/inkscape-0.92.2.ebuild | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index f91ae073ba5..6f8363666e0 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -22,12 +22,6 @@ IUSE+=" lcms nls spell static-libs visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-WPG_DEPS="
-	|| (
-		( app-text/libwpg:0.3 dev-libs/librevenge )
-		( app-text/libwpd:0.9 app-text/libwpg:0.2 )
-	)
-"
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	>=app-text/poppler-0.26.0:=[cairo]
@@ -52,7 +46,8 @@ COMMON_DEPEND="
 	>=x11-libs/pango-1.24
 	cdr? (
 		media-libs/libcdr
-		${WPG_DEPS}
+		app-text/libwpg:0.3
+		dev-libs/librevenge
 	)
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
@@ -66,9 +61,13 @@ COMMON_DEPEND="
 	)
 	visio? (
 		media-libs/libvisio
-		${WPG_DEPS}
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
 	)
-	wpg? ( ${WPG_DEPS} )
 "
 
 # These only use executables provided by these packages