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

Package-Manager: portage-2.1.3.9

6 files changed, 126 insertions, 5 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/Manifest b/dev-libs/clearsilver/Manifest
index f19250850e4a..122b110c9829 100644
--- a/dev-libs/clearsilver/Manifest
+++ b/dev-libs/clearsilver/Manifest
@@ -18,6 +18,14 @@ AUX clearsilver-0.10.4-libdir.patch 693 RMD160 681c05d73d7679a0021e5231ae23fc2f7
 MD5 c1ff2d71c89ae56445b88728e81f1fa8 files/clearsilver-0.10.4-libdir.patch 693
 RMD160 681c05d73d7679a0021e5231ae23fc2f7292330c files/clearsilver-0.10.4-libdir.patch 693
 SHA256 ec5e340eb9fdb94c8e05f5bdc79bc954c0560ed711dd438e0d6f863e1ab3abd2 files/clearsilver-0.10.4-libdir.patch 693
+AUX clearsilver-0.10.5-libdir.patch 693 RMD160 681c05d73d7679a0021e5231ae23fc2f7292330c SHA1 001ee8e3a4b7ebd64a05bd74f9ed8a9abb52965a SHA256 ec5e340eb9fdb94c8e05f5bdc79bc954c0560ed711dd438e0d6f863e1ab3abd2
+MD5 c1ff2d71c89ae56445b88728e81f1fa8 files/clearsilver-0.10.5-libdir.patch 693
+RMD160 681c05d73d7679a0021e5231ae23fc2f7292330c files/clearsilver-0.10.5-libdir.patch 693
+SHA256 ec5e340eb9fdb94c8e05f5bdc79bc954c0560ed711dd438e0d6f863e1ab3abd2 files/clearsilver-0.10.5-libdir.patch 693
+AUX clearsilver-0.10.5-libz.patch 276 RMD160 6188b48684c8051a6b3b4a696138ce72a3730507 SHA1 7d5f0bcb34221fd14965cf7611f748ef8a04d031 SHA256 51e769a619a23aff2b2a26e17954eba6cd3101f581b1807465226f55e0f42d02
+MD5 b4d2aff98ec0fea28e9722dea5f05154 files/clearsilver-0.10.5-libz.patch 276
+RMD160 6188b48684c8051a6b3b4a696138ce72a3730507 files/clearsilver-0.10.5-libz.patch 276
+SHA256 51e769a619a23aff2b2a26e17954eba6cd3101f581b1807465226f55e0f42d02 files/clearsilver-0.10.5-libz.patch 276
 AUX configure-python24.patch 867 RMD160 38c9e427b6694971870847c74dd4c371cedcf500 SHA1 f6bb691a6a2e32c923ec43d07d16cd324674acb5 SHA256 f3f4f4c6c31a00476e41189ab252320600ac20d56d96a555a66703d6b4aab60b
 MD5 50cea20dc6a84df4ce015e7d821e97d2 files/configure-python24.patch 867
 RMD160 38c9e427b6694971870847c74dd4c371cedcf500 files/configure-python24.patch 867
@@ -25,6 +33,7 @@ SHA256 f3f4f4c6c31a00476e41189ab252320600ac20d56d96a555a66703d6b4aab60b files/co
 DIST clearsilver-0.10.1.tar.gz 563655 RMD160 de13a6a58d80b896fe245b5d2d0a0f391390dfd3 SHA1 d18d2b65b8a8f0e7077feb8b6c358519c4113e97 SHA256 430a2e8b0d3020c86554174abcfa5f00d9b4359e3e034dd6a0e542af36b450b5
 DIST clearsilver-0.10.3.tar.gz 592708 RMD160 95910842194faa67fb5aefcd3b0ed5b20595cfb8 SHA1 0e965010a9a3a7e1c11f4adb85cfc38a687cd9aa SHA256 71d8c6459a4be1912dbc445e2e9d46303be6623cea51563c21abe39c8b5b0bd2
 DIST clearsilver-0.10.4.tar.gz 655730 RMD160 2050cfd266e9c4e30db68417c6e2aaf2b9bcf8d5 SHA1 f1f303983a4f43e2f31be7302e7ecbde8010569f SHA256 7d8e4addb3478fcaaec62ac874e022502d6f93b899b10b14394170ac443eb42b
+DIST clearsilver-0.10.5.tar.gz 439190 RMD160 bd5c616f326b544df8a74eec71a98a474b408249 SHA1 138865dc91e27328fe29fcaaac1bc6558f19dd75 SHA256 1e9da038deafddd3d0c1c510626c28be5a0f4f17b9091d577fd30e7c5ba88680
 EBUILD clearsilver-0.10.1.ebuild 1719 RMD160 cfe200d57e49f6b9ac12546e5a742b1f2390e6ca SHA1 f29b2e58d2d18c6e31439103a339b012d2f2c705 SHA256 2b86b0892ed82ee7792581b1a3fee194b5ecf875fa6be38e728ff01c8fb2720e
 MD5 2a29de8459902f481660364d85d801cc clearsilver-0.10.1.ebuild 1719
 RMD160 cfe200d57e49f6b9ac12546e5a742b1f2390e6ca clearsilver-0.10.1.ebuild 1719
@@ -37,10 +46,14 @@ EBUILD clearsilver-0.10.4.ebuild 1648 RMD160 e9a15b318dced3b9e05f360e701695cfefa
 MD5 433a882ee41f27dbe7f2e9100424c656 clearsilver-0.10.4.ebuild 1648
 RMD160 e9a15b318dced3b9e05f360e701695cfefad3b77 clearsilver-0.10.4.ebuild 1648
 SHA256 6d8899850098df093f357e44854272c1bddf5db78843fe60b061583ce866c1bf clearsilver-0.10.4.ebuild 1648
-MISC ChangeLog 4901 RMD160 09601852a206eeb211cce55fe8a1da93a4cda9ce SHA1 883fca66248945ec48480caa0a01bb825d5ccb80 SHA256 438bb67d855d3b2356d47447086f6f7b96bed5680cab78d7e41cded4d97b3f3f
-MD5 5c3953acfc5190f428b1f7d21b97f68f ChangeLog 4901
-RMD160 09601852a206eeb211cce55fe8a1da93a4cda9ce ChangeLog 4901
-SHA256 438bb67d855d3b2356d47447086f6f7b96bed5680cab78d7e41cded4d97b3f3f ChangeLog 4901
+EBUILD clearsilver-0.10.5.ebuild 1726 RMD160 eb813c91cc8f3a14608468efd8a39debf7a0519f SHA1 eb6434e899156f5c0d95c0b3ed78149d5db0b45f SHA256 c1cd987aea9e46fe7eceba2e91305047d30095fa071873f7269e8ad7295d6d96
+MD5 21aa33a950fc1607a9be57d43a4d8088 clearsilver-0.10.5.ebuild 1726
+RMD160 eb813c91cc8f3a14608468efd8a39debf7a0519f clearsilver-0.10.5.ebuild 1726
+SHA256 c1cd987aea9e46fe7eceba2e91305047d30095fa071873f7269e8ad7295d6d96 clearsilver-0.10.5.ebuild 1726
+MISC ChangeLog 5175 RMD160 e504f67f6f79ef27cccf68f8c348fa5cc7e610b3 SHA1 e27fd61b2f965ae215227dcf316faa310ef4d8c6 SHA256 eedd80d8b3500c87b753be9afdce5c607cf1f68421da05454577406d548a0c94
+MD5 b8531473fbeb98bdaa93584019b048cf ChangeLog 5175
+RMD160 e504f67f6f79ef27cccf68f8c348fa5cc7e610b3 ChangeLog 5175
+SHA256 eedd80d8b3500c87b753be9afdce5c607cf1f68421da05454577406d548a0c94 ChangeLog 5175
 MISC metadata.xml 216 RMD160 93b58c3db5dcd051f3c903b712ecdfa48f59db0c SHA1 f8dfddd65f5a588eb55ed7be57a224bf8f52f488 SHA256 0fa5af41c4517f8bf2dbff136d9af93902f5890c45533c101d6c07ce0f430428
 MD5 908db14d15dc92bfbb6aa8ce5b426f46 metadata.xml 216
 RMD160 93b58c3db5dcd051f3c903b712ecdfa48f59db0c metadata.xml 216
@@ -54,3 +67,6 @@ SHA256 29038c921804d48c424fab1edb1110810711d715d324852942a8293ea4042934 files/di
 MD5 9df53938b02229ecb349407b5553dd2a files/digest-clearsilver-0.10.4 256
 RMD160 36194784c677c0ed422758a023083d2d17258866 files/digest-clearsilver-0.10.4 256
 SHA256 7c4243c53e74e3ea36ff1e77d1eff7d628cda62943422518cef97bca7548d422 files/digest-clearsilver-0.10.4 256
+MD5 c590d8b80aa91aeba0a27ce9600ec212 files/digest-clearsilver-0.10.5 256
+RMD160 467a7855e87fb85620139ff76eaa688ee1ebe7db files/digest-clearsilver-0.10.5 256
+SHA256 9e7bc59b4bc052aa58b4cba722d528c41dae9646178e06bde29c7b9e4a756404 files/digest-clearsilver-0.10.5 256
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