Source Mage code commit list

[Jeremy Blosser <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Jeremy Blosser 
<jblosser AT sourcemage.org>:

 graphics-libs/freeglut/DEPENDS |    5 +----
 graphics-libs/freeglut/HISTORY |    3 +++
 x11-toolkits/wxgtk/DEPENDS     |    6 ++----
 x11-toolkits/wxgtk/HISTORY     |    3 +++
 4 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 3a6923b166577ebcf378081d37d2b3e400a68e35
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

    more mesalib-1x merge logic fixes

diff --git a/graphics-libs/freeglut/DEPENDS b/graphics-libs/freeglut/DEPENDS
index 3bb1971..465c6c0 100755
--- a/graphics-libs/freeglut/DEPENDS
+++ b/graphics-libs/freeglut/DEPENDS
@@ -1,8 +1,5 @@
 depends  OPENGL      &&
-if test mesalib-1x = "$(get_spell_provider $SPELL OPENGL)"; then
-  # New mesalib has it separated out.
-  depends  glu
-fi &&
+depends  glu         &&
 depends  libx11      &&
 depends  libxi       &&
 depends  libxext     &&
diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY
index 5ffe91c..9d4e5c3 100644
--- a/graphics-libs/freeglut/HISTORY
+++ b/graphics-libs/freeglut/HISTORY
@@ -1,3 +1,6 @@
+2014-10-18 Jeremy Blosser <jblosser AT sourcemage.org>
+       * DEPENDS: Remove old mesalib-1x logic, depends glu.
+
 2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS: separate glu for mesalib-1x
 
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 82a33f2..5ae37c7 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -22,10 +22,8 @@ optional_depends  mesalib            \
                   '--with-opengl'    \
                   '--without-opengl' \
                   'for OpenGL support'  &&
-if is_depends_enabled $SPELL mesalib-1x; then
-  # New mesalib has it separated out.
-  depends  glu
-fi &&
+depends  glu &&
+
 optional_depends  expat              \
                   '--with-expat'     \
                   '--without-expat'  \
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index b7a7552..69aa19b 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,6 @@
+2014-10-18  Jeremy Blosser <jblosser AT sourcemage.org>
+       * DEPENDS: Remove old mesalib-1x logic, depends glu.
+
 2014-09-25  Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: MESALIB => mesalib