Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to stable-rc-0.50 grimoire by George Sherwood 
<gsherwood AT sourcemage.org>:

 x11-toolkits/gtk+2/CONFLICTS  |    4 +++-
 x11-toolkits/gtk+2/HISTORY    |    3 +++
 x11-toolkits/gtkmm2/CONFLICTS |    3 +++
 x11-toolkits/gtkmm2/HISTORY   |    3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 616394d9921cc1a126933b7d2800e39dbfd6c242
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    gtk+2: CONFLICTS: removed gail, added gtk+2, #15899
    (cherry picked from commit dc896f5cca70c256d6d60aca6ed49302de0f4f5a)

commit 23f94017eb2bd257279b84a6b615d6a433728fc6
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    gtkmm2: CONFLICTS: added, #15899
    (cherry picked from commit a0b6c8222955d3c9eb83da89458418f26ada4890)

diff --git a/x11-toolkits/gtk+2/CONFLICTS b/x11-toolkits/gtk+2/CONFLICTS
index 50f6d21..39cbbb7 100755
--- a/x11-toolkits/gtk+2/CONFLICTS
+++ b/x11-toolkits/gtk+2/CONFLICTS
@@ -1 +1,3 @@
-conflicts gail y
+if spell_ok gtk+2 && [[ $(installed_version gtk+2) < 2.22 ]]; then
+  conflicts gtk+2 y
+fi
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index e6933bc..adba9c4 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2010-10-31 Ladislav Hagara <hgr AT vabo.cz>
+       * CONFLICTS: removed gail, added gtk+2, #15899
+
 2010-10-25 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: removed --with-lib{png,jpeg,tiff,jasper} #15889
 
diff --git a/x11-toolkits/gtkmm2/CONFLICTS b/x11-toolkits/gtkmm2/CONFLICTS
new file mode 100755
index 0000000..2349c65
--- /dev/null
+++ b/x11-toolkits/gtkmm2/CONFLICTS
@@ -0,0 +1,3 @@
+if spell_ok gtkmm2 && [[ $(installed_version gtkmm2) < 2.22 ]]; then
+  conflicts gtkmm2 y
+fi
diff --git a/x11-toolkits/gtkmm2/HISTORY b/x11-toolkits/gtkmm2/HISTORY
index b9c1152..d11bf53 100644
--- a/x11-toolkits/gtkmm2/HISTORY
+++ b/x11-toolkits/gtkmm2/HISTORY
@@ -1,3 +1,6 @@
+2010-10-31 Ladislav Hagara <hgr AT vabo.cz>
+       * CONFLICTS: added, #15899
+
 2010-10-24 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: added atkmm