diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-07-17 15:12:26 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-07-17 15:12:26 +0000 |
| commit | 71c5716ab6c102490d9f252b7d2a570aa894ffc4 (patch) | |
| tree | 614a6ddcc8812d2bf6b0fc74e1cb681d6e07fce4 /dev-libs | |
| parent | EAPI bump. (diff) | |
| download | gentoo-2-71c5716ab6c102490d9f252b7d2a570aa894ffc4.tar.gz gentoo-2-71c5716ab6c102490d9f252b7d2a570aa894ffc4.tar.bz2 gentoo-2-71c5716ab6c102490d9f252b7d2a570aa894ffc4.zip | |
Prevent user from having older dev-util/gdbus-codegen than dev-libs/glib wrt #517316
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.38.2-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.40.0-r1.ebuild | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index f60167aafd85..830a903bc651 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,11 @@ # 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.612 2014/06/18 19:11:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.613 2014/07/17 15:12:26 ssuominen Exp $ + + 17 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> glib-2.38.2-r1.ebuild, + glib-2.40.0-r1.ebuild: + Prevent user from having older dev-util/gdbus-codegen than dev-libs/glib wrt + #517316 18 Jun 2014; Michał Górny <mgorny@gentoo.org> glib-2.38.2-r1.ebuild, glib-2.40.0-r1.ebuild: diff --git a/dev-libs/glib/glib-2.38.2-r1.ebuild b/dev-libs/glib/glib-2.38.2-r1.ebuild index 9c4bdd6e6157..49cb2378c702 100644 --- a/dev-libs/glib/glib-2.38.2-r1.ebuild +++ b/dev-libs/glib/glib-2.38.2-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.38.2-r1.ebuild,v 1.14 2014/06/18 19:11:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.15 2014/07/17 15:12:26 ssuominen Exp $ EAPI="5" PYTHON_COMPAT=( python2_{6,7} ) @@ -20,6 +20,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 # FIXME: want >=libselinux-2.2.2-r4[${MULTILIB_USEDEP}] - bug #480960 RDEPEND=" + !<dev-util/gdbus-codegen-${PV} >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] diff --git a/dev-libs/glib/glib-2.40.0-r1.ebuild b/dev-libs/glib/glib-2.40.0-r1.ebuild index 4e1cdf8329ff..dd80d3406f7c 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.2 2014/06/18 19:11:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.3 2014/07/17 15:12:26 ssuominen Exp $ EAPI="5" PYTHON_COMPAT=( python2_{6,7} ) @@ -20,6 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s # FIXME: want >=libselinux-2.2.2-r4[${MULTILIB_USEDEP}] - bug #480960 RDEPEND=" + !<dev-util/gdbus-codegen-${PV} >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |