summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-01-12 04:03:24 +0000
committerJeroen Roovers <jer@gentoo.org>2009-01-12 04:03:24 +0000
commitaaf7cad8ba44ba5c2fed8bc1f1b0bb89d5b2806e (patch)
treee27001eb1126c8ebb33c873a6428c8503b9f4e9f
parentVersion bump. (diff)
downloadhistorical-aaf7cad8ba44ba5c2fed8bc1f1b0bb89d5b2806e.tar.gz
historical-aaf7cad8ba44ba5c2fed8bc1f1b0bb89d5b2806e.tar.bz2
historical-aaf7cad8ba44ba5c2fed8bc1f1b0bb89d5b2806e.zip
Do not block app-editors/mp any longer, thanks to Guenther Brunthaler (bug #254363).
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7-JeR i686
-rw-r--r--dev-util/rej/ChangeLog8
-rw-r--r--dev-util/rej/Manifest4
-rw-r--r--dev-util/rej/rej-0.16.ebuild6
3 files changed, 11 insertions, 7 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/Manifest b/dev-util/rej/Manifest
index d52cfb63a3d6..60d5b95f1816 100644
--- a/dev-util/rej/Manifest
+++ b/dev-util/rej/Manifest
@@ -1,4 +1,4 @@
DIST rej-0.16.tar.gz 422796 RMD160 eb6e570482d16593e7d7cd064961d568e82bad0d SHA1 27c70cec396456e3469228d37ab4457bb583b5e1 SHA256 a68c02b4833b60fc91b48f10e1f1fa67b185ec98d828a8132d936f1c3dcdcbb6
-EBUILD rej-0.16.ebuild 625 RMD160 cfc23e8e123acc87772b93579fede723eb6983d3 SHA1 470fd6b983e20245a2b67fb11f2873dca72f7b59 SHA256 aa8ece7bfc23cfc529a20c7534294c4d8734da491e0ebe83612066d5c2c065b8
-MISC ChangeLog 1388 RMD160 17bed353ebccd8b7966602c973f11f2a45e8e0da SHA1 2e313d0934a108019121927e1e8c4b93b620e900 SHA256 a39415fd764a32b0c5af3f48d864001609a3cfe03a89122a665f8de2f67741df
+EBUILD rej-0.16.ebuild 628 RMD160 495ccb899780b7eb356330d0494d351e120d2e3f SHA1 cc51f2af05b17caca66175bc9d1b7d36bff837d7 SHA256 2a1cc6423035ef0e271b5083bf9c710a16b5a980e9d8a54560ccd6d2e2cfe869
+MISC ChangeLog 1542 RMD160 fc58ced6b880e6bbd4ed0714c809aa7cd34a8625 SHA1 bfa021b3656af58b96bebb4cc310de4565955d89 SHA256 94fdc6ba0aebb7d959504eb7a07e766a91bb0f6e36064f78a9306e936abc5ac8
MISC metadata.xml 246 RMD160 03d7dc04edcc2ad2d071336860a1fd6f70c448d8 SHA1 045ad0ae97c2867541c6a90c2fef138263b712f5 SHA256 681762b4470d433382e9b224c0773310946d67c140200b1e29414fb2c4450be3
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
"