From 9f9a13cf06eb24fbc39bec5e4f4bca1bd3135a2c Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Fri, 22 Jun 2007 03:28:20 +0000
Subject: EncapPackages: Changes to get lxml-1.2.1 to work:   1. Add
 setuptools-0.6c6   2. Modifications to Python and all Python modules to work
 with new setuptools   3. There is no three

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3328 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/Makefile                  |   4 +-
 encap/src/encap-profiles/bcfg2-0.9.4.ep            |   9 +-
 encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep   |   9 +-
 .../src/encap-profiles/bcfg2-elementtree-1.2.6.ep  |   9 +-
 encap/src/encap-profiles/bcfg2-lxml-1.2.1.ep       |  10 +-
 encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep    |   9 +-
 encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep   |   9 +-
 encap/src/encap-profiles/bcfg2-python-2.4.4.ep     |  18 +++-
 .../src/encap-profiles/bcfg2-python-apt-0.5.10.ep  |  11 +-
 .../bcfg2-python-apt-0.6.16.2ubuntu8.ep            |  11 +-
 .../src/encap-profiles/bcfg2-python-apt-0.6.19.ep  |  11 +-
 encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep | 112 +++++++++++++++++++++
 12 files changed, 207 insertions(+), 15 deletions(-)
 create mode 100644 encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep

(limited to 'encap')

diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile
index b6fa55919..71b0a8364 100644
--- a/encap/src/encap-profiles/Makefile
+++ b/encap/src/encap-profiles/Makefile
@@ -24,10 +24,12 @@ BCFG2_LIBXML2 := $(basename $(wildcard bcfg2-libxml2-*.ep))
 BCFG2_LIBXSLT := $(basename $(wildcard bcfg2-libxslt-*.ep))
 BCFG2_LXML := $(basename $(wildcard bcfg2-lxml-*.ep))
 BCFG2_M2CRYPTO := $(basename $(wildcard bcfg2-m2crypto-*.ep))
+BCFG2_OPENSSL := $(basename $(wildcard bcfg2-openssl-*.ep))
 BCFG2_PKG_CONFIG := $(basename $(wildcard bcfg2-pkg-config-*.ep))
 BCFG2_PYREX := $(basename $(wildcard bcfg2-pyrex-*.ep))
 BCFG2_PYTHON := $(basename $(wildcard bcfg2-python-[0-9].[0-9]*.ep))
 BCFG2_READLINE := $(basename $(wildcard bcfg2-readline-*.ep))
+BCFG2_SETUPTOOLS := $(basename $(wildcard bcfg2-setuptools-*.ep))
 BCFG2_SWIG := $(basename $(wildcard bcfg2-swig-*.ep))
 BCFG2_ZLIB := $(basename $(wildcard bcfg2-zlib-*.ep))
 M4 := $(basename $(wildcard m4-*.sh))
@@ -37,7 +39,7 @@ OSTIARTY_DOC := $(basename $(wildcard ostiary-doc-*.ep))
 PATCH := $(basename $(wildcard patch-*.ep))
 RUNIT := $(basename $(wildcard runit-[0-9].[0-9]*.ep))
 
-sources_ep := $(sort $(BCFG2) $(BCFG2_CHEETAH) $(BCFG2_ELEMENTTREE) $(BCFG2_GZIP) $(BCFG2_M2CRYPTO) $(BCFG2_PKG_CONFIG) $(BCFG2_PYTHON) $(BCFG2_READLINE) $(BCFG2_SWIG) $(BCFG2_ZLIB) $(MAKESELF) $(OSTIARTY) $(PATCH) $(RUNIT))
+sources_ep := $(sort $(BCFG2) $(BCFG2_CHEETAH) $(BCFG2_ELEMENTTREE) $(BCFG2_GZIP) $(BCFG2_M2CRYPTO) $(BCFG2_OPENSSL) $(BCFG2_PKG_CONFIG) $(BCFG2_PYTHON) $(BCFG2_READLINE) $(BCFG2_SETUPTOOLS) $(BCFG2_SWIG) $(BCFG2_ZLIB) $(MAKESELF) $(OSTIARTY) $(PATCH) $(RUNIT))
 
 sources_sh := $(sort $(M4))
 
diff --git a/encap/src/encap-profiles/bcfg2-0.9.4.ep b/encap/src/encap-profiles/bcfg2-0.9.4.ep
index 519b61155..df1c003d6 100644
--- a/encap/src/encap-profiles/bcfg2-0.9.4.ep
+++ b/encap/src/encap-profiles/bcfg2-0.9.4.ep
@@ -115,7 +115,14 @@ Index: bcfg2/src/lib/Client/XML.py
 </build>
 
 <install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
index 3f54018c2..3103567ef 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
@@ -73,7 +73,14 @@ http://umn.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-2.0rc8.tar.gz"
 </build>
 
 <install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
diff --git a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
index 908c33518..e631d8693 100644
--- a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
+++ b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
@@ -43,7 +43,14 @@ http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz"
 </build>
 
 <install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
diff --git a/encap/src/encap-profiles/bcfg2-lxml-1.2.1.ep b/encap/src/encap-profiles/bcfg2-lxml-1.2.1.ep
index 083dfe767..b6f2897d6 100644
--- a/encap/src/encap-profiles/bcfg2-lxml-1.2.1.ep
+++ b/encap/src/encap-profiles/bcfg2-lxml-1.2.1.ep
@@ -14,6 +14,7 @@
 <prereq package="bcfg2-pyrex-0.9.5.1a" />
 <prereq package="bcfg2-libxml2-2.6.29" />
 <prereq package="bcfg2-libxslt-1.1.21" />
+<prereq package="bcfg2-setuptools-0.6c6" />
 
 <environment
         variable="CC"
@@ -79,7 +80,14 @@ url="http://encapsrcdist/mirror/lxml/lxml-1.2.1.tgz
 </build>
 
 <install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
diff --git a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
index 91abe4157..ecc4eec6a 100644
--- a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
+++ b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
@@ -76,7 +76,14 @@ url="http://encapsrcdist/mirror/m2crypto/m2crypto-0.17.tar.gz
 </build>
 
 <install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
diff --git a/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep b/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep
index 61fa558ba..f70197c47 100644
--- a/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep
+++ b/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep
@@ -70,7 +70,14 @@ url="http://encapsrcdist/mirror/pyrex/Pyrex-0.9.5.1a.tar.gz
 </build>
 
 <install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
index 31b148dcc..db2f764c9 100644
--- a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
@@ -8,6 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
+<prereq package="patch-2.5.9" />
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-gzip-1.2.4b" />
 <prereq package="bcfg2-pkg-config-0.22" />
@@ -63,6 +64,21 @@ url="http://encapsrcdist/mirror/python/Python-2.4.4.tgz
      http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tgz"
 >
 
+<patch options="-p0" from_dir="Lib"><![CDATA[
+--- site.py	2007-06-21 22:26:29.000000000 -0400
++++ site.py	2007-06-21 22:26:55.000000000 -0400
+@@ -170,7 +170,7 @@
+ 
+ def addsitepackages(known_paths):
+     """Add site-packages (and possibly site-python) to sys.path"""
+-    prefixes = [sys.prefix]
++    prefixes = ['/usr/local/lib/bcfg2', sys.prefix]
+     if sys.exec_prefix != sys.prefix:
+         prefixes.append(sys.exec_prefix)
+     for prefix in prefixes:
+
+]]></patch>
+
 <configure>
 if [ -f setup.py.orig ]; then cp setup.py.orig setup.py; fi
 cat setup.py \
@@ -87,8 +103,6 @@ PLATFORM_ENDIF
 # Put setup back into pristine state
 rm ${builddir}/setup.py
 cp ${builddir}/setup.py.orig ${builddir}/setup.py
-# Make site-packages be in the PYTHONPATH
-echo /usr/local/lib/bcfg2/lib/python2.4/site-packages > lib/bcfg2/lib/python2.4/site-packages/usr-local-lib-bcfg2.pth
 # Convienience links
 mkdir bin 2>/dev/null || exit 0
 ln -sf ../lib/bcfg2/bin/pydoc bin/b2-pydoc
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
index d4b30b663..909dd18b8 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
@@ -74,8 +74,15 @@ subdir="python-apt-0.5.10"
 </build>
 
 <install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
index 45b044820..472601337 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
@@ -74,8 +74,15 @@ subdir="python-apt-0.6.16.2ubuntu8"
 </build>
 
 <install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
index 4f298e821..c60eed62f 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
@@ -74,8 +74,15 @@ subdir="python-apt-0.6.19"
 </build>
 
 <install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
diff --git a/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep b/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
new file mode 100644
index 000000000..3678a8dd5
--- /dev/null
+++ b/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-setuptools-0.6c6"
+>
+
+<prereq package="m4-1.4.4" />
+<prereq package="bcfg2-zlib-1.2.3" />
+<prereq package="bcfg2-pkg-config-0.22" />
+<prereq package="bcfg2-python-2.4.4" />
+
+<environment
+        variable="CC"
+        value="gcc -static-libgcc"
+        type="set"
+/>
+
+<environment
+        variable="PATH"
+PLATFORM_IF_MATCH(solaris)
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
+PLATFORM_ELSE
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
+PLATFORM_ENDIF
+        type="prepend"
+/>
+
+PLATFORM_IF_MATCH(linux)
+PLATFORM_ELSE
+<environment
+        variable="MAKE"
+        value="gmake"
+        type="set"
+/>
+PLATFORM_ENDIF
+
+<environment
+        variable="LDFLAGS"
+PLATFORM_IF_MATCH(linux)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
+PLATFORM_ELSE_IF_MATCH(aix)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE_IF_MATCH(solaris)
+        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE
+PLATFORM_ENDIF
+        type="set"
+/>
+
+<environment
+        variable="CPPFLAGS"
+        value="-I/usr/local/lib/bcfg2/include"
+        type="set"
+/>
+
+<source
+url="http://encapsrcdist/mirror/setuptools/setuptools-0.6c6.tar.gz
+     http://mirror.opensysadmin.com/setuptools/setuptools-0.6c6.tar.gz
+     http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-0.6c6.tar.gz"
+>
+
+<configure>
+/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+-I/usr/local/lib/bcfg2/include \
+-L/usr/local/lib/bcfg2/lib \
+-L/usr/local/lib/bcfg2/lib/python2.4/site-packages
+</configure>
+
+<build>
+/usr/local/lib/bcfg2/bin/python setup.py build \
+--build-base=${builddir}/build
+</build>
+
+<install>
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+</install>
+
+<clean>
+/usr/local/lib/bcfg2/bin/python setup.py clean
+</clean>
+
+</source>
+
+<prepackage type="set">
+# Fix paths so they work with symlinks
+mv ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/easy-install.pth ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/easy-install.pth.broken
+mv ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/setuptools.pth ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/setuptools.pth.broken
+cat ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/easy-install.pth.broken | sed s:\.\/:\/usr\/local\/lib\/bcfg2\/lib\/python2.4\/site-packages\/:g > ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/easy-install.pth
+cat ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/setuptools.pth.broken | sed s:\.\/:\/usr\/local\/lib\/bcfg2\/lib\/python2.4\/site-packages\/:g > ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/setuptools.pth
+rm ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/*.broken
+# Make "this encap is installed" sentinal file available in /usr/local/var/encap
+test -d var || mkdir var
+test -d var/encap || mkdir var/encap
+touch var/encap/${ENCAP_PKGNAME}
+</prepackage>
+
+<encapinfo>
+description setuptools - work with python packages
+</encapinfo>
+
+</encap_profile>
-- 
cgit v1.2.3-1-g7c22