Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 ruby-raa/ruby-1.9/BUILD     |    4 +++-
 ruby-raa/ruby-1.9/CONFLICTS |    1 +
 ruby-raa/ruby-1.9/DEPENDS   |    2 ++
 ruby-raa/ruby-1.9/HISTORY   |    6 ++++++
 ruby-raa/rubygems/CONFLICTS |    1 +
 ruby-raa/rubygems/HISTORY   |    3 +++
 6 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 3c914ae62679b249f03af3b8ad416b7476f7137e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    rubygems: conflicts with ruby-1.9

commit b167c066f2d3eb403ce1021744e99c38664dc7ab
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    ruby-1.9: fixed dependencies & flags

diff --git a/ruby-raa/ruby-1.9/BUILD b/ruby-raa/ruby-1.9/BUILD
index 2789a74..27b4dd3 100755
--- a/ruby-raa/ruby-1.9/BUILD
+++ b/ruby-raa/ruby-1.9/BUILD
@@ -1,3 +1,5 @@
-OPTS="$OPTS  --enable-shared --enable-pthread"  &&
+OPTS="--enable-rubygems \
+      --enable-shared \
+      $OPTS" &&
 CFLAGS="${CFLAGS/-fomit-frame-pointer/}" &&
 default_build
diff --git a/ruby-raa/ruby-1.9/CONFLICTS b/ruby-raa/ruby-1.9/CONFLICTS
index 3f1cd74..54a7709 100755
--- a/ruby-raa/ruby-1.9/CONFLICTS
+++ b/ruby-raa/ruby-1.9/CONFLICTS
@@ -4,3 +4,4 @@ conflicts ruby-2.0
 conflicts ruby-2.1
 conflicts ruby-2.2
 conflicts ruby-enterprise-edition
+conflicts rubygems
diff --git a/ruby-raa/ruby-1.9/DEPENDS b/ruby-raa/ruby-1.9/DEPENDS
index acfc465..241d793 100755
--- a/ruby-raa/ruby-1.9/DEPENDS
+++ b/ruby-raa/ruby-1.9/DEPENDS
@@ -1,3 +1,5 @@
+depends libffi &&
+
 optional_depends doxygen  "" "--disable-install-doc" "install documentation" 
&&
 optional_depends db "" "" "for db support" &&
 optional_depends gdbm "" "" "for gdbm support" &&
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 9ae48db..a2f4720 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,5 +1,11 @@
+2015-04-01 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: added missing libffi dependency
+       * BUILD: removed obsolete pthread flag; force rubygems here
+       * CONFLICTS: conflicts with rubygems
+
 2015-01-03 Treeve Jelbert <treeve AT sourcemage.org>
        * CONFLICTS: add ruby-2.2
+
 2014-11-25 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.9.3-p551; SECURITY_PATCH++ 
(CVE-2014-8080,
          CVE-2014-8090)
diff --git a/ruby-raa/rubygems/CONFLICTS b/ruby-raa/rubygems/CONFLICTS
new file mode 100755
index 0000000..604aa3e
--- /dev/null
+++ b/ruby-raa/rubygems/CONFLICTS
@@ -0,0 +1 @@
+conflicts ruby-1.9
diff --git a/ruby-raa/rubygems/HISTORY b/ruby-raa/rubygems/HISTORY
index 47c6654..55da792 100644
--- a/ruby-raa/rubygems/HISTORY
+++ b/ruby-raa/rubygems/HISTORY
@@ -1,3 +1,6 @@
+2015-04-01 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added, conflicts with ruby-1.9
+
 2012-09-20 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.8.24