diff options
author | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-05-22 12:36:44 +0000 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-05-22 12:36:44 +0000 |
commit | 0ea0973cf573e6baafa8d5e416f2b9f723f360ec (patch) | |
tree | f680073fae3f53bdbddbd64d20cedbd6868de59c /dev-util | |
parent | version bump by Kristian Niemi in bug #365065 (diff) | |
download | gentoo-2-0ea0973cf573e6baafa8d5e416f2b9f723f360ec.tar.gz gentoo-2-0ea0973cf573e6baafa8d5e416f2b9f723f360ec.tar.bz2 gentoo-2-0ea0973cf573e6baafa8d5e416f2b9f723f360ec.zip |
Fix circular dep, bug 368301
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/gtk-doc-am/ChangeLog | 5 | ||||
-rw-r--r-- | dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-util/gtk-doc-am/ChangeLog b/dev-util/gtk-doc-am/ChangeLog index 231a9e8aeacc..5570aba4de72 100644 --- a/dev-util/gtk-doc-am/ChangeLog +++ b/dev-util/gtk-doc-am/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/gtk-doc-am # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/ChangeLog,v 1.60 2011/05/03 11:22:56 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/ChangeLog,v 1.61 2011/05/22 12:36:44 nirbheek Exp $ + + 22 May 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gtk-doc-am-1.17.ebuild: + Fix circular dep, bug 368301 03 May 2011; Fabian Groffen <grobian@gentoo.org> gtk-doc-am-1.17.ebuild: Marked ~x64-freebsd diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild index 9658a1127d26..03575c970640 100644 --- a/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild +++ b/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild,v 1.4 2011/05/03 11:22:56 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild,v 1.5 2011/05/22 12:36:44 nirbheek Exp $ EAPI="3" @@ -19,11 +19,12 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" -# pkg-config is used by gtkdoc-rebase at runtime -RDEPEND=">=dev-lang/perl-5.6 - dev-util/pkgconfig" +RDEPEND=">=dev-lang/perl-5.6" DEPEND="${RDEPEND} !<dev-util/gtk-doc-${MAJ_PV}" +# pkg-config is used by gtkdoc-rebase at runtime +# PDEPEND to avoid circular deps, bug 368301 +PDEPEND="dev-util/pkgconfig" # This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071) RESTRICT="test" |