diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2009-01-12 04:03:24 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2009-01-12 04:03:24 +0000 |
| commit | f25871985914571fe1c26eed55174ab4bf2d9778 (patch) | |
| tree | 14b4aaf9981e68afb505597dfd31af7672ea3b74 /dev-util/rej | |
| parent | Version bump. (diff) | |
| download | gentoo-2-f25871985914571fe1c26eed55174ab4bf2d9778.tar.gz gentoo-2-f25871985914571fe1c26eed55174ab4bf2d9778.tar.bz2 gentoo-2-f25871985914571fe1c26eed55174ab4bf2d9778.zip | |
Do not block app-editors/mp any longer, thanks to Guenther Brunthaler (bug #254363).
(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7-JeR i686)
Diffstat (limited to 'dev-util/rej')
| -rw-r--r-- | dev-util/rej/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/rej/rej-0.16.ebuild | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-util/rej/ChangeLog b/dev-util/rej/ChangeLog index ca88117f0a1e..d53acf02e0b0 100644 --- a/dev-util/rej/ChangeLog +++ b/dev-util/rej/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/rej -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/rej/ChangeLog,v 1.12 2008/11/19 18:14:52 jer Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/rej/ChangeLog,v 1.13 2009/01/12 04:03:24 jer Exp $ + + 12 Jan 2009; Jeroen Roovers <jer@gentoo.org> rej-0.16.ebuild: + Do not block app-editors/mp any longer, thanks to Guenther Brunthaler (bug + #254363). 19 Nov 2008; Jeroen Roovers <jer@gentoo.org> rej-0.16.ebuild: Block packages that install mp and/or qp (bugs #189857 and #247434). diff --git a/dev-util/rej/rej-0.16.ebuild b/dev-util/rej/rej-0.16.ebuild index b77501a33324..069f37c40913 100644 --- a/dev-util/rej/rej-0.16.ebuild +++ b/dev-util/rej/rej-0.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/rej/rej-0.16.ebuild,v 1.5 2008/11/19 18:14:52 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/rej/rej-0.16.ebuild,v 1.6 2009/01/12 04:03:24 jer Exp $ DESCRIPTION="A utility for solving diff/patch rejects" HOMEPAGE="http://ftp.suse.com/pub/people/mason/rej/" @@ -14,7 +14,7 @@ IUSE="" DEPEND="" RDEPEND=" dev-lang/perl - !app-editors/mp + !<app-editors/mp-5 !dev-lang/qu-prolog !dev-util/mpatch " |