From 89dbd8cebf7c04728a771e03ff541675e00a9237 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Mon, 25 Jun 2007 00:35:43 +0000
Subject: EncapPackages: Need to use new setuptools everywhere or things get
 confusing

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3349 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/bcfg2-0.9.4.ep            |   1 +
 encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep   |   1 +
 .../src/encap-profiles/bcfg2-elementtree-1.2.6.ep  |   1 +
 encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep    |   1 +
 .../src/encap-profiles/bcfg2-python-apt-0.5.10.ep  |   1 +
 .../bcfg2-python-apt-0.6.16.2ubuntu8.ep            |   1 +
 .../src/encap-profiles/bcfg2-python-apt-0.6.19.ep  |   1 +
 encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep | 114 +++++++++++++++++++++
 .../server/bcfg2-setuptools-0.6c6.ep               | 114 ---------------------
 9 files changed, 121 insertions(+), 114 deletions(-)
 create mode 100644 encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
 delete mode 100644 encap/src/encap-profiles/server/bcfg2-setuptools-0.6c6.ep

(limited to 'encap/src/encap-profiles')

diff --git a/encap/src/encap-profiles/bcfg2-0.9.4.ep b/encap/src/encap-profiles/bcfg2-0.9.4.ep
index 80ca1c69b..a11101a39 100644
--- a/encap/src/encap-profiles/bcfg2-0.9.4.ep
+++ b/encap/src/encap-profiles/bcfg2-0.9.4.ep
@@ -19,6 +19,7 @@
 <prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-elementtree-1.2.6" />
 <prereq package="bcfg2-m2crypto-0.17" />
+<prereq package="bcfg2-setuptools-0.6c6" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
index 80103b639..406d5b37b 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
@@ -9,6 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
+<prereq package="bcfg2-setuptools-0.6c6" />
 
 <environment
         variable="CC"
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 291d6aaa3..4c83e0a2c 100644
--- a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
+++ b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
@@ -9,6 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
+<prereq package="bcfg2-setuptools-0.6c6" />
 
 <environment
         variable="PATH"
diff --git a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
index 9307747a6..91af9b8e8 100644
--- a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
+++ b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
@@ -13,6 +13,7 @@
 <prereq package="bcfg2-openssl-0.9.8e" />
 <prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-swig-1.3.31" />
+<prereq package="bcfg2-setuptools-0.6c6" />
 
 <environment
         variable="CC"
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 dec0b3c8c..7d79159af 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
@@ -9,6 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
+<prereq package="bcfg2-setuptools-0.6c6" />
 
 <environment
         variable="CC"
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 f2721ab56..dbdae2e83 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
@@ -9,6 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
+<prereq package="bcfg2-setuptools-0.6c6" />
 
 <environment
         variable="CC"
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 3f50bd5c6..fb14a30b2 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
@@ -9,6 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
+<prereq package="bcfg2-setuptools-0.6c6" />
 
 <environment
         variable="CC"
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..dd1ffaac3
--- /dev/null
+++ b/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
@@ -0,0 +1,114 @@
+<?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 \
+--single-version-externally-managed \
+--record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
+</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>
diff --git a/encap/src/encap-profiles/server/bcfg2-setuptools-0.6c6.ep b/encap/src/encap-profiles/server/bcfg2-setuptools-0.6c6.ep
deleted file mode 100644
index dd1ffaac3..000000000
--- a/encap/src/encap-profiles/server/bcfg2-setuptools-0.6c6.ep
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
-</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