diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-08-02 09:16:10 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-08-02 09:16:10 +0000 |
| commit | 232ab7a5f1b15c75bd190bbbe6150d7755ebe978 (patch) | |
| tree | 82d72abe39a76920666d3d522daa27852894f3ae /dev-libs | |
| parent | Support lcms2 (#517642 by Nikoli) (diff) | |
| download | gentoo-2-232ab7a5f1b15c75bd190bbbe6150d7755ebe978.tar.gz gentoo-2-232ab7a5f1b15c75bd190bbbe6150d7755ebe978.tar.bz2 gentoo-2-232ab7a5f1b15c75bd190bbbe6150d7755ebe978.zip | |
Rework the way we force glib and goi to be in sync (#518424 by Alexander Tsoy)
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.40.0-r1.ebuild | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 582d3b550aa1..f8d58298a35b 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.616 2014/07/28 13:42:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.617 2014/08/02 09:16:10 pacho Exp $ + + 02 Aug 2014; Pacho Ramos <pacho@gentoo.org> glib-2.40.0-r1.ebuild: + Rework the way we force glib and goi to be in sync (#518424 by Alexander Tsoy) 28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> glib-2.40.0-r1.ebuild: Stable for ppc, wrt bug #512012 diff --git a/dev-libs/glib/glib-2.40.0-r1.ebuild b/dev-libs/glib/glib-2.40.0-r1.ebuild index 63b98cd525c1..0e594e01a57e 100644 --- a/dev-libs/glib/glib-2.40.0-r1.ebuild +++ b/dev-libs/glib/glib-2.40.0-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/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.6 2014/07/28 13:42:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.7 2014/08/02 09:16:10 pacho Exp $ EAPI="5" PYTHON_COMPAT=( python2_{6,7} ) @@ -51,7 +51,6 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS} >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] >=sys-apps/dbus-1.2.14 ) - !<dev-libs/gobject-introspection-1.$(get_version_component_range 2) !<dev-util/gtk-doc-1.15-r2 " # gobject-introspection blocker to ensure people don't mix |