diff options
Diffstat (limited to 'x11-libs/gtk+/gtk+-3.10.8-r1.ebuild')
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.10.8-r1.ebuild | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild b/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild index 4a62832..b835700 100644 --- a/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild @@ -39,25 +39,25 @@ COMMON_DEPEND=" x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9[${MULTILIB_USEDEP}] ) - cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-1.7.3[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-1.32[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-1.2[${MULTILIB_USEDEP}] - media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=media-libs/mesa-10.2.1[wayland,${MULTILIB_USEDEP}] >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] + xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1 @@ -67,17 +67,17 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt[${MULTILIB_USEDEP}] + >=dev-libs/libxslt-1.1.28-r2[${MULTILIB_USEDEP}] dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.20 - sys-devel/gettext[${MULTILIB_USEDEP}] + >=sys-devel/gettext-0.19.1[${MULTILIB_USEDEP}] virtual/pkgconfig X? ( - x11-proto/xextproto[${MULTILIB_USEDEP}] - x11-proto/xproto[${MULTILIB_USEDEP}] - x11-proto/inputproto[${MULTILIB_USEDEP}] - x11-proto/damageproto[${MULTILIB_USEDEP}] - xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) + >=x11-proto/xextproto-7.3.0[${MULTILIB_USEDEP}] + >=x11-proto/xproto-7.0.26[${MULTILIB_USEDEP}] + >=x11-proto/inputproto-2.3.1[${MULTILIB_USEDEP}] + >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}] + xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] ) ) test? ( media-fonts/font-misc-misc @@ -155,6 +155,13 @@ src_configure() { --enable-gtk2-dependency \ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ --libdir="${EPREFIX}/usr/@GET_LIBDIR@" + + unset CUPS_CONFIG +} + +ehook gnome2-multilib-per-abi-pre_src_configure my_abi_pre_configure +my_abi_pre_configure() { + use cups && export CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" } ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test |