diff options
author | Renat Lumpau <rl03@gentoo.org> | 2005-08-02 02:09:02 +0000 |
---|---|---|
committer | Renat Lumpau <rl03@gentoo.org> | 2005-08-02 02:09:02 +0000 |
commit | f768fd07afcc7a18b1990f828e3f218955505d49 (patch) | |
tree | def37519bed8d3429ec249b117c9987fe9f2f169 /dev-libs/clearsilver | |
parent | version bump (diff) | |
download | historical-f768fd07afcc7a18b1990f828e3f218955505d49.tar.gz historical-f768fd07afcc7a18b1990f828e3f218955505d49.tar.bz2 historical-f768fd07afcc7a18b1990f828e3f218955505d49.zip |
Fixes bug #98588, thanks to pythonhead
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'dev-libs/clearsilver')
-rw-r--r-- | dev-libs/clearsilver/ChangeLog | 8 | ||||
-rw-r--r-- | dev-libs/clearsilver/Manifest | 18 | ||||
-rw-r--r-- | dev-libs/clearsilver/clearsilver-0.9.14.ebuild | 3 | ||||
-rw-r--r-- | dev-libs/clearsilver/clearsilver-0.9.7.ebuild | 5 | ||||
-rw-r--r-- | dev-libs/clearsilver/files/clearsilver-0.9.14-python24.patch | 20 | ||||
-rw-r--r-- | dev-libs/clearsilver/files/clearsilver-0.9.7-python24.patch | 20 |
6 files changed, 66 insertions, 8 deletions
diff --git a/dev-libs/clearsilver/ChangeLog b/dev-libs/clearsilver/ChangeLog index 6b12ed1f56b6..7ea82177b077 100644 --- a/dev-libs/clearsilver/ChangeLog +++ b/dev-libs/clearsilver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/clearsilver # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.11 2005/07/04 22:48:29 dju Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.12 2005/08/02 02:09:01 rl03 Exp $ + + 02 Aug 2005; Renat Lumpau <rl03@gentoo.org> + +files/clearsilver-0.9.7-python24.patch, + +files/clearsilver-0.9.14-python24.patch, clearsilver-0.9.7.ebuild, + clearsilver-0.9.14.ebuild: + Fixes bug #98588, thanks to pythonhead *clearsilver-0.9.14 (04 Jul 2005) diff --git a/dev-libs/clearsilver/Manifest b/dev-libs/clearsilver/Manifest index b8d5e0610762..74ce07697a55 100644 --- a/dev-libs/clearsilver/Manifest +++ b/dev-libs/clearsilver/Manifest @@ -1,7 +1,19 @@ -MD5 9d29b1678fc0136ed83a6bc58dbc2921 clearsilver-0.9.14.ebuild 1791 -MD5 4fd0792671c45ac713a53cc5be7895a1 clearsilver-0.9.7.ebuild 2256 -MD5 f672b473c858f06e6900bf1918f90bad ChangeLog 1472 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 ea47b883c6d7ab3027bfce43e6daa863 clearsilver-0.9.14.ebuild 1832 +MD5 ad68da3ab962d3aafb89a660ecc33284 clearsilver-0.9.7.ebuild 2249 +MD5 b12a7f4b7ba4d8df8c5d397d05afb4c1 ChangeLog 1703 MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220 MD5 478f0f67e9ea8486fbea128e5c80dd24 files/digest-clearsilver-0.9.7 69 MD5 4c227dbc14edacb199c6a4df09c64fce files/0.9.7-python.patch 391 MD5 b549fb2f91db6d0719294ae1ef45345b files/digest-clearsilver-0.9.14 70 +MD5 98ca2a60a7171f98d9a37f1e8cc56ba2 files/clearsilver-0.9.7-python24.patch 888 +MD5 9e2f0fca57ce31d3579daa49e75bb26d files/clearsilver-0.9.14-python24.patch 889 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFC7tXJEzitwsaoONoRAsiuAKDIzqlU+WDFAKNEQ0q6VBjEKg8x3gCfZapO +yZz9sikf2HfCtyT5FRgPGxI= +=AUh9 +-----END PGP SIGNATURE----- diff --git a/dev-libs/clearsilver/clearsilver-0.9.14.ebuild b/dev-libs/clearsilver/clearsilver-0.9.14.ebuild index 4e72fa9c6d13..2a84fd27c5b1 100644 --- a/dev-libs/clearsilver/clearsilver-0.9.14.ebuild +++ b/dev-libs/clearsilver/clearsilver-0.9.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.9.14.ebuild,v 1.3 2005/07/07 06:55:56 dju Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.9.14.ebuild,v 1.4 2005/08/02 02:09:01 rl03 Exp $ # Please note: apache, java, mono and ruby support disabled for now. # Fill a bug if you need it. @@ -43,6 +43,7 @@ fi src_unpack () { unpack ${A} cd ${S} + epatch ${FILESDIR}/${P}-python24.patch sed -i s,bin/httpd,bin/apache,g configure } diff --git a/dev-libs/clearsilver/clearsilver-0.9.7.ebuild b/dev-libs/clearsilver/clearsilver-0.9.7.ebuild index 522964ed044c..07a80bd00540 100644 --- a/dev-libs/clearsilver/clearsilver-0.9.7.ebuild +++ b/dev-libs/clearsilver/clearsilver-0.9.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.9.7.ebuild,v 1.10 2005/04/11 12:16:59 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.9.7.ebuild,v 1.11 2005/08/02 02:09:01 rl03 Exp $ inherit eutils @@ -37,9 +37,8 @@ src_unpack () { cd ${S} sed -i s/apxs/apxs2/g configure sed -i s,bin/httpd,bin/apache2,g configure - sed -i s/2.2\ 2.1/2.3\ 2.2\ 2.1/ configure - epatch ${FILESDIR}/${PV}-python.patch + epatch ${FILESDIR}/${P}-python24.patch } src_compile() { diff --git a/dev-libs/clearsilver/files/clearsilver-0.9.14-python24.patch b/dev-libs/clearsilver/files/clearsilver-0.9.14-python24.patch new file mode 100644 index 000000000000..2c12e0e1cb5c --- /dev/null +++ b/dev-libs/clearsilver/files/clearsilver-0.9.14-python24.patch @@ -0,0 +1,20 @@ +--- configure.org 2005-07-28 08:23:37.186433144 -0700 ++++ configure 2005-07-28 08:24:52.641962160 -0700 +@@ -3047,7 +3047,7 @@ + echo "configure:3048: checking for python includes" >&5 + python_inc=no + python_search_path="/neo/opt /usr/local /usr /c" +- python_versions="2.3 2.2 2.1 2.0 1.5 22 21 20 15" ++ python_versions="2.4 2.3 2.2 2.1 2.0 1.5 22 21 20 15" + if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then + python_bin=$cs_cv_python_path + vers=`$python_bin -c "import sys; print sys.version[:3]"` +@@ -3084,7 +3084,7 @@ + PYTHON=$python_bin + PYTHON_INC="-I$python_inc" + PYTHON_LIB=$python_lib +- PYTHON_SITE=`$python_bin -c "import site; print site.sitedirs[0]"` ++ PYTHON_SITE=`$python_bin -c "import os,sys; print os.path.join(sys.prefix, 'lib','python'+sys.version[:3],'site-packages')"` + BUILD_WRAPPERS="$BUILD_WRAPPERS python" + fi + fi diff --git a/dev-libs/clearsilver/files/clearsilver-0.9.7-python24.patch b/dev-libs/clearsilver/files/clearsilver-0.9.7-python24.patch new file mode 100644 index 000000000000..4a653c50f407 --- /dev/null +++ b/dev-libs/clearsilver/files/clearsilver-0.9.7-python24.patch @@ -0,0 +1,20 @@ +--- configure.org 2005-07-28 08:44:03.077069440 -0700 ++++ configure 2005-07-28 08:45:12.132571408 -0700 +@@ -3045,7 +3045,7 @@ + echo "configure:3046: checking for python includes" >&5 + python_inc=no + python_search_path="/neo/opt /usr/local /usr /c" +- python_versions="2.2 2.1 2.0 1.5 22 21 20 15" ++ python_versions="2.4 2.3 2.2 2.1 2.0 1.5 22 21 20 15" + if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then + python_bin=$cs_cv_python_path + vers=`$python_bin -c "import sys; print sys.version[:3]"` +@@ -3082,7 +3082,7 @@ + PYTHON=$python_bin + PYTHON_INC="-I$python_inc" + PYTHON_LIB=$python_lib +- PYTHON_SITE=`$python_bin -c "import site; print site.sitedirs[0]"` ++ PYTHON_SITE=`$python_bin -c "import os,sys; print os.path.join(sys.prefix, 'lib','python'+sys.version[:3],'site-packages')"` + BUILD_WRAPPERS="$BUILD_WRAPPERS python" + fi + fi |