Merge branch 'master' of git://github.com/conda/conda-recipes

cairo/meta.yaml

@@ -12,12 +12,14 @@ build:
 
 requirements:
   build:
+    - pkg-config
     - freetype
     - fontconfig
     - libpng
     - pixman
     - zlib
   run:
+    - pkg-config
     - freetype
     - fontconfig
     - libpng

click/meta.yaml

@@ -1,11 +1,20 @@
 package:
   name: click
+<<<<<<< HEAD
   version: !!str 3.3
 
 source:
   fn: click-3.3.tar.gz
   url: https://pypi.python.org/packages/source/c/click/click-3.3.tar.gz
   md5: 40edaba4d216915a8326c5b2cb52781d
+=======
+  version: "4.0"
+
+source:
+  fn: click-4.0.tar.gz
+  url: https://pypi.python.org/packages/source/c/click/click-4.0.tar.gz
+  md5: 79b475a1dbd566d8ce7daba5e6c1aaa7
+>>>>>>> 3dba6060d439b6802aa2c698bc698b077e99727a
 #  patches:
    # List any patch files here
    # - fix.patch

cloog/meta.yaml

@@ -1,10 +1,10 @@
 package:
   name: cloog
-  version: 0.18.0
+  version: 0.18.1
 
 source:
-  fn: cloog-0.18.0.tar.gz
-  url: http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-0.18.0.tar.gz
+  fn: cloog-0.18.1.tar.gz
+  url: http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-0.18.1.tar.gz
 
 requirements:
   build:

disco/build.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
+export CFLAGS="-I$PREFIX/include $CFLAGS" 
+export LDFLAGS="-L$PREFIX/lib $LDFLAGS"
 
-git submodule init
-git submodule update
+git init && git add master/rebar && git commit -a -m 'dummy commit'
 
 gsed -i "s:sysconfdir    = /etc:sysconfdir = $PREFIX/etc:g" Makefile
 gsed -i "s:prefix        = /usr:prefix = $PREFIX:g" Makefile
@@ -11,6 +12,26 @@ make install
 gsed -i "s:/etc/disco/:$PREFIX/etc/disco/:g" \
     $PREFIX/lib/python2.7/site-packages/disco/settings.py
 
-cd contrib/discodb
+mkdir -p $PREFIX/libexec/bin
+gsed -i "s:/usr/bin/env python:$PREFIX/bin/python:g" $PREFIX/bin/disco
+gsed -i "s:/usr/bin/env python:$PREFIX/bin/python:g" $PREFIX/bin/ddfs
 
-$PYTHON setup.py install --prefix=$PREFIX
+
+mv $PREFIX/bin/disco $PREFIX/libexec/bin
+mv $PREFIX/bin/ddfs $PREFIX/libexec/bin
+
+touch $PREFIX/bin/disco 
+chmod +x $PREFIX/bin/disco 
+touch $PREFIX/bin/ddfs
+chmod +x $PREFIX/bin/ddfs
+
+echo "#!/bin/bash" >> $PREFIX/bin/disco
+echo "#!/bin/bash" >> $PREFIX/bin/ddfs
+
+
+echo "PYTHONPATH=\"$PREFIX/lib/python$PY_VER/site-packages\" exec \"$PREFIX/libexec/bin/disco\" \"\$@\"" >> $PREFIX/bin/disco
+echo "PYTHONPATH=\"$PREFIX/lib/python$PY_VER/site-packages\" exec \"$PREFIX/libexec/bin/ddfs\" \"\$@\"" >> $PREFIX/bin/ddfs
+
+#cd contrib/discodb
+
+#$PYTHON setup.py install --prefix=$PREFIX

disco/meta.yaml

@@ -3,13 +3,16 @@ package:
   version: 0.5.4
 
 source:
-  git_url: [email protected]:discoproject/disco.git
-  git_tag: 0.5.4
+  fn: disco-0.5.4.tar.gz
+  url: https://github.com/discoproject/disco/archive/0.5.4.tar.gz
+  sha1: 43bc8fac5d5d657a81a8d7b628d1f72f97470b6e
   patches:
     - build.patch
+   #  - no-listdir.patch
+   # - prefix-erl.patch
 
 build:
-  number: 2
+  number: 0
 
 requirements:
   build:

disco/no-listdir.patch

@@ -0,0 +1,28 @@
+diff --git bin/ddfscli.py bin/ddfscli.py
+index 3c3429a..1064af1 100755
+--- bin/ddfscli.py
++++ bin/ddfscli.py
+@@ -32,9 +32,6 @@ Run :command:`ddfs help` for information on using the command line utility.
+
+ import fileinput, os, sys
+
+-if '.disco-home' in os.listdir('.'):
+-    sys.path.append('lib')
+-
+ from disco.cli import OptionParser, Program
+
+ class DDFS(Program):
+diff --git bin/discocli.py bin/discocli.py
+index c191fe0..dd4e2fb 100755
+--- bin/discocli.py
++++ bin/discocli.py
+@@ -52,9 +52,6 @@ Would get the results for the last job with name containing ``WordCount``.
+
+ import fileinput, os, sys
+
+-if '.disco-home' in os.listdir('.'):
+-    sys.path.append('lib')
+-
+ from disco.cli import OptionParser, Program
+
+ class Disco(Program):

disco/prefix-erl.patch

@@ -0,0 +1,17 @@
+diff --git lib/clx/server.py lib/clx/server.py
+index 6182301..1a78887 100644
+--- lib/clx/server.py
++++ lib/clx/server.py
+@@ -47,7 +47,11 @@ class Server(object):
+             raise ServerError("%s already started" % self)
+         if self.rotate_log:
+             self.log_rotate()
+-        process = subprocess.Popen(args or self.args, env=self.env, **kwargs)
++        cmd = args or self.args
++        if cmd and cmd[0] == 'erl':
++            import sys
++            cmd[0] = sys.prefix + '/lib/erlang/bin/erl'
++        process = subprocess.Popen(cmd, env=self.env, **kwargs)
+         if process.wait():
+             raise ServerError("Failed to start %s" % self)
+         yield '%s started' % self

erlang/build.sh

@@ -10,7 +10,11 @@
     --enable-shared-zlib \
     --enable-smp-support \
     --enable-darwin-64bit \
-    --disable-wx
+    --disable-wx \
+    --enable-native-libs \
+    --disable-debug \
+    --disable-silent-rules \
+    --disable-hipe
 
 make
 make install

erlang/meta.yaml

@@ -8,7 +8,7 @@ source:
   url: http://www.erlang.org/download/otp_src_R15B03-1.tar.gz
 
 build:
-  number: 1
+  number: 0
 
 requirements:
   build:

ipython-notebook/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: ipython-notebook
-  version: 2.2.0
+  version: 2.3.1
 
 requirements:
   run:

ipython-qtconsole/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: ipython-qtconsole
-  version: 2.2.0
+  version: 2.3.1
 
 requirements:
   run:

ipython/meta.yaml

@@ -1,11 +1,11 @@
 package:
   name: ipython
-  version: 2.2.0
+  version: 2.3.1
 
 source:
-  fn: ipython-2.2.0.tar.gz
-  url: https://pypi.python.org/packages/source/i/ipython/ipython-2.2.0.tar.gz
-  md5: b91d3724f655a8e16d022772f696cfd5
+  fn: ipython-2.3.1.tar.gz
+  url: https://pypi.python.org/packages/source/i/ipython/ipython-2.3.1.tar.gz
+  md5: 2b7085525dac11190bfb45bb8ec8dcbf
   patches:
     - cprt.patch
 
@@ -25,7 +25,7 @@ build:
 requirements:
   build:
     - python
-    - setuptools             [win or py3k]
+    - setuptools             [win]
     - pyreadline             [win]
   run:
     - python

mincss/bld.bat

@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.

mincss/build.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.

mincss/meta.yaml

@@ -0,0 +1,64 @@
+package:
+  name: mincss
+  version: !!str 0.8.1
+
+source:
+  fn: mincss-0.8.1.tar.gz
+  url: https://pypi.python.org/packages/source/m/mincss/mincss-0.8.1.tar.gz
+  md5: 2917e8fe30d7cf80cc9b8353e2f2c3eb
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  # preserve_egg_dir: True
+  # entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - mincss = mincss:main
+    #
+    # Would create an entry point called mincss that calls mincss.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - lxml
+    - cssselect
+
+  run:
+    - python
+    - lxml
+    - cssselect
+
+test:
+  # Python imports
+  imports:
+    - mincss
+
+  # commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://github.com/peterbe/mincss
+  license: BSD License
+  summary: 'clears the junk out of your CSS'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml

mistune/bld.bat

@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.

mistune/build.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.