summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2007-02-14 12:25:48 +0000
committerSimon Stelling <blubb@gentoo.org>2007-02-14 12:25:48 +0000
commit4468ae5ec8b172f2751b0ccfec4dcfbe47010156 (patch)
tree068ee12a62cd9e8dde5b49d3e0b955bbb1dc746d /dev-libs
parentForce nptlonly for glibc-2.5. (diff)
downloadgentoo-2-4468ae5ec8b172f2751b0ccfec4dcfbe47010156.tar.gz
gentoo-2-4468ae5ec8b172f2751b0ccfec4dcfbe47010156.tar.bz2
gentoo-2-4468ae5ec8b172f2751b0ccfec4dcfbe47010156.zip
multilib-strict fixes; bug 164447
(Portage version: 2.1.2-r9)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/clearsilver/ChangeLog6
-rw-r--r--dev-libs/clearsilver/clearsilver-0.10.4.ebuild13
-rw-r--r--dev-libs/clearsilver/files/clearsilver-0.10.4-libdir.patch13
3 files changed, 29 insertions, 3 deletions
diff --git a/dev-libs/clearsilver/ChangeLog b/dev-libs/clearsilver/ChangeLog
index 4b2cfbef40e3..a873ce439cfe 100644
--- a/dev-libs/clearsilver/ChangeLog
+++ b/dev-libs/clearsilver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/clearsilver
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.27 2007/02/13 20:34:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.28 2007/02/14 12:25:48 blubb Exp $
+
+ 14 Feb 2007; Simon Stelling <blubb@gentoo.org>
+ +files/clearsilver-0.10.4-libdir.patch, clearsilver-0.10.4.ebuild:
+ multilib-strict fixes; bug 164447
13 Feb 2007; Markus Rothe <corsair@gentoo.org> clearsilver-0.10.4.ebuild:
Added ~ppc64; bug #166675
diff --git a/dev-libs/clearsilver/clearsilver-0.10.4.ebuild b/dev-libs/clearsilver/clearsilver-0.10.4.ebuild
index b3b439046b3b..b0e2529e6b56 100644
--- a/dev-libs/clearsilver/clearsilver-0.10.4.ebuild
+++ b/dev-libs/clearsilver/clearsilver-0.10.4.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.10.4.ebuild,v 1.2 2007/02/13 20:34:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.10.4.ebuild,v 1.3 2007/02/14 12:25:48 blubb Exp $
# Please note: apache, java, mono and ruby support disabled for now.
# Fill a bug if you need it.
#
# dju@gentoo.org, 4th July 2005
-inherit eutils perl-app
+inherit eutils perl-app multilib autotools
DESCRIPTION="Clearsilver is a fast, powerful, and language-neutral HTML template system."
HOMEPAGE="http://www.clearsilver.net/"
@@ -28,6 +28,15 @@ if use python ; then
DOCS="${DOCS} README.python"
fi
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ epatch "${FILESDIR}"/${P}-libdir.patch
+ sed -i -e "s:GENTOO_LIBDIR:$(get_libdir):" configure.in
+ eautoreconf
+}
+
src_compile() {
econf \
$(use_enable perl) \
diff --git a/dev-libs/clearsilver/files/clearsilver-0.10.4-libdir.patch b/dev-libs/clearsilver/files/clearsilver-0.10.4-libdir.patch
new file mode 100644
index 000000000000..46f1c91279f9
--- /dev/null
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.4-libdir.patch
@@ -0,0 +1,13 @@
+--- configure.in.orig 2007-02-14 13:13:10.000000000 +0100
++++ configure.in 2007-02-14 13:18:39.000000000 +0100
+@@ -253,8 +253,8 @@
+ vers=`$python_bin -c "import sys; print sys.version[[:3]]"`
+ py_inst_dir=`$python_bin -c "import sys; print sys.exec_prefix"`
+ python_inc=$py_inst_dir/include/python$vers
+- python_lib="-L$py_inst_dir/lib/python$vers/config -lpython$vers"
+- python_site=$py_inst_dir/lib/python$vers/site-packages
++ python_lib="-L$py_inst_dir/GENTOO_LIBDIR/python$vers/config -lpython$vers"
++ python_site=$py_inst_dir/GENTOO_LIBDIR/python$vers/site-packages
+ else
+ for vers in $python_versions; do
+ for path in $python_search_path; do