x11-libs/gtk+: Adjust libepoxy X USE deps for all gtk+:3

The libepoxy version adding IUSE=X is slated for fast stabling, so
guard us against this in the stable 3.20 version as well.

Gentoo-bug: 611710
Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/x11-libs/gtk+/gtk+-3.20.9.ebuild b/x11-libs/gtk+/gtk+-3.20.9.ebuild
index ab73201760105507f6a39c27ba23db1811684b48..4c60225b85002d497abfb1ddfe073c3cd3c33d13 100644 (file)
--- a/x11-libs/gtk+/gtk+-3.20.9.ebuild
+++ b/x11-libs/gtk+/gtk+-3.20.9.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
        >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
        >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}]
        media-libs/fontconfig[${MULTILIB_USEDEP}]
-       >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
+       >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
        >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
        >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
        >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]

diff --git a/x11-libs/gtk+/gtk+-3.22.5.ebuild b/x11-libs/gtk+/gtk+-3.22.5.ebuild
index 8672206625ba9ad5e5899d2c72b291a265c46b28..4c4f4c4f460c23247ea7836a16a8b0116ac28503 100644 (file)
--- a/x11-libs/gtk+/gtk+-3.22.5.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.5.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
        >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
        >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
        media-libs/fontconfig[${MULTILIB_USEDEP}]
-       >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
+       >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
        >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
        >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
        >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]