| 1 |
commit: 08859fb02412f4e768c7cde449a1c9f79bf85ad7 |
| 2 |
Author: Kent Fredric <kentfredric <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jun 28 19:44:16 2011 +0000 |
| 4 |
Commit: Kent Fredric <kentfredric <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Jun 28 19:44:16 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=commit;h=08859fb0 |
| 7 |
|
| 8 |
[fixconflict] Catalyst-Runtime -> Catalyst-Action-REST |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key BD86D695) |
| 11 |
|
| 12 |
--- |
| 13 |
.../Catalyst-Runtime-5.890.20_rc.ebuild | 2 +- |
| 14 |
.../Catalyst-Runtime-5.890_rc.ebuild | 2 +- |
| 15 |
dev-perl/Catalyst-Runtime/ChangeLog | 4 ++++ |
| 16 |
3 files changed, 6 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-perl/Catalyst-Runtime/Catalyst-Runtime-5.890.20_rc.ebuild b/dev-perl/Catalyst-Runtime/Catalyst-Runtime-5.890.20_rc.ebuild |
| 19 |
index 1377f0d..bf07344 100644 |
| 20 |
--- a/dev-perl/Catalyst-Runtime/Catalyst-Runtime-5.890.20_rc.ebuild |
| 21 |
+++ b/dev-perl/Catalyst-Runtime/Catalyst-Runtime-5.890.20_rc.ebuild |
| 22 |
@@ -90,7 +90,7 @@ conflict Catalyst-Action-DebugCookie 0.999002 # 0.999.2 |
| 23 |
conflict Catalyst-Plugin-Authentication 0.100.91 |
| 24 |
conflict CatalystX-Imports 0.03 # 0.30.0 |
| 25 |
conflict Catalyst-Plugins-HashedCookies 1.03 # 1.30.0 |
| 26 |
-conflict Catalyst-Action-REST 0.670 # 0.670.0 |
| 27 |
+conflict Catalyst-Action-REST 0.670.0 |
| 28 |
conflict CatalystX-CRUD 0.42 # 0.420.0 |
| 29 |
conflict CatalystX-CRUD-Model-RDBO 0.20 # 0.200.0 |
| 30 |
conflict Catalyst-View-Mason 0.17 # 0.170.0 |
| 31 |
|
| 32 |
diff --git a/dev-perl/Catalyst-Runtime/Catalyst-Runtime-5.890_rc.ebuild b/dev-perl/Catalyst-Runtime/Catalyst-Runtime-5.890_rc.ebuild |
| 33 |
index 1d4ef31..f02ebe3 100644 |
| 34 |
--- a/dev-perl/Catalyst-Runtime/Catalyst-Runtime-5.890_rc.ebuild |
| 35 |
+++ b/dev-perl/Catalyst-Runtime/Catalyst-Runtime-5.890_rc.ebuild |
| 36 |
@@ -90,7 +90,7 @@ conflict Catalyst-Action-DebugCookie 0.999002 # 0.999.2 |
| 37 |
conflict Catalyst-Plugin-Authentication 0.100.91 |
| 38 |
conflict CatalystX-Imports 0.03 # 0.30.0 |
| 39 |
conflict Catalyst-Plugins-HashedCookies 1.03 # 1.30.0 |
| 40 |
-conflict Catalyst-Action-REST 0.670 # 0.670.0 |
| 41 |
+conflict Catalyst-Action-REST 0.670.0 |
| 42 |
conflict CatalystX-CRUD 0.42 # 0.420.0 |
| 43 |
conflict CatalystX-CRUD-Model-RDBO 0.20 # 0.200.0 |
| 44 |
conflict Catalyst-View-Mason 0.17 # 0.170.0 |
| 45 |
|
| 46 |
diff --git a/dev-perl/Catalyst-Runtime/ChangeLog b/dev-perl/Catalyst-Runtime/ChangeLog |
| 47 |
index 4741dce..000fb7f 100644 |
| 48 |
--- a/dev-perl/Catalyst-Runtime/ChangeLog |
| 49 |
+++ b/dev-perl/Catalyst-Runtime/ChangeLog |
| 50 |
@@ -2,6 +2,10 @@ |
| 51 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 52 |
# $Header: $ |
| 53 |
|
| 54 |
+ 28 Jun 2011; Kent Fredric <kentfredric@×××××.com> |
| 55 |
+ Catalyst-Runtime-5.890_rc.ebuild, Catalyst-Runtime-5.890.20_rc.ebuild: |
| 56 |
+ Fixdep Conflict Catalyst-Action-REST |
| 57 |
+ |
| 58 |
06 May 2011; Kent Fredric <kentfredric@×××××.com> |
| 59 |
Catalyst-Runtime-5.890_rc.ebuild, Catalyst-Runtime-5.890.20_rc.ebuild: |
| 60 |
Massive depfix |
Archives