Merge branch 'u/jdemeyer/ticket/15596' of git://trac.sagemath.org/sag…

…e into ticket/15580

Conflicts:
	src/bin/sage-sdist

build/deps

@@ -80,7 +80,7 @@ all-sage: \
      $(INST)/$(PALP) \
      $(INST)/$(PARI) \
      $(INST)/$(PEXPECT) \
-     $(INST)/$(PIL) \
+     $(INST)/$(PILLOW) \
      $(INST)/$(POLYBORI) \
      $(INST)/$(POLYTOPES_DB) \
      $(INST)/$(PPL) \
@@ -312,7 +312,7 @@ $(INST)/$(SQLITE): $(INST)/$(READLINE)
 # SageTeX, you actually need to run Sage, produce plots,...
 $(INST)/$(SAGETEX): $(INST)/$(PYTHON) \
                     $(SAGERUNTIME) $(INST)/$(MAXIMA) $(INST)/$(SCIPY) \
-                    $(INST)/$(MATPLOTLIB) $(INST)/$(PIL) $(INST)/$(TACHYON)
+                    $(INST)/$(MATPLOTLIB) $(INST)/$(PILLOW) $(INST)/$(TACHYON)
 	+$(PIPE) "$(SAGE_SPKG) $(SAGETEX) 2>&1" "tee -a $(SAGE_LOGS)/$(SAGETEX).log"
 
 $(INST)/$(SETUPTOOLS): $(INST)/$(PYTHON)
@@ -485,8 +485,8 @@ $(INST)/$(GCC): $(INST)/$(MPIR) $(INST)/$(MPFR) $(INST)/$(MPC) \
                 $(INST)/$(ZLIB)
 	+$(PIPE) "$(SAGE_SPKG) $(GCC) 2>&1" "tee -a $(SAGE_LOGS)/$(GCC).log"
 
-$(INST)/$(PIL): $(INST)/$(PYTHON)
-	+$(PIPE) "$(SAGE_SPKG) $(PIL) 2>&1" "tee -a $(SAGE_LOGS)/$(PIL).log"
+$(INST)/$(PILLOW): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+	+$(PIPE) "$(SAGE_SPKG) $(PILLOW) 2>&1" "tee -a $(SAGE_LOGS)/$(PILLOW).log"
 
 $(INST)/$(NUMPY): $(INST)/$(PYTHON) $(INST)/$(ATLAS)
 	+$(PIPE) "$(SAGE_SPKG) $(NUMPY) 2>&1" "tee -a $(SAGE_LOGS)/$(NUMPY).log"
@@ -508,6 +508,7 @@ $(INST)/$(CEPHES):
 # setuptools forgets to update easy-install.pth during parallel
 # builds, so we build the relevant packages serially.
 
+$(INST)/$(SQLALCHEMY): $(INST)/$(PILLOW)
 $(INST)/$(PYGMENTS): $(INST)/$(SQLALCHEMY)
 $(INST)/$(JINJA2): $(INST)/$(PYGMENTS)
 $(INST)/$(SPHINX): $(INST)/$(JINJA2)

build/install

@@ -409,7 +409,7 @@ PALP=`newest_version palp`
 PARI=`newest_version pari`
 PATCH=`newest_version patch`
 PEXPECT=`newest_version pexpect`
-PIL=`newest_version pil`
+PILLOW=`newest_version pillow`
 POLYBORI=`newest_version polybori`
 POLYTOPES_DB=`newest_version polytopes_db`
 PPL=`newest_version ppl`