Fix conflict

54 files changed, 1618 insertions, 41 deletions

diff --git a/.gitignore b/.gitignore
index 0335979..3d717aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .*project
 .index.json
+*.swp
diff --git a/acstools/acstools.ini b/acstools/acstools.ini
index 3769d78..8e71f1a 100644
--- a/acstools/acstools.ini
+++ b/acstools/acstools.ini
@@ -1,6 +1,6 @@
 [package]
 name: acstools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
diff --git a/aprio/aprio.ini b/aprio/aprio.ini
index 7b27c86..4a2937d 100644
--- a/aprio/aprio.ini
+++ b/aprio/aprio.ini
@@ -1,6 +1,6 @@
 [package]
 name: aprio
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://bitbucket.org/jhunkeler/${package:name}
diff --git a/asdf-standard/asdf-standard.ini b/asdf-standard/asdf-standard.ini
index 4fac4f3..cd97145 100644
--- a/asdf-standard/asdf-standard.ini
+++ b/asdf-standard/asdf-standard.ini
@@ -1,6 +1,6 @@
 [package]
 name: asdf-standard
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://github.com/spacetelescope/${package:name}
diff --git a/astrolib.coords/astrolib.coords.ini b/astrolib.coords/astrolib.coords.ini
new file mode 100644
index 0000000..b46b11a
--- /dev/null
+++ b/astrolib.coords/astrolib.coords.ini
@@ -0,0 +1,42 @@
+[package]
+name : astrolib.coords
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/astrolib.coords.git
+license : 
+summary : ${package:name}
+
+[source]
+git_url : ${about:home}/${fn}
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+    d2to1
+	stsci.distutils
+	setuptools
+    numpy
+	python
+run : 
+	numpy
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+	python setup.py install || exit 1
+windows : 
+	
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+	python setup.py install
+	if errorlevel 1 exit 1
+
diff --git a/astropy-helpers/astropy-helpers.ini b/astropy-helpers/astropy-helpers.ini
index 6bed0f6..e503e6a 100644
--- a/astropy-helpers/astropy-helpers.ini
+++ b/astropy-helpers/astropy-helpers.ini
@@ -1,6 +1,6 @@
 [package]
 name: astropy-helpers
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://github.com/astropy/${package:name}
diff --git a/astropy/astropy.ini b/astropy/astropy.ini
index 067bae8..2de1f40 100644
--- a/astropy/astropy.ini
+++ b/astropy/astropy.ini
@@ -1,6 +1,6 @@
 [package]
 name: astropy
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://github.com/astropy/${package:name}
diff --git a/atlas/atlas-generic.ini b/atlas/atlas-generic.ini
new file mode 100644
index 0000000..87377c9
--- /dev/null
+++ b/atlas/atlas-generic.ini
@@ -0,0 +1,56 @@
+[package]
+name : atlas-generic
+version : 3.10.2
+
+[about]
+home : http://sourceforge.net/projects/math-atlas/files/Stable
+license : BSD
+summary : ${package:name}
+
+[source]
+fn : atlas${package:version}.tar.bz2
+url : ${about:home}/${package:version}/${fn}
+
+[build]
+number : 0
+
+[requirements]
+build : 
+    #
+run : 
+    #
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    export LIBTOOL=/usr/bin/libtool
+    export CC=/opt/local/bin/gcc-mp-4.8
+    export F77=/opt/local/bin/gfortran-mp-4.8
+    wget http://www.netlib.org/lapack/lapack-3.5.0.tgz
+
+    mkdir -p build
+    pushd ./build
+	../configure --prefix=$$PREFIX \
+    --with-netlib-lapack-tarfile=../lapack-3.5.0.tgz \
+    -C acg $$CC \
+    -C if $$F77 \
+    -t 2 \
+    -b 64 \
+    -V 128 \
+    -A 12 \
+    --shared
+    
+    make LIBTOOL=$$LIBTOOL
+    make install
+
+    popd
+
+windows : 
+	echo Not supported
+	if errorlevel 1 exit 1
+
diff --git a/calacs/calacs.ini b/calacs/calacs.ini
new file mode 100644
index 0000000..e8845dc
--- /dev/null
+++ b/calacs/calacs.ini
@@ -0,0 +1,46 @@
+[package]
+name : calacs
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}.git
+license : 
+summary : ${package:name}
+
+[source]
+#fn : ${package:name}-${package:version}.tar.gz
+#url : ${about:home}/${fn}
+git_url : ${about:home}
+#git_tag : 
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+    d2to1
+    numpy
+    pyfits
+    stsci.distutils
+    setuptools
+	python
+run : 
+    numpy
+    pyfits
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+	pip install --no-deps --upgrade --force d2to1
+	python setup.py install || exit 1
+windows : 
+	
+	python setup.py install
+	if errorlevel 1 exit 1
+
diff --git a/calcos/calcos.ini b/calcos/calcos.ini
new file mode 100644
index 0000000..bf9e215
--- /dev/null
+++ b/calcos/calcos.ini
@@ -0,0 +1,46 @@
+[package]
+name : calcos
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}.git
+license : 
+summary : ${package:name}
+
+[source]
+#fn : ${package:name}-${package:version}.tar.gz
+#url : ${about:home}/${fn}
+git_url : ${about:home}
+#git_tag : 
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+    d2to1
+    numpy
+    pyfits
+    stsci.distutils
+    setuptools
+	python
+run : 
+    numpy
+    pyfits
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+	pip install --no-deps --upgrade --force d2to1
+	python setup.py install || exit 1
+windows : 
+	
+	python setup.py install
+	if errorlevel 1 exit 1
+
diff --git a/costools/costools.ini b/costools/costools.ini
new file mode 100644
index 0000000..44fd79a
--- /dev/null
+++ b/costools/costools.ini
@@ -0,0 +1,44 @@
+[package]
+name: costools
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home: http://www.stsci.edu/institute/software_hardware
+license: BSD
+summary: ${package:name}
+
+[source]
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
+
+[build]
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build:
+    d2to1
+    stsci.distutils
+    astropy
+    calcos
+    stsci.tools
+    pyfits
+    python
+    setuptools
+run:
+    astropy
+    stsci.tools
+    setuptools
+    python
+
+[cbc_build]
+linux:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+    python setup.py install || exit 1
+
+windows:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install || exit 1
+    if errorlevel 1 exit 1
diff --git a/d2to1/d2to1.ini b/d2to1/d2to1.ini
index 37de38b..608518d 100644
--- a/d2to1/d2to1.ini
+++ b/d2to1/d2to1.ini
@@ -1,6 +1,6 @@
 [package]
 name: d2to1
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
diff --git a/drizzlepac/drizzlepac.ini b/drizzlepac/drizzlepac.ini
new file mode 100644
index 0000000..8a08606
--- /dev/null
+++ b/drizzlepac/drizzlepac.ini
@@ -0,0 +1,51 @@
+[package]
+name: drizzlepac
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
+license: BSD
+summary: ${package:name}
+
+[source]
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
+
+[build]
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build:
+    astropy
+    astrolib.coords
+    fitsblender
+    stwcs
+    stsci.distutils
+    stsci.imagestats
+    stsci.stimage
+    nictools
+    python
+    setuptools
+run:
+    astropy
+    astrolib.coords
+    fitsblender
+    stwcs
+    nictools
+    stsci.imagestats
+    stsci.stimage
+    setuptools
+    python
+
+[cbc_build]
+linux:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+    python setup.py install || exit 1
+
+windows:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install || exit 1
+    if errorlevel 1 exit 1
diff --git a/ds9/ds9.ini b/ds9/ds9.ini
new file mode 100644
index 0000000..449aa04
--- /dev/null
+++ b/ds9/ds9.ini
@@ -0,0 +1,45 @@
+[package]
+name : ds9
+version : 7.3.2
+
+[about]
+home : http://ds9.si.edu/download/source/
+license : GPL,LGPL,BSD
+summary : ${package:name}
+
+[source]
+fn : ${package:name}.${package:version}.tar.gz
+url : ${about:home}/${fn}
+
+[build]
+number : 0
+
+[requirements]
+build : 
+    gcc >=4.6 [osx]
+    #
+run : 
+	#
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    ln -s make.darwinmavericks make.include
+    sed -i -e '/^ZZ/ s/$$/ -arch x86_64/' \
+        -e '/^AA/ s/$$/ -arch x86_64/' make.include
+
+    sed -i -e '/CODESIGN =/c \
+        CODESIGN = echo' make.include
+
+    make LDFLAGS='-arch x86_64 -m64'
+    mkdir -p $$PREFIX/bin
+    cp -a bin/ds9* bin/x* $$PREFIX/bin
+windows : 
+    exit 1
+	if errorlevel 1 exit 1
+
diff --git a/fftw/fftw.ini b/fftw/fftw.ini
index d8a6595..f1454a1 100644
--- a/fftw/fftw.ini
+++ b/fftw/fftw.ini
@@ -16,7 +16,7 @@ number : 4
 
 [requirements]
 build :
-    #none
+    gcc >=4.6 [osx]
 run :
     pkgconfig
 
diff --git a/fitsblender/fitsblender.ini b/fitsblender/fitsblender.ini
new file mode 100644
index 0000000..a17d6d6
--- /dev/null
+++ b/fitsblender/fitsblender.ini
@@ -0,0 +1,46 @@
+[package]
+name : fitsblender
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : http://
+license : BSD
+summary : ${package:name}
+
+[source]
+git_url : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+	stsci.distutils
+	setuptools
+	python
+	d2to1
+run : 
+	
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+	#d2to1 hack active
+	pip install --no-deps --upgrade --force d2to1 || exit 1
+	    
+	python setup.py install || exit 1
+
+windows : 
+	# d2to1 hack active
+	pip install --no-deps --upgrade --force d2to1
+	if errorlevel 1 exit 1
+	    
+	python setup.py install
+	if errorlevel 1 exit 1
+
diff --git a/hstcal/hstcal.ini b/hstcal/hstcal.ini
new file mode 100644
index 0000000..a6d1232
--- /dev/null
+++ b/hstcal/hstcal.ini
@@ -0,0 +1,39 @@
+[package]
+name : hstcal
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}.git
+license : BSD
+summary : ${package:name}
+
+[source]
+#fn : ${package:name}-${package:version}.tar.gz
+#url : ${about:home}/${fn}
+git_url : ${about:home}
+#git_tag : 
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+    gcc >=4.6 [osx]
+run : 
+    #
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    ./configure --destdir=$$PREFIX
+    make
+    ./waf install
+
+windows : 
+    echo Not yet.
+    exit 1
diff --git a/imexam/imexam.ini b/imexam/imexam.ini
index 267e2c6..683a86b 100644
--- a/imexam/imexam.ini
+++ b/imexam/imexam.ini
@@ -21,8 +21,8 @@ build:
     d2to1
     nose
     astropy-helpers
-    astropy >=1.0
-    numpy >=1.6.0
+    astropy
+    numpy
     scipy
     cython
     matplotlib
@@ -35,8 +35,8 @@ run:
     d2to1
     nose
     astropy-helpers
-    astropy >=1.0
-    numpy >=1.6.0
+    astropy
+    numpy
     scipy
     cython
     matplotlib
diff --git a/imutils/imutils.ini b/imutils/imutils.ini
index b78fa2e..b329f59 100644
--- a/imutils/imutils.ini
+++ b/imutils/imutils.ini
@@ -1,6 +1,6 @@
 [package]
 name: imutils
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://github.com/spacetelescope/${package:name}
diff --git a/iraf-all/iraf.ini b/iraf-all/iraf.ini
new file mode 100644
index 0000000..b90e926
--- /dev/null
+++ b/iraf-all/iraf.ini
@@ -0,0 +1,126 @@
+[package]
+name: iraf
+version: 2.16.1
+
+[about]
+home: http://iraf.noao.edu
+license: MIT
+summary: NOAO Image Reduction and Analysis Facility
+
+[source]
+# Remember, always 32-bit! Now feast upon my tears.
+#fn: ${package:name}.lnux.x86.fixup.tar.gz
+#url: ${cbc_cgi:url}/${fn}
+git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-combined
+
+
+[build]
+number: 1
+#detect_binary_files_with_prefix: True
+
+[requirements]
+build:
+    # Luck
+    purge_path
+run:
+    purge_path
+    # Gallant effort
+
+[cbc_build]
+linux:
+    set -x
+    #always 32-bit... always
+    export IRAFARCH=''
+    export target=`uname`.32
+    case "$$target" in
+        Linux.32)
+            export IRAFARCH='linux'
+            export CFLAGS="-m32" 
+            export LDFLAGS="-m32" 
+        ;;
+        Darwin.32)
+            export IRAFARCH='macosx'
+            export CFLAGS="-m32 -arch i386" 
+            export LDFLAGS="-m32 -arch i386" 
+            ( cd vendor/x11iraf && ln -sf bin.macintel bin.macosx )
+            ( cd vendor/x11iraf && ln -sf lib.macintel lib.macosx )
+        ;;
+        *)
+            echo "UNSUPPORTED ARCHITECTURE (64-bit disabled, by the way...)"
+            exit 1
+        ;;
+    esac
+    
+    echo "Purging non-architecture files from distribution:"
+    find \( -name "bin.*" \( -not -name "bin.$$IRAFARCH" \) -and \( -not -name "bin.generic" \) -and -not -path "*vendor/x11iraf/*" \) | xargs -n1 -I{} rm -rf "{}"
+
+    export TERM=xterm
+    export PATH=`purge_path /sw`
+    export iraf=$$PREFIX/iraf/
+    export FAKEHOME=$$PREFIX/iraf-runtime
+
+    mkdir -p $$iraf
+    mkdir -p $$FAKEHOME/{bin,cache,imdir}
+    rsync -aH `pwd`/ $$iraf
+    cd $$iraf
+
+    yes '' | ./install_not_broken \
+                --bindir $$FAKEHOME/bin \
+                --cache $$FAKEHOME/cache \
+                --imdir $$FAKEHOME/imdir \
+                --root $$iraf \
+                --mach macosx
+
+    find . -lname '/iraf/iraf/*' \
+        -exec sh -c 'echo Re-linking "$$0" ;\
+        ln -snf "$$(readlink "$$0" \
+        | sed -e "s|/iraf/iraf|../..|" -e "s|/as/|/as.$$IRAFARCH/|")" "$$0"' {} \;
+
+    gzip -9 unix/bin.macosx/sgi2ueps.e
+    rm -f unix/bin.macosx/sgi2ueps.e
+
+    gzip -9 unix/bin.macosx/sgi2uapl.e
+    rm -f unix/bin.macosx/sgi2uapl.e
+
+    mkdir -p $$PREFIX/etc/conda/{activate.d,deactivate.d}
+
+    echo "
+    export iraf=$$PREFIX/iraf/
+    export iraf_runtime=$$PREFIX/iraf-runtime
+    export IRAFARCH=$$IRAFARCH
+    source \$$iraf/unix/hlib/irafuser.sh
+    export PATH="\$$iraf_runtime/bin:\$$iraf/bin.\$$IRAFARCH:\$$PATH"
+    " > $$PREFIX/etc/conda/activate.d/iraf.sh
+
+    echo '
+    export PATH=`purge_path iraf-runtime`
+    export PATH=`purge_path $$iraf/bin.$$IRAFARCH:$$PATH`
+    unset iraf
+    unset iraf_runtime
+    unset IRAFARCH
+    unset IMTOOLRC
+    unset F2C
+    unset F77
+    unset HSI_LIBS
+    unset hbin
+    unset hlib
+    unset host
+    unset CC
+    unset CC_f2c
+    unset HSI_CF
+    unset HSI_F77LIBS
+    unset HSI_FF
+    unset HSI_LF
+    unset HSI_LFLAGS
+    unset HSI_OSLIBS
+    unset HSI_XF
+    unset MACH
+    unset OS_MACH
+    unset RANLIB
+    unset hostid
+    unset tmp
+    unset GVBINDIR
+    ' > $$PREFIX/etc/conda/deactivate.d/iraf.sh
+
+windows:
+    echo Not supported on Windows
diff --git a/iraf-src/iraf.ini b/iraf-src/iraf.ini
new file mode 100644
index 0000000..7a14ccb
--- /dev/null
+++ b/iraf-src/iraf.ini
@@ -0,0 +1,116 @@
+[package]
+name: iraf
+version: 2.16.1
+
+[about]
+home: http://iraf.noao.edu
+license: MIT
+summary: NOAO Image Reduction and Analysis Facility
+
+[source]
+# Remember, always 32-bit! Now feast upon my tears.
+#fn: ${package:name}.lnux.x86.fixup.tar.gz
+#url: ${cbc_cgi:url}/${fn}
+git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-src
+
+# Tarball should be generated with:
+# git archive --format tar.gz --prefix iraf/ -o ../iraf.lnux.x86.fixup.tar.gz -v master
+
+[build]
+number: 1
+#detect_binary_files_with_prefix: True
+
+[requirements]
+build:
+    # Luck
+run:
+    # Gallant effort
+
+[cbc_build]
+linux:
+    export TERM=xterm
+    export iraf=$$PREFIX/iraf/
+    export IRAFARCH=macosx
+
+    cp -a `pwd` $$PREFIX/iraf
+    cd $$PREFIX/iraf
+
+    export FAKEHOME=$$PREFIX/iraf/fakehome
+    mkdir -p $$FAKEHOME
+    
+    ./install \
+        --accept-defaults \
+        --fakehome $$FAKEHOME \
+        --term xterm \
+        --mach $$IRAFARCH \
+        --bindir $$FAKEHOME/bin \
+        --cache $$FAKEHOME/cache \
+        --imdir $$FAKEHOME/imdir \
+        --no-errors
+
+	sed -i -e "s|exit|return|g" unix/hlib/irafuser.*
+	source unix/hlib/irafuser.sh
+	# Fix me? why did i unset it?
+    export FAKEHOME=$$PREFIX/iraf/fakehome
+	
+    mkdir -p bin.generic
+	mkdir -p bin.$$IRAFARCH
+
+    find . -lname '/iraf/iraf/*' \
+        -exec sh -c 'ln -snf \
+        "$$(readlink "$$0" \
+        | sed -e "s|/iraf/iraf|../..|" -e "s|/as/|/as.$$IRAFARCH/|")" "$$0"' {} \;
+
+    find "$$iraf" -type f \
+        \( -name "*.c" \
+        -o -name "*.f" \
+        -o -name "*.h" \
+        -o -name "*.x" \
+        -o -name "*.sh*" \
+        -o -name "*.csh*" \
+        -o -name "*akefile*" \
+        -o -name "*mkpkg*" \
+        -o -name "*mklibs*" \
+        -o -name "*mkbase*" \
+        -o -name "*zzsetenv.def*" \
+        -o -name "*install*" \) \
+        -exec sed -i -e "s|/iraf/iraf|$$PREFIX/iraf|g" '{}' \;
+
+    export CFLAGS="-arch i386 -m32 -I$$FAKEHOME/ -I $$iraf/include -I$$iraf/bin"
+    export LDFLAGS="-arch i386"
+
+	mkdir -p override
+	ln -sf /usr/bin/libtool override/
+	ln -sf /usr/bin/ranlib override/
+	export PATH=$$iraf/override:$$PATH
+
+    rm -rf include
+    mkdir -p include
+    
+    #ln -s ../unix/hlib/libc/iraf.h $$FAKEHOME/
+    ln -s ../unix/hlib/libc/iraf.h $$iraf/include/
+    ln -s ../unix/bin/f2c.h $$iraf/include/
+    cp $$iraf/unix/hlib/libc/vosproto.h $$iraf/include/
+    cp $$iraf/unix/boot/xyacc/yaccpar.x $$iraf/include/
+    mkdir -p $$iraf/include/curl && touch $$iraf/include/curl/types.h
+    
+    touch $$iraf/extern/.zzsetenv.def
+    
+    echo '$$set XFLAGS  = "$$(XFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"'  >> unix/hlib/mkpkg.inc
+    echo '$$set XVFLAGS = "$$(XVFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc
+    echo '$$set LFLAGS  = "$$(LFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include" -/L$$(iraf)bin -/$$(iraf)bin.$$(IRAFARCH)' >> unix/hlib/mkpkg.inc
+
+    ( cd unix/f2c/src && \
+        make -f makefile.u CFLAGS="$$CFLAGS" LDFLAGS="$$LDFLAGS" && \
+        cp f2c $$iraf/unix/bin.$$IRAFARCH/f2c.e )
+    
+    ( cd unix/f2c/libf2c && \
+        make -f makefile.u CFLAGS="$$CFLAGS" LDFLAGS="$$LDFLAGS" && \
+        cp f2c.h libf2c.a $$iraf/unix/bin.$$IRAFARCH/ )
+    
+	( make $$IRAFARCH && \
+        util/mksysgen )
+
+windows:
+    echo Not supported on Windows
+
diff --git a/iraf-stsci/iraf.ini b/iraf-stsci/iraf.ini
new file mode 100644
index 0000000..2ca77b5
--- /dev/null
+++ b/iraf-stsci/iraf.ini
@@ -0,0 +1,53 @@
+[package]
+name: iraf
+version: 2.16.1
+
+[about]
+home: http://iraf.noao.edu
+license: MIT
+summary: NOAO Image Reduction and Analysis Facility
+
+[source]
+# Remember, always 32-bit! Now feast upon my tears.
+#fn: ${package:name}.lnux.x86.fixup.tar.gz
+#url: ${cbc_cgi:url}/${fn}
+git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-stsci
+
+[build]
+number: 1
+detect_binary_files_with_prefix: True
+
+[requirements]
+build:
+    # Luck
+    gcc
+run:
+    # Gallant effort
+
+[cbc_build]
+linux:
+    export TERM=xterm
+    export PATH=`purge_path /sw`
+    export FAKEHOME=$$PREFIX/iraf/fakehome
+    export IRAFARCH=macosx
+    export CFLAGS="-m32 -arch i386" 
+    export LDFLAGS="-m32 -arch i386" 
+    cp -a `pwd` $$PREFIX/iraf
+    cd $$PREFIX/iraf
+    #mkdir override_sysutil
+    #( cd override_sysutil \
+    #    && ln -s /usr/bin/libtool \
+    #    && ln -s /usr/bin/ranlib \
+    #    && ln -s /usr/bin/ld )
+    #export PATH=`pwd`/override_sysutil:$$PATH
+
+    mkdir sm_logs
+    export sm_logs=`pwd`/sm_logs
+
+    mkdir -p $$FAKEHOME/cache
+    export SHELL=/bin/tcsh
+    ./build
+    export SHELL=/bin/bash
+
+windows:
+    echo Not supported on Windows
diff --git a/jwst_lib/jwst_lib.ini b/jwst_lib/jwst_lib.ini
new file mode 100644
index 0000000..fa682f2
--- /dev/null
+++ b/jwst_lib/jwst_lib.ini
@@ -0,0 +1,77 @@
+[package]
+name : jwst_lib 
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+license : BSD
+summary : ${package:name}
+
+[source]
+#fn : ${package:name}-${package:version}.tar.gz
+#url : ${about:home}/${fn}
+git_url : ${about:home}
+#git_tag : 
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+preserve_egg_dir: True
+
+[requirements]
+build : 
+    d2to1
+    astropy
+    stsci.distutils
+    numpy
+	setuptools
+	python
+run : 
+    astropy
+    stsci.distutils
+    numpy
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    function get_py_version() {
+        python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' 
+    }
+    export -f get_py_version
+
+    function set_py3k() {
+        version=`get_py_version`
+        major=`echo $$version | cut -d '.' -f 1`
+        minor=`echo $$version | cut -d '.' -f 2`
+        hotfix=`echo $$version | cut -d '.' -f 3`
+        if (( major > 2 )); then
+            export PY3K=1
+        else
+            export PY3K=0
+        fi
+    }
+    export -f set_py3k
+
+    set_py3k
+
+
+    pip install --no-deps --force --upgrade d2to1
+    for d in *
+    do
+        if [ $$PY3K -ne 0 ] ; then
+            ( cd $$d && 2to3 -w . )
+        fi
+	    ( cd $$d && python setup.py install || exit 1 )
+    done
+
+windows : 
+    echo "Unsupported (yet?)"
+	#python setup.py install
+    #2to3 -w .
+	#if errorlevel 1 exit 1
+
diff --git a/nictools/nictools.ini b/nictools/nictools.ini
new file mode 100644
index 0000000..2acb4e6
--- /dev/null
+++ b/nictools/nictools.ini
@@ -0,0 +1,49 @@
+[package]
+name : nictools
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+license : 
+summary : ${package:name}
+
+[source]
+git_url : ${about:home}
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+    astropy
+	stsci.distutils
+    stsci.ndimage
+    stsci.convolve
+    stsci.tools
+    numpy
+	setuptools
+	python
+run : 
+	astropy
+    stsci.ndimage
+    stsci.convolve
+    stsci.tools
+    numpy
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+	pip install --no-deps --upgrade --force d2to1
+	python setup.py install || exit 1
+
+windows : 
+	python setup.py install
+    2to3 -w .
+	if errorlevel 1 exit 1
+
diff --git a/photutils/photutils.ini b/photutils/photutils.ini
index 4c4b1ff..7fcfc73 100644
--- a/photutils/photutils.ini
+++ b/photutils/photutils.ini
@@ -1,6 +1,6 @@
 [package]
 name: photutils
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://github.com/astropy/${package:name}
diff --git a/poppy/poppy.ini b/poppy/poppy.ini
index 06a1730..185c394 100644
--- a/poppy/poppy.ini
+++ b/poppy/poppy.ini
@@ -1,6 +1,6 @@
 [package]
 name: poppy
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://github.com/mperrin/${package:name}
diff --git a/purge_path/purge_path.ini b/purge_path/purge_path.ini
new file mode 100644
index 0000000..d70a17a
--- /dev/null
+++ b/purge_path/purge_path.ini
@@ -0,0 +1,31 @@
+[package]
+name: purge_path
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home: http://bitbucket.org/jhunkeler/${package:name}
+license: GPL
+summary: ${package:name} a small PATH manipulator
+
+[source]
+git_url: https://bitbucket.org/jhunkeler/${package:name}.git
+
+[build]
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build:
+    python
+    setuptools
+run:
+    python
+
+
+[cbc_build]
+linux:
+    python setup.py install || exit 1
+
+windows:
+    python setup.py install
+    if errorlevel 1 exit 1
+
diff --git a/pyasdf/pyasdf.ini b/pyasdf/pyasdf.ini
index d822b40..446ffb9 100644
--- a/pyasdf/pyasdf.ini
+++ b/pyasdf/pyasdf.ini
@@ -19,6 +19,8 @@ build:
     astropy
     pyyaml
     jsonschema
+    pytest
+    six
     setuptools
     python
 
@@ -27,6 +29,7 @@ run:
     astropy
     pyyaml
     jsonschema
+    six [py27]
     setuptools
     python
 
diff --git a/pydrizzle/pydrizzle.ini b/pydrizzle/pydrizzle.ini
index fe5b556..46cd116 100644
--- a/pydrizzle/pydrizzle.ini
+++ b/pydrizzle/pydrizzle.ini
@@ -1,6 +1,6 @@
 [package]
 name: pydrizzle
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
@@ -21,6 +21,8 @@ build:
     astropy >=1.0
     numpy >=1.6.0
     stsci.distutils
+    stsci.tools
+    pyfits
     setuptools
     python
 
@@ -29,12 +31,39 @@ run:
     astropy-helpers
     astropy >=1.0
     numpy >=1.6.0
+    stsci.tools
+    pyfits
     python
 
 [cbc_build]
 linux:
+    function get_py_version() {
+        python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' 
+    }
+    export -f get_py_version
+
+    function set_py3k() {
+        version=`get_py_version`
+        major=`echo $$version | cut -d '.' -f 1`
+        minor=`echo $$version | cut -d '.' -f 2`
+        hotfix=`echo $$version | cut -d '.' -f 3`
+        if (( major > 2 )); then
+            export PY3K=1
+        else
+            export PY3K=0
+        fi
+    }
+    export -f set_py3k
+
+    set_py3k
+
+    if [ $$PY3K -ne 0 ]; then
+        sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg
+    fi
+    
     echo This d2to1 hack is deadly.
     pip install --no-deps --upgrade --force d2to1 || exit 1
+
     python setup.py install || exit 1
 
 windows:
diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini
index bf6afd4..3139f13 100644
--- a/pyfftw/pyfftw.ini
+++ b/pyfftw/pyfftw.ini
@@ -17,15 +17,15 @@ number : 1
 
 [requirements]
 build :
-    numpy
+    numpy >=1.9
     fftw
     cython
 	setuptools
 	python
 run :
-	numpy
+    numpy >=1.9
     fftw
-	python
+    python
 
 [cbc_build]
 linux :
@@ -33,6 +33,7 @@ linux :
     export LDFLAGS="`pkg-config --libs fftw3`"
 	python setup.py install || exit 1
 windows :
-	python setup.py install
-	if errorlevel 1 exit 1
+    # You're on your own with the libraries, it seems.
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/pyfits/pyfits.ini b/pyfits/pyfits.ini
index 27a0b59..fac2058 100644
--- a/pyfits/pyfits.ini
+++ b/pyfits/pyfits.ini
@@ -1,6 +1,6 @@
 [package]
 name: pyfits
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -15,6 +15,7 @@ patches:
 
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+preserve_egg_dir: True
 
 [requirements]
 build:
diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini
index 792e827..904ac5f 100644
--- a/pysynphot/pysynphot.ini
+++ b/pysynphot/pysynphot.ini
@@ -1,6 +1,6 @@
 [package]
 name: pysynphot
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: ssh://git@bitbucket.org/stsci_ssb/${package:name}
@@ -9,9 +9,11 @@ summary: ${package:name}
 
 [source]
 git_url: ${about:home}
-git_tag:
+#git_tag:
+
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+preserve_egg_dir: yes
 
 [requirements]
 build:
@@ -37,13 +39,12 @@ run:
     pyfits
     numpy
     matplotlib
-    setuptools
     python
 
 [cbc_build]
 linux:
     echo This d2to1 hack is deadly.
-    #pip install --no-deps --upgrade --force d2to1 || exit 1
+    pip install --no-deps --upgrade --force d2to1 || exit 1
     python setup.py install || exit 1
 
 windows:
diff --git a/reftools/reftools.ini b/reftools/reftools.ini
index 6245c19..0b3ef60 100644
--- a/reftools/reftools.ini
+++ b/reftools/reftools.ini
@@ -1,6 +1,6 @@
 [package]
 name: reftools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
@@ -12,21 +12,32 @@ git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}.git
 
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+preserve_egg_dir: yes
 
 [requirements]
 build:
     d2to1
     stsci.distutils
+    stsci.ndimage
+    stsci.imagestats
     stsci.tools
     pywcs
+    pysynphot
+    stwcs
+    calcos
     numpy
     setuptools
     python
 run:
     d2to1
     stsci.distutils
+    stsci.ndimage
+    stsci.imagestats
     stsci.tools
     pywcs
+    pysynphot
+    stwcs
+    calcos
     numpy
     python
 
diff --git a/sextractor/sextractor-generic.ini b/sextractor/sextractor-generic.ini
new file mode 100644
index 0000000..b85bf8f
--- /dev/null
+++ b/sextractor/sextractor-generic.ini
@@ -0,0 +1,42 @@
+[package]
+name : sextractor-generic
+version : 2.19.5
+
+[about]
+# Manual assignment, because package:name differs
+home : http://www.astromatic.net/download/sextractor
+license : GPL
+summary : ${package:name}
+
+[source]
+fn : sextractor-${package:version}.tar.gz
+url : ${about:home}/${fn}
+
+[build]
+number : 0
+
+[requirements]
+build :
+    #gcc >=4.6 [darwin]
+    fftw
+    pkgconfig
+    atlas-generic
+    
+run :
+    fftw
+    atlas-generic
+    #none
+
+[cbc_build]
+linux :
+    ./configure --prefix=$$PREFIX \
+    --with-fftw-libdir=$$PREFIX/lib \
+    --with-fftw-incdir=$$PREFIX/include \
+    --with-atlas-libdir=$$PREFIX/lib \
+    --with-atlas-incdir=$$PREFIX/include
+    make -j $${CPU_COUNT}
+    make install
+windows :
+    echo Unsupported
+
+
diff --git a/sextractor/sextractor.ini b/sextractor/sextractor.ini
new file mode 100644
index 0000000..30918e3
--- /dev/null
+++ b/sextractor/sextractor.ini
@@ -0,0 +1,39 @@
+[package]
+name : sextractor
+version : 2.19.5
+
+[about]
+home : http://www.astromatic.net/download/${package:name}
+license : GPL
+summary : ${package:name}
+
+[source]
+fn : ${package:name}-${package:version}.tar.gz
+url : ${about:home}/${fn}
+
+[build]
+number : 0
+
+[requirements]
+build :
+    #gcc >=4.6 [darwin]
+    fftw
+    pkgconfig
+    
+run :
+    fftw
+    #none
+
+[cbc_build]
+linux :
+    ./configure --prefix=$$PREFIX \
+    --with-fftw-libdir=$$PREFIX/lib \
+    --with-fftw-incdir=$$PREFIX/include \
+    --with-atlas-libdir='/usr/local/atlas/lib' \
+    --with-atlas-incdir='/usr/local/atlas/include'
+    make -j $${CPU_COUNT}
+    make install
+windows :
+    echo Unsupported
+
+
diff --git a/stistools/stistools.ini b/stistools/stistools.ini
index 32b40b4..42470be 100644
--- a/stistools/stistools.ini
+++ b/stistools/stistools.ini
@@ -1,6 +1,6 @@
 [package]
 name: stistools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
diff --git a/stsci-hst/stsci-hst.ini b/stsci-hst/stsci-hst.ini
new file mode 100644
index 0000000..f2a5183
--- /dev/null
+++ b/stsci-hst/stsci-hst.ini
@@ -0,0 +1,101 @@
+[package]
+name : stsci-hst
+version : 1.0
+
+[about]
+home : http://www.stsci.edu
+license : BSD
+summary : ${package:name} meta-package
+
+[source]
+#fn : ${package:name}-${package:version}.tar.gz
+#url : ${about:home}/${fn}
+
+[build]
+number : 0
+
+[requirements]
+build : 
+    ${requirements:run}
+run : 
+    # Extra
+    purge_path [py34]
+    purge_path [py27]
+    # HST
+    acstools [py34]
+    acstools [py27]
+    astrolib.coords [py34]
+    astrolib.coords [py27]
+    # pyfits MUST come before astropy... dependency nightmare
+    pyfits [py34]
+    pyfits [py27]
+    # astropy MUST come after pyfits... see also pyfits
+    astropy [py34]
+    astropy [py27]
+    calcos [py34]
+    calcos [py27]
+    costools [py34]
+    costools [py27]
+    d2to1 [py34]
+    d2to1 [py27]
+    fitsblender [py34]
+    fitsblender [py27]
+    hstcal [py34]
+    hstcal [py27]
+    nictools [py34]
+    nictools [py27]
+    pysynphot [py34]
+    pysynphot [py27]
+    pywcs [py34]
+    pywcs [py27]
+    reftools [py34]
+    reftools [py27]
+    stistools [py34]
+    stistools [py27]
+    stsci.convolve [py34]
+    stsci.convolve [py27]
+    stsci.distutils [py34]
+    stsci.distutils [py27]
+    stsci.image [py34]
+    stsci.image [py27]
+    stsci.imagemanip [py34]
+    stsci.imagemanip [py27]
+    stsci.imagestats [py34]
+    stsci.imagestats [py27]
+    stsci.ndimage [py34]
+    stsci.ndimage [py27]
+    stsci.sphinxext [py34]
+    stsci.sphinxext [py27]
+    stsci.stimage [py34]
+    stsci.stimage [py27]
+    stsci.skypac [py34]
+    stsci.skypac [py27]
+    stsci.tools [py34]
+    stsci.tools [py27]
+    stwcs [py34]
+    stwcs [py27]
+    wfpc2tools [py34]
+    wfpc2tools [py27]
+    wfc3tools [py34]
+    wfc3tools [py27]
+    
+    #Standard
+    anaconda [py34]
+    anaconda [py27]
+    numpy [py34]
+    numpy [py27]
+    python [py34]
+    python [py27]
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    echo "meta-package"
+
+windows : 
+    echo "meta-package"
diff --git a/stsci.convolve/stsci.convolve.ini b/stsci.convolve/stsci.convolve.ini
index bda143d..2f29e76 100644
--- a/stsci.convolve/stsci.convolve.ini
+++ b/stsci.convolve/stsci.convolve.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.convolve
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
diff --git a/stsci.distutils/stsci.distutils.ini b/stsci.distutils/stsci.distutils.ini
index 7bc3bf9..ca8b41c 100644
--- a/stsci.distutils/stsci.distutils.ini
+++ b/stsci.distutils/stsci.distutils.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.distutils
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
diff --git a/stsci.image/stsci.image.ini b/stsci.image/stsci.image.ini
index b8406bc..ddf27e6 100644
--- a/stsci.image/stsci.image.ini
+++ b/stsci.image/stsci.image.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.image
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
diff --git a/stsci.imagemanip/stsci.imagemanip.ini b/stsci.imagemanip/stsci.imagemanip.ini
index 33825d1..25595cc 100644
--- a/stsci.imagemanip/stsci.imagemanip.ini
+++ b/stsci.imagemanip/stsci.imagemanip.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.imagemanip
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
diff --git a/stsci.imagestats/stsci.imagestats.ini b/stsci.imagestats/stsci.imagestats.ini
index d119de7..0cda9e0 100644
--- a/stsci.imagestats/stsci.imagestats.ini
+++ b/stsci.imagestats/stsci.imagestats.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.imagestats
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
diff --git a/stsci.ndimage/stsci.ndimage.ini b/stsci.ndimage/stsci.ndimage.ini
index bb73792..220665d 100644
--- a/stsci.ndimage/stsci.ndimage.ini
+++ b/stsci.ndimage/stsci.ndimage.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.ndimage
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
diff --git a/stsci.numdisplay/stsci.numdisplay.ini b/stsci.numdisplay/stsci.numdisplay.ini
index 675d1a7..0e1991b 100644
--- a/stsci.numdisplay/stsci.numdisplay.ini
+++ b/stsci.numdisplay/stsci.numdisplay.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.numdisplay
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
diff --git a/stsci.skypac/stsci.skypac.ini b/stsci.skypac/stsci.skypac.ini
new file mode 100644
index 0000000..f52c5a9
--- /dev/null
+++ b/stsci.skypac/stsci.skypac.ini
@@ -0,0 +1,70 @@
+[package]
+name : stsci.skypac
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+license : BSD
+summary : ${package:name}
+
+[source]
+#fn : ${package:name}-${package:version}.tar.gz
+#url : ${about:home}/${fn}
+git_url : ${about:home}
+#git_tag : 
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+preserve_egg_dir: yes
+
+[requirements]
+build : 
+	stsci.distutils
+    stsci.sphere
+	setuptools
+	python
+run : 
+    stsci.sphere
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    function get_py_version() {
+        python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' 
+    }
+    export -f get_py_version
+
+    function set_py3k() {
+        version=`get_py_version`
+        major=`echo $$version | cut -d '.' -f 1`
+        minor=`echo $$version | cut -d '.' -f 2`
+        hotfix=`echo $$version | cut -d '.' -f 3`
+        if (( major > 2 )); then
+            export PY3K=1
+        else
+            export PY3K=0
+        fi
+    }
+    export -f set_py3k
+
+    set_py3k
+
+
+	pip install --no-deps --upgrade --force d2to1
+    if [ $$PY3K -ne 0 ] ; then
+        sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg 
+        2to3 -w .
+    fi
+	python setup.py install || exit 1
+
+windows : 
+	python setup.py install
+    2to3 -w .
+	if errorlevel 1 exit 1
+
diff --git a/stsci.sphere/stsci.sphere.ini b/stsci.sphere/stsci.sphere.ini
new file mode 100644
index 0000000..9a006c6
--- /dev/null
+++ b/stsci.sphere/stsci.sphere.ini
@@ -0,0 +1,45 @@
+[package]
+name: stsci.sphere
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home: http://www.stsci.edu/institute/software_hardware
+license: GPL
+summary: ${package:name}
+
+[source]
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
+
+[build]
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+# Namespace package workaround
+preserve_egg_dir: no
+
+[requirements]
+build:
+    d2to1
+    setuptools
+    stsci.distutils
+    numpy
+    python
+
+run:
+    d2to1
+    #pyfits
+    numpy
+    python
+
+
+[cbc_build]
+linux:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+    python setup.py install || exit 1
+
+windows:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
+    if errorlevel 1 exit 1
diff --git a/stsci.stimage/stsci.stimage.ini b/stsci.stimage/stsci.stimage.ini
index 49576ba..f73a22c 100644
--- a/stsci.stimage/stsci.stimage.ini
+++ b/stsci.stimage/stsci.stimage.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.stimage
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -13,7 +13,7 @@ git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
-#preserve_egg_dir: yes
+preserve_egg_dir: yes
 
 [requirements]
 build:
diff --git a/stsci.tools/stsci.tools.ini b/stsci.tools/stsci.tools.ini
index 943f053..1d17051 100644
--- a/stsci.tools/stsci.tools.ini
+++ b/stsci.tools/stsci.tools.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.tools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
diff --git a/stsci/stsci.ini b/stsci/stsci.ini
new file mode 100644
index 0000000..4ef1958
--- /dev/null
+++ b/stsci/stsci.ini
@@ -0,0 +1,126 @@
+[package]
+name : stsci
+version : 1.5
+
+[about]
+home : http://stsci.edu
+license : BSD
+summary : ${package:name} meta-package
+
+[source]
+#fn : ${package:name}-${package:version}.tar.gz
+#url : ${about:home}/${fn}
+
+[build]
+number : 0
+
+[requirements]
+build : 
+    ${requirements:run}
+run : 
+    #STScI
+    acstools [py34]
+    acstools [py27]
+    asdf-standard [py34]
+    asdf-standard [py27]
+    astrolib.coords [py34]
+    astrolib.coords [py27]
+    astropy [py34]
+    astropy [py27]
+    astropy-helpers [py34]
+    astropy-helpers [py27]
+    calcos [py34]
+    calcos [py27]
+    cfitsio
+    d2to1 [py34]
+    d2to1 [py27]
+    #drizzle [py34]
+    drizzle [py27]
+    ds9
+    fftw
+    fitsblender [py34]
+    fitsblender [py27]
+    hstcal [py34]
+    hstcal [py27]
+    htc_utils [py34]
+    htc_utils [py27]
+    imexam [py34]
+    imexam [py27]
+    nictools [py34]
+    nictools [py27]
+    photutils [py34]
+    photutils [py27]
+    poppy [py34]
+    poppy [py27]
+    purge_path [py34]
+    purge_path [py27]
+    pyasdf [py34]
+    pyasdf [py27]
+    pydrizzle [py34]
+    pydrizzle [py27]
+    pyfftw [py34]
+    pyfftw [py27]
+    pyfits [py34]
+    pyfits [py27]
+    #pyqtgraph #issues with building
+    #pysynphot [py34]
+    pysynphot [py27]
+    pywcs [py34]
+    pywcs [py27]
+    #reftools [py34]
+    reftools [py27]
+    stistools [py34]
+    stistools [py27]
+    stsci.convolve [py34]
+    stsci.convolve [py27]
+    stsci.distutils [py34]
+    stsci.distutils [py27]
+    stsci.image [py34]
+    stsci.image [py27]
+    stsci.imagemanip [py34]
+    stsci.imagemanip [py27]
+    stsci.imagestats [py34]
+    stsci.imagestats [py27]
+    stsci.ndimage [py34]
+    stsci.ndimage [py27]
+    stsci.sphinxext [py34]
+    stsci.sphinxext [py27]
+    stsci.stimage [py34]
+    stsci.stimage [py27]
+    stsci.tools [py34]
+    stsci.tools [py27]
+    stwcs [py34]
+    stwcs [py27]
+    
+    webbpsf [py34]
+    webbpsf [py27]
+    wfpc2tools [py34]
+    wfpc2tools [py27]
+    wfc3tools [py34]
+    wfc3tools [py27]
+    
+
+    #3rd-party
+    atlas-generic
+    sextractor-generic
+
+    #Standard
+    anaconda [py34]
+    anaconda [py27]
+    numpy [py34]
+    numpy [py27]
+    python [py34]
+    python [py27]
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    echo "meta-package"
+
+windows : 
+    echo "meta-package"
diff --git a/stwcs/stwcs.ini b/stwcs/stwcs.ini
new file mode 100644
index 0000000..a217b43
--- /dev/null
+++ b/stwcs/stwcs.ini
@@ -0,0 +1,72 @@
+[package]
+name : stwcs
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+license : BSD
+summary : ${package:name}
+
+[source]
+#fn : ${package:name}-${package:version}.tar.gz
+#url : ${about:home}/${fn}
+git_url : ${about:home}
+#git_tag : 
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+    astropy
+    astropy-helpers
+	stsci.distutils
+    stsci.tools
+	setuptools
+	python
+run : 
+	astropy
+    stsci.tools
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    function get_py_version() {
+        python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' 
+    }
+    export -f get_py_version
+
+    function set_py3k() {
+        version=`get_py_version`
+        major=`echo $$version | cut -d '.' -f 1`
+        minor=`echo $$version | cut -d '.' -f 2`
+        hotfix=`echo $$version | cut -d '.' -f 3`
+        if (( major > 2 )); then
+            export PY3K=1
+        else
+            export PY3K=0
+        fi
+    }
+    export -f set_py3k
+
+    set_py3k
+
+
+	pip install --no-deps --upgrade --force d2to1
+    if [ $$PY3K -ne 0 ] ; then
+        sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg 
+        2to3 -w .
+    fi
+	python setup.py install || exit 1
+
+windows : 
+	python setup.py install
+    2to3 -w .
+	if errorlevel 1 exit 1
+
diff --git a/webbpsf-data/webbpsf.ini b/webbpsf-data/webbpsf.ini
new file mode 100644
index 0000000..e830c7b
--- /dev/null
+++ b/webbpsf-data/webbpsf.ini
@@ -0,0 +1,41 @@
+[package]
+name: webbpsf-data
+version: 0.3.3
+
+[about]
+home: http://www.stsci.edu/~mperrin/software/webbpsf
+license: BSD
+summary: ${package:name} data files
+
+[source]
+fn: ${package:name}-${package:version}.tar.gz
+url: ${about:home}/${fn}
+
+[build]
+number: 0
+
+[requirements]
+build:
+    #none
+    
+run:
+    webbpsf
+
+[cbc_build]
+linux:
+    mkdir -p $$PREFIX/share
+    mkdir -p $$PREFIX/etc/conda/activate.d
+    mkdir -p $$PREFIX/etc/conda/deactivate.d
+    cp -a `pwd` $$PREFIX/share/${package:name}
+
+    echo "
+    export WEBBPSF_PATH=$$PREFIX/share/${package:name}
+    " > $$PREFIX/etc/conda/activate.d/${package:name}.sh
+
+    echo "
+    unset WEBBPSF_PATH
+    " > $$PREFIX/etc/conda/deactivate.d/${package:name}.sh
+
+windows:
+    echo "Not supported (yet?)"
+    exit 1
diff --git a/webbpsf/webbpsf.ini b/webbpsf/webbpsf.ini
index 64969ac..2d3a839 100644
--- a/webbpsf/webbpsf.ini
+++ b/webbpsf/webbpsf.ini
@@ -1,6 +1,6 @@
 [package]
 name: webbpsf
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://github.com/mperrin/${package:name}
@@ -8,13 +8,11 @@ license: BSD
 summary: ${package:name}
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
-#git_tag:
 
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+preserve_egg_dir: True
 
 [requirements]
 build:
@@ -37,6 +35,7 @@ run:
     matplotlib
     poppy
     six [py27]
+    webbpsf-data
     setuptools
     python
 
diff --git a/wfc3tools/wfc3tools.ini b/wfc3tools/wfc3tools.ini
new file mode 100644
index 0000000..ac16558
--- /dev/null
+++ b/wfc3tools/wfc3tools.ini
@@ -0,0 +1,49 @@
+[package]
+name : wfc3tools
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : http://
+license : BSD
+summary : ${package:name}
+
+[source]
+git_url : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+	d2to1
+	stsci.distutils
+	stsci.tools
+    pyfits
+	setuptools
+	python
+run : 
+	stsci.tools
+    pyfits
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+	#d2to1 hack active
+	pip install --no-deps --upgrade --force d2to1 || exit 1
+	    
+	python setup.py install || exit 1
+
+windows : 
+	# d2to1 hack active
+	pip install --no-deps --upgrade --force d2to1
+	if errorlevel 1 exit 1
+	    
+	python setup.py install
+	if errorlevel 1 exit 1
+
diff --git a/wfpc2tools/wfpc2tools.ini b/wfpc2tools/wfpc2tools.ini
new file mode 100644
index 0000000..512212f
--- /dev/null
+++ b/wfpc2tools/wfpc2tools.ini
@@ -0,0 +1,79 @@
+[package]
+name : wfpc2tools
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : http://
+license : BSD
+summary : ${package:name}
+
+[source]
+git_url : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+	d2to1
+	stsci.distutils
+    stsci.imagestats
+    stsci.ndimage
+	stsci.tools
+    pyfits
+	setuptools
+	python
+run : 
+    stsci.imagestats
+    stsci.ndimage
+	stsci.tools
+    pyfits
+	python
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    function get_py_version() {
+        python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' 
+    }
+    export -f get_py_version
+
+    function set_py3k() {
+        version=`get_py_version`
+        major=`echo $$version | cut -d '.' -f 1`
+        minor=`echo $$version | cut -d '.' -f 2`
+        hotfix=`echo $$version | cut -d '.' -f 3`
+        if (( major > 2 )); then
+            export PY3K=1
+        else
+            export PY3K=0
+        fi
+    }
+    export -f set_py3k
+
+    set_py3k
+
+	#d2to1 hack active
+	pip install --no-deps --upgrade --force d2to1 || exit 1
+
+    echo "This doesn't work. Why conda why? --python 2.7 is useless here"
+    if [ $$PY3K -ne 0 ] ; then
+        sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg 
+        2to3 -w .
+    fi
+	    
+	python setup.py install || exit 1
+
+windows : 
+	# d2to1 hack active
+	pip install --no-deps --upgrade --force d2to1
+	if errorlevel 1 exit 1
+	    
+	python setup.py install
+	if errorlevel 1 exit 1
+