Link a newer openssl from homebrew on OS X

Also refactor servo-dependencies.sls slightly.
Closes #210 (for real this time!)

servo-dependencies.sls

@@ -1,59 +1,13 @@
-{% if grains['kernel'] != 'Darwin' %}
-FIX enable multiverse:
-  pkgrepo.absent:
-    - name: deb http://archive.ubuntu.com/ubuntu trusty multiverse
-
-enable multiverse:
-  pkgrepo.managed:
-    - name: deb http://archive.ubuntu.com/ubuntu trusty multiverse
-
-ttf-mscorefonts-installer:
-  debconf.set:
-    - name: ttf-mscorefonts-installer
-    - data: { 'msttcorefonts/accepted-mscorefonts-eula': { 'type': 'boolean', 'value': True } }
-  pkg.installed:
-    - pkgs:
-      - ttf-mscorefonts-installer
-    - requires:
-      - debconf: ttf-mscorefonts-installer
-{% endif %}
-
-{% if grains['kernel'] == 'Darwin' %}
-# Workaround for https://github.com/saltstack/salt/issues/26414
-servo-darwin-homebrew-versions-dependencies:
-  module.run:
-    - name: pkg.install
-    - pkgs:
-      - automake
-      - autoconf213
-    - taps:
-      - homebrew/versions
-    - require_in:
-      - pkg: servo-dependencies
-
-homebrew-link-autoconf:
-  cmd.run:
-    - name: 'brew link --overwrite autoconf'
-    - user: administrator
-      # Warning: Only checks that some autoconf Homebrew package is linked,
-      # not necessarily the version installed above.
-      # Whether this handles updating autoconf properly is an open question.
-      # This state should be replaced by a custom Salt state.
-    - creates: /usr/local/Library/LinkedKegs/autoconf
-    - require:
-      - module: servo-darwin-homebrew-versions-dependencies
-    - require_in:
-      - pkg: servo-dependencies
-{% endif %}
-
 servo-dependencies:
   pkg.installed:
     - pkgs:
       - cmake
       - git
       - ccache
       {% if grains['kernel'] == 'Darwin' %}
+      - automake
       - pkg-config
+      - openssl
       {% else %}
       - libglib2.0-dev
       - libgl1-mesa-dri
@@ -74,3 +28,53 @@ servo-dependencies:
     - pkgs:
       - virtualenv
       - ghp-import
+
+{% if grains['kernel'] == 'Darwin' %}
+# Workaround for https://github.com/saltstack/salt/issues/26414
+servo-darwin-homebrew-versions-dependencies:
+  module.run:
+    - name: pkg.install
+    - pkgs:
+      - autoconf213
+    - taps:
+      - homebrew/versions
+
+# Warning: These states that manually run brew link only check that some
+# version of the Homebrew package is linked, not necessarily the version
+# linked above. Whether this handles updates properly is an open question.
+# These should be replaced by a custom Salt state.
+homebrew-link-autoconf:
+  cmd.run:
+    - name: 'brew link --overwrite autoconf'
+    - user: administrator
+    - creates: /usr/local/Library/LinkedKegs/autoconf
+    - require:
+      - pkg: servo-dependencies
+      - module: servo-darwin-homebrew-versions-dependencies
+
+homebrew-link-openssl:
+  cmd.run:
+    - name: 'brew link --force openssl'
+    - user: administrator
+    - creates: /usr/local/Library/LinkedKegs/openssl
+    - require:
+      - pkg: servo-dependencies
+{% else %}
+FIX enable multiverse:
+  pkgrepo.absent:
+    - name: deb http://archive.ubuntu.com/ubuntu trusty multiverse
+
+enable multiverse:
+  pkgrepo.managed:
+    - name: deb http://archive.ubuntu.com/ubuntu trusty multiverse
+
+ttf-mscorefonts-installer:
+  debconf.set:
+    - name: ttf-mscorefonts-installer
+    - data: { 'msttcorefonts/accepted-mscorefonts-eula': { 'type': 'boolean', 'value': True } }
+  pkg.installed:
+    - pkgs:
+      - ttf-mscorefonts-installer
+    - requires:
+      - debconf: ttf-mscorefonts-installer
+{% endif %}