diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-12 15:18:24 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-12 15:18:24 +0000 |
| commit | e7213a012dba304a4e4f19f84b2d0e90bc01a547 (patch) | |
| tree | c03c98e9989e592bc0d58496bdb92ed7da3dad5f /x11-libs/gtk+ | |
| parent | Require newer virtual/krb5 so that ${CHOST}-krb5-config is in place. (diff) | |
| download | gentoo-2-e7213a012dba304a4e4f19f84b2d0e90bc01a547.tar.gz gentoo-2-e7213a012dba304a4e4f19f84b2d0e90bc01a547.tar.bz2 gentoo-2-e7213a012dba304a4e4f19f84b2d0e90bc01a547.zip | |
Force ${CHOST}-cups-config to obtain proper paths for multilib cups.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'x11-libs/gtk+')
| -rw-r--r-- | x11-libs/gtk+/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-2.24.23-r1.ebuild | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 0447d9e3a355..dfeb5459ce36 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.720 2014/06/01 14:17:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.721 2014/06/12 15:18:24 mgorny Exp $ + + 12 Jun 2014; Michał Górny <mgorny@gentoo.org> gtk+-2.24.23-r1.ebuild: + Force ${CHOST}-cups-config to obtain proper paths for multilib cups. 01 Jun 2014; Pacho Ramos <pacho@gentoo.org> -gtk+-3.12.1.ebuild: drop old diff --git a/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild index f7f3c4057a85..3cc37e37fdf5 100644 --- a/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild,v 1.1 2014/05/14 13:36:39 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.23-r1.ebuild,v 1.2 2014/06/12 15:18:24 mgorny Exp $ EAPI="5" GCONF_DEBUG="no" @@ -40,7 +40,7 @@ COMMON_DEPEND=" >=dev-libs/atk-1.29.2[introspection?,${MULTILIB_USEDEP}] media-libs/fontconfig[${MULTILIB_USEDEP}] x11-misc/shared-mime-info - cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !<gnome-base/gail-1000 " @@ -176,7 +176,8 @@ multilib_src_configure() { $(use_enable cups cups auto) \ $(multilib_native_use_enable introspection) \ $(use_enable xinerama) \ - --disable-papi + --disable-papi \ + CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" # work-around gtk-doc out-of-source brokedness if multilib_is_native_abi; then |