Version bump to 0.10.5, fixing bug #191601. Added user patch to fix bug #196422.

(Portage version: 2.1.3.9)

5 files changed, 106 insertions, 1 deletions

diff --git a/dev-libs/clearsilver/ChangeLog b/dev-libs/clearsilver/ChangeLog
index 5c96799223ec..38027a2f6810 100644
--- a/dev-libs/clearsilver/ChangeLog
+++ b/dev-libs/clearsilver/ChangeLog
@@ -1,6 +1,14 @@
 # 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.30 2007/05/15 16:43:40 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.31 2007/11/02 15:51:13 dju Exp $
+
+*clearsilver-0.10.5 (02 Nov 2007)
+
+  02 Nov 2007; Julien Allanos <dju@gentoo.org>
+  +files/clearsilver-0.10.5-libdir.patch,
+  +files/clearsilver-0.10.5-libz.patch, +clearsilver-0.10.5.ebuild:
+  Version bump to 0.10.5, fixing bug #191601.
+  Added user patch to fix bug #196422.
 
   15 May 2007; Steve Dibb <beandog@gentoo.org> clearsilver-0.10.1.ebuild:
   amd64 stable
diff --git a/dev-libs/clearsilver/clearsilver-0.10.5.ebuild b/dev-libs/clearsilver/clearsilver-0.10.5.ebuild
new file mode 100644
index 000000000000..05afa0bef437
--- /dev/null
+++ b/dev-libs/clearsilver/clearsilver-0.10.5.ebuild
@@ -0,0 +1,71 @@
+# 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.5.ebuild,v 1.1 2007/11/02 15:51:13 dju 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 multilib autotools
+
+DESCRIPTION="Clearsilver is a fast, powerful, and language-neutral HTML template system."
+HOMEPAGE="http://www.clearsilver.net/"
+SRC_URI="http://www.clearsilver.net/downloads/${P}.tar.gz"
+
+LICENSE="CS-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="perl python zlib"
+
+DEPEND="python? ( dev-lang/python )
+	perl? ( dev-lang/perl )
+	zlib? ( sys-libs/zlib )"
+
+DOCS="README INSTALL"
+
+if use python ; then
+	DOCS="${DOCS} README.python"
+fi
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	use zlib && epatch "${FILESDIR}"/${P}-libz.patch
+
+	epatch "${FILESDIR}"/${P}-libdir.patch
+	sed -i -e "s:GENTOO_LIBDIR:$(get_libdir):" configure.in
+	eautoreconf || die "eautoreconf failed"
+
+	# Fix for Gentoo/Freebsd
+	[[ "${ARCH}" == FreeBSD ]] && touch ${S}/features.h ${S}/cgi/features.h
+}
+
+src_compile() {
+	econf \
+		$(use_enable perl) \
+		$(use_with perl perl /usr/bin/perl) \
+		$(use_enable python) \
+		$(use_with python python /usr/bin/python) \
+		$(use_enable zlib compression) \
+		"--disable-apache" \
+		"--disable-ruby" \
+		"--disable-java" \
+		"--disable-csharp" \
+		|| die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	cd ${S}
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	dodoc ${DOCS} || die "dodoc failed"
+
+	if use perl ; then
+		fixlocalpod || die "fixlocalpod failed"
+	fi
+}
diff --git a/dev-libs/clearsilver/files/clearsilver-0.10.5-libdir.patch b/dev-libs/clearsilver/files/clearsilver-0.10.5-libdir.patch
new file mode 100644
index 000000000000..46f1c91279f9
--- /dev/null
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.5-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
diff --git a/dev-libs/clearsilver/files/clearsilver-0.10.5-libz.patch b/dev-libs/clearsilver/files/clearsilver-0.10.5-libz.patch
new file mode 100644
index 000000000000..5bed42ab64d6
--- /dev/null
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.5-libz.patch
@@ -0,0 +1,10 @@
+--- python/setup.py.orig	2007-10-28 21:20:00.000000000 +0200
++++ python/setup.py	2007-10-28 21:20:34.000000000 +0200
+@@ -122,6 +122,7 @@
+       include_dirs=INC_DIRS,
+       library_dirs=LIB_DIRS,
+       libraries=LIBRARIES,
++      extra_link_args = ["-lz"],
+       )]
+   }
+ 
diff --git a/dev-libs/clearsilver/files/digest-clearsilver-0.10.5 b/dev-libs/clearsilver/files/digest-clearsilver-0.10.5
new file mode 100644
index 000000000000..02221f984459
--- /dev/null
+++ b/dev-libs/clearsilver/files/digest-clearsilver-0.10.5
@@ -0,0 +1,3 @@
+MD5 b8c0c7fbe0ef5e06e0c935f134304d44 clearsilver-0.10.5.tar.gz 439190
+RMD160 bd5c616f326b544df8a74eec71a98a474b408249 clearsilver-0.10.5.tar.gz 439190
+SHA256 1e9da038deafddd3d0c1c510626c28be5a0f4f17b9091d577fd30e7c5ba88680 clearsilver-0.10.5.tar.gz 439190