[PATCHES] Add ruby-mini-portile-2, upgrade ruby-nokogiri

[Ben Woodcroft <b.woodcroft@uq.edu.au>]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

Nokogiri now requires an updated version of mini_portile (the gem was 
renamed to mini_portile2), but given that new versions of the 0.6.x 
branch still seem to be released I think keeping a separate mini_portile 
package is the go.

TIA.

[-- Attachment #2: 0001-gnu-Add-ruby-mini-portile-2.patch --]
[-- Type: text/x-patch, Size: 1064 bytes --]

From 1239963682ba7ff049fb9be8a56926ca23d32b64 Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrustben@gmail.com>
Date: Tue, 22 Dec 2015 21:51:43 +1000
Subject: [PATCH 1/2] gnu: Add ruby-mini-portile-2.

* gnu/packages/ruby.scm (ruby-mini-portile-2): New variable.
---
 gnu/packages/ruby.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index a3eafb1..24e6359 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1683,6 +1683,16 @@ to reproduce user environments.")
     (home-page "http://github.com/flavorjones/mini_portile")
     (license license:expat)))
 
+(define-public ruby-mini-portile-2
+  (package (inherit ruby-mini-portile)
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "mini_portile2" version))
+              (sha256
+               (base32
+                "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"))))))
+
 (define-public ruby-nokogiri
   (package
     (name "ruby-nokogiri")
-- 
2.5.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-ruby-nokogiri-Upgrade-to-1.6.7.1.patch --]
[-- Type: text/x-patch; name="0002-gnu-ruby-nokogiri-Upgrade-to-1.6.7.1.patch", Size: 1611 bytes --]

From e860cf565c377004d820e812d9fd7763861b0510 Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrustben@gmail.com>
Date: Tue, 22 Dec 2015 21:48:01 +1000
Subject: [PATCH 2/2] gnu: ruby-nokogiri: Upgrade to 1.6.7.1.

* gnu/packages/ruby.scm (ruby-nokogiri): Upgrade to 1.6.7.1.
---
 gnu/packages/ruby.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 24e6359..c8c3d16 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1696,13 +1696,13 @@ to reproduce user environments.")
 (define-public ruby-nokogiri
   (package
     (name "ruby-nokogiri")
-    (version "1.6.6.2")
+    (version "1.6.7.1")
     (source (origin
               (method url-fetch)
               (uri (rubygems-uri "nokogiri" version))
               (sha256
                (base32
-                "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30"))))
+                "12nwv3lad5k2k73aa1d1xy4x577c143ixks6rs70yp78sinbglk2"))))
     (build-system ruby-build-system)
     (arguments
      ;; Tests fail because Nokogiri can only test with an installed extension,
@@ -1720,7 +1720,7 @@ to reproduce user environments.")
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)))
     (propagated-inputs
-     `(("ruby-mini-portile" ,ruby-mini-portile)))
+     `(("ruby-mini-portile" ,ruby-mini-portile-2)))
     (synopsis "HTML, XML, SAX, and Reader parser for Ruby")
     (description "Nokogiri (鋸) parses and searches XML/HTML, and features
 both CSS3 selector and XPath 1.0 support.")
-- 
2.5.0