diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-05-25 04:55:59 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-25 04:55:59 +0000 |
| commit | 389ac5bc88168e840d45e25312406f3645cad5e4 (patch) | |
| tree | 848a2c943c511a15355a3abcef8a26b5d354901f /app-portage | |
| parent | Version bump. (diff) | |
| download | gentoo-2-389ac5bc88168e840d45e25312406f3645cad5e4.tar.gz gentoo-2-389ac5bc88168e840d45e25312406f3645cad5e4.tar.bz2 gentoo-2-389ac5bc88168e840d45e25312406f3645cad5e4.zip | |
Block app-admin/webapp-config due to webapp.eclass.5 file collision.
(Portage version: 2.2_pre10410/cvs/Linux 2.6.25-0518-x86-64 Intel(R) Core(TM)2 CPU 6300 @ 1.86GHz)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/eclass-manpages/ChangeLog | 6 | ||||
| -rw-r--r-- | app-portage/eclass-manpages/eclass-manpages-20070615.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app-portage/eclass-manpages/ChangeLog b/app-portage/eclass-manpages/ChangeLog index 2939af484d37..693761b5d56e 100644 --- a/app-portage/eclass-manpages/ChangeLog +++ b/app-portage/eclass-manpages/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/eclass-manpages # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/ChangeLog,v 1.11 2008/02/19 20:38:19 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/ChangeLog,v 1.12 2008/05/25 04:55:59 zmedico Exp $ + + 25 May 2008; Zac Medico <zmedico@gentoo.org> + eclass-manpages-20070615.ebuild: + Block app-admin/webapp-config due to webapp.eclass.5 file collision. 19 Feb 2008; Doug Klima <cardoe@gentoo.org> metadata.xml: fix herd diff --git a/app-portage/eclass-manpages/eclass-manpages-20070615.ebuild b/app-portage/eclass-manpages/eclass-manpages-20070615.ebuild index 18efa22b24a5..8ba809437395 100644 --- a/app-portage/eclass-manpages/eclass-manpages-20070615.ebuild +++ b/app-portage/eclass-manpages/eclass-manpages-20070615.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/eclass-manpages-20070615.ebuild,v 1.4 2008/02/19 05:13:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/eclass-manpages-20070615.ebuild,v 1.5 2008/05/25 04:55:59 zmedico Exp $ DESCRIPTION="collection of Gentoo eclass manpages" HOMEPAGE="http://www.gentoo.org/" @@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="" DEPEND="" -RDEPEND="!app-portage/portage-manpages" +RDEPEND="!app-portage/portage-manpages !app-admin/webapp-config" S=${WORKDIR} |