commit: f7a8562b9c4ac3dd3653bcb4905e6a488f515cd9
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 5 17:12:30 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 17:13:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a8562b
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
x11-libs/gtk+/gtk+-3.20.9.ebuild | 2 +-
x11-libs/gtk+/gtk+-3.22.5.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/gtk+/gtk+-3.20.9.ebuild b/x11-libs/gtk+/gtk+-3.20.9.ebuild
index ab732017601..4c60225b850 100644
--- 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 8672206625b..4c4f4c4f460 100644
--- 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}]
