Version bump to 0.10.3. Fixed bugs #144580, #146026 and #148863.

Package-Manager: portage-2.1.1

7 files changed, 168 insertions, 6 deletions

diff --git a/dev-libs/clearsilver/ChangeLog b/dev-libs/clearsilver/ChangeLog
index 10a20d3e71d6..88f3cc0e8db4 100644
--- a/dev-libs/clearsilver/ChangeLog
+++ b/dev-libs/clearsilver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/clearsilver
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.24 2006/06/26 03:19:13 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.25 2006/09/27 22:10:30 dju Exp $
+
+*clearsilver-0.10.3 (27 Sep 2006)
+
+  27 Sep 2006; Julien Allanos <dju@gentoo.org>
+  +files/0.10.3-PyObject_DEL.patch, +files/0.10.3-missing-csr.patch,
+  +files/0.10.3-static.cgi.patch, +clearsilver-0.10.3.ebuild:
+  Version bump to 0.10.3. Fixed bugs #144580, #146026 and #148863.
 
   26 Jun 2006; Javier Villavicencio <the_paya@gentoo.org>
   clearsilver-0.10.2.ebuild:
@@ -103,4 +110,3 @@
   25 Apr 2004; Stuart Herbert <stuart@gentoo.org> clearsilver-0.9.7.ebuild,
   metadata.xml:
   Initial import; thanks to dju` <dju@elegiac.net> for the ebuild; see bug #48818
-
diff --git a/dev-libs/clearsilver/Manifest b/dev-libs/clearsilver/Manifest
index 6b160f23a6ee..93536cc78c58 100644
--- a/dev-libs/clearsilver/Manifest
+++ b/dev-libs/clearsilver/Manifest
@@ -1,3 +1,15 @@
+AUX 0.10.3-PyObject_DEL.patch 1178 RMD160 8a3b7984ea0615a727a04f73bbbb3bf36a3faf4c SHA1 0d577369a80b980bd457e4b0bc9fd20b22b10006 SHA256 afca1f2fb366899346e75a92260c1e8565ff393d59daae968aba4b450ba0c1af
+MD5 1e6641d647504ef40424108a00d4b99a files/0.10.3-PyObject_DEL.patch 1178
+RMD160 8a3b7984ea0615a727a04f73bbbb3bf36a3faf4c files/0.10.3-PyObject_DEL.patch 1178
+SHA256 afca1f2fb366899346e75a92260c1e8565ff393d59daae968aba4b450ba0c1af files/0.10.3-PyObject_DEL.patch 1178
+AUX 0.10.3-missing-csr.patch 330 RMD160 4d0348b82e19113c4037d5f4b34ed82b30278442 SHA1 69b0993a0160d7947528eef66986e0b1010e7157 SHA256 7ca695fb00bd756eb96ded212b3605bbda437a1f2e2c581bd3d54b17aad00929
+MD5 3cd87f6aad37b106ca0b934731b57138 files/0.10.3-missing-csr.patch 330
+RMD160 4d0348b82e19113c4037d5f4b34ed82b30278442 files/0.10.3-missing-csr.patch 330
+SHA256 7ca695fb00bd756eb96ded212b3605bbda437a1f2e2c581bd3d54b17aad00929 files/0.10.3-missing-csr.patch 330
+AUX 0.10.3-static.cgi.patch 481 RMD160 cd7971740cf865b888e078adb3eb750e1f301dc8 SHA1 868206289da09230964a041c166d8fb9d011a859 SHA256 492df744973861f98fd1ce5be23abe060baa8d997c65d6379eacd7df27206901
+MD5 c909f806a66b7af45178f22b7610b6cd files/0.10.3-static.cgi.patch 481
+RMD160 cd7971740cf865b888e078adb3eb750e1f301dc8 files/0.10.3-static.cgi.patch 481
+SHA256 492df744973861f98fd1ce5be23abe060baa8d997c65d6379eacd7df27206901 files/0.10.3-static.cgi.patch 481
 AUX clearsilver-0.10.1-fPIC.patch 2384 RMD160 a14cfce02d8bb89143b21f0b131cf99ac3f10e0e SHA1 823dc8d5e5a3306d1a4c22a3f0f8c6bdfea1c860 SHA256 1beb9c2b5eb1c55b4b2eb2ed7b1cf8d3f0aea210b0b55e91a56914efede5bf78
 MD5 67ba91b55c05fa5dc211dfb4dcd8ae0d files/clearsilver-0.10.1-fPIC.patch 2384
 RMD160 a14cfce02d8bb89143b21f0b131cf99ac3f10e0e files/clearsilver-0.10.1-fPIC.patch 2384
@@ -8,6 +20,7 @@ RMD160 38c9e427b6694971870847c74dd4c371cedcf500 files/configure-python24.patch 8
 SHA256 f3f4f4c6c31a00476e41189ab252320600ac20d56d96a555a66703d6b4aab60b files/configure-python24.patch 867
 DIST clearsilver-0.10.1.tar.gz 563655 RMD160 de13a6a58d80b896fe245b5d2d0a0f391390dfd3 SHA1 d18d2b65b8a8f0e7077feb8b6c358519c4113e97 SHA256 430a2e8b0d3020c86554174abcfa5f00d9b4359e3e034dd6a0e542af36b450b5
 DIST clearsilver-0.10.2.tar.gz 584318 RMD160 57601d491e697f0f693019212821d1087d6096b9 SHA1 0459652ef052aa74b53437c5ce188c0d5d9f1cba SHA256 7466a5b2098cf64f3af06179d9fc126b63c6d0e04d8e9f90a9d7d0033105fe4c
+DIST clearsilver-0.10.3.tar.gz 592708 RMD160 95910842194faa67fb5aefcd3b0ed5b20595cfb8 SHA1 0e965010a9a3a7e1c11f4adb85cfc38a687cd9aa SHA256 71d8c6459a4be1912dbc445e2e9d46303be6623cea51563c21abe39c8b5b0bd2
 EBUILD clearsilver-0.10.1.ebuild 1723 RMD160 3cad154f6d714b89be0dfc6b43b1ac89a4fe78f9 SHA1 558a2a3efa62ebfbb7ce41482cc0b2cd3be3edbb SHA256 1f99ecdfb219dd9b052ef0bfa7067beadca686baa08df8c1cfc6355797a58bd3
 MD5 29abb063c48042e9ffe56b50c39c8a84 clearsilver-0.10.1.ebuild 1723
 RMD160 3cad154f6d714b89be0dfc6b43b1ac89a4fe78f9 clearsilver-0.10.1.ebuild 1723
@@ -16,10 +29,18 @@ EBUILD clearsilver-0.10.2.ebuild 1477 RMD160 1feb93cec563800a5083b53501ea143d00a
 MD5 3dc01c2c1c0ee47c3fbc17e1dc291756 clearsilver-0.10.2.ebuild 1477
 RMD160 1feb93cec563800a5083b53501ea143d00a90f45 clearsilver-0.10.2.ebuild 1477
 SHA256 0ae7e68d08775fb2c56e1dcbe1bdbda09b55e1855e913a9662d3cbf02ec55a57 clearsilver-0.10.2.ebuild 1477
-MISC ChangeLog 3988 RMD160 a252403c880b1ce3b40aa3737911316bdb4d09c2 SHA1 2fdb271e7c60ee88cb504369a55cabb9d7a34a8c SHA256 4fa37ba1311dd2d02fd4e41a99151b64b3978d7b72bd5efc365d29013a9eda14
-MD5 d388a75b86f71c0e4ee3075c7a5faf6c ChangeLog 3988
-RMD160 a252403c880b1ce3b40aa3737911316bdb4d09c2 ChangeLog 3988
-SHA256 4fa37ba1311dd2d02fd4e41a99151b64b3978d7b72bd5efc365d29013a9eda14 ChangeLog 3988
+EBUILD clearsilver-0.10.3.ebuild 1702 RMD160 2318486f22cf94b4ae9c8559f5a84c6447935122 SHA1 feb70be39915d9076d52eb8e66b5145a4e7b080a SHA256 f236b93f19ddd4b5e8a5360dee66577f12a9a77f7905a7b52dbce2fbed7bfbd6
+MD5 b98e6a84a86e780b03980ab0c33fd712 clearsilver-0.10.3.ebuild 1702
+RMD160 2318486f22cf94b4ae9c8559f5a84c6447935122 clearsilver-0.10.3.ebuild 1702
+SHA256 f236b93f19ddd4b5e8a5360dee66577f12a9a77f7905a7b52dbce2fbed7bfbd6 clearsilver-0.10.3.ebuild 1702
+MISC .nfs0003c1e700000008 4268 RMD160 6f781d1ea44ca94c3990d796573dff98e73461c4 SHA1 aecfd77d13d9d7bcf8caaec9d068bc137813a124 SHA256 43c5e7bb6e006ecc950796c13f325f29c8599eb3dc19a3e71a47dd8edfaa358a
+MD5 89ddce97d629c8e56e1aaef3f7e679b7 .nfs0003c1e700000008 4268
+RMD160 6f781d1ea44ca94c3990d796573dff98e73461c4 .nfs0003c1e700000008 4268
+SHA256 43c5e7bb6e006ecc950796c13f325f29c8599eb3dc19a3e71a47dd8edfaa358a .nfs0003c1e700000008 4268
+MISC ChangeLog 4263 RMD160 37af667a5da091185e3ab649160f1cd38bad98e4 SHA1 2af77b8e1616b8cbe1e88366b2072bbdb8f0bcb6 SHA256 c27242881e15fd752c2b26b3b8bd6df2034f9e0a104198d2452259e54f42ca90
+MD5 e1a37bd8ab5c896b7990eef1038017af ChangeLog 4263
+RMD160 37af667a5da091185e3ab649160f1cd38bad98e4 ChangeLog 4263
+SHA256 c27242881e15fd752c2b26b3b8bd6df2034f9e0a104198d2452259e54f42ca90 ChangeLog 4263
 MISC metadata.xml 216 RMD160 93b58c3db5dcd051f3c903b712ecdfa48f59db0c SHA1 f8dfddd65f5a588eb55ed7be57a224bf8f52f488 SHA256 0fa5af41c4517f8bf2dbff136d9af93902f5890c45533c101d6c07ce0f430428
 MD5 908db14d15dc92bfbb6aa8ce5b426f46 metadata.xml 216
 RMD160 93b58c3db5dcd051f3c903b712ecdfa48f59db0c metadata.xml 216
@@ -30,3 +51,6 @@ SHA256 32d31339fde1cb05c264943277a99f3cf7f88c0533435d3353375104b2c084bc files/di
 MD5 bcc6b1ed45f190c020d210659de8bfde files/digest-clearsilver-0.10.2 256
 RMD160 fa38a4e2c78483e1af3b91e6a78a372c6e8bcf73 files/digest-clearsilver-0.10.2 256
 SHA256 e2dcbde1b0960e97a77afd8d622d1e527a00a6e30ce39d07911981c0b60ac36e files/digest-clearsilver-0.10.2 256
+MD5 11ac004e934bab76f7e1baaa6316b0d4 files/digest-clearsilver-0.10.3 256
+RMD160 2e6302b8f5727899a4c58a7eea29cc5c14080580 files/digest-clearsilver-0.10.3 256
+SHA256 29038c921804d48c424fab1edb1110810711d715d324852942a8293ea4042934 files/digest-clearsilver-0.10.3 256
diff --git a/dev-libs/clearsilver/clearsilver-0.10.3.ebuild b/dev-libs/clearsilver/clearsilver-0.10.3.ebuild
new file mode 100644
index 000000000000..69902c2a9c2d
--- /dev/null
+++ b/dev-libs/clearsilver/clearsilver-0.10.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.10.3.ebuild,v 1.1 2006/09/27 22:10:30 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
+
+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 ~sparc ~x86 ~x86-fbsd"
+IUSE="perl python zlib"
+
+DEPEND="python? ( dev-lang/python )
+	perl? ( dev-lang/perl )
+	zlib? ( sys-libs/zlib )"
+#	ruby? ( dev-lang/ruby )
+#	java? ( virtual/jdk )
+
+DOCS="README INSTALL"
+
+if use python ; then
+	DOCS="${DOCS} README.python"
+fi
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+
+	# rename static.cgi to something more sensible
+	epatch ${FILESDIR}/${PV}-static.cgi.patch
+	# fix for bug #146026
+	epatch ${FILESDIR}/${PV}-missing-csr.patch
+	# fix for bug #148863
+	use python && epatch ${FILESDIR}/${PV}-PyObject_DEL.patch
+}
+
+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/0.10.3-PyObject_DEL.patch b/dev-libs/clearsilver/files/0.10.3-PyObject_DEL.patch
new file mode 100644
index 000000000000..a75eb2778c62
--- /dev/null
+++ b/dev-libs/clearsilver/files/0.10.3-PyObject_DEL.patch
@@ -0,0 +1,36 @@
+diff -urN clearsilver-0.10.3.orig/python/neo_cgi.c clearsilver-0.10.3/python/neo_cgi.c
+--- clearsilver-0.10.3.orig/python/neo_cgi.c	2006-09-26 15:11:33.000000000 +0200
++++ clearsilver-0.10.3/python/neo_cgi.c	2006-09-26 15:14:24.000000000 +0200
+@@ -57,7 +57,7 @@
+   {
+     cgi_destroy (&(ho->cgi));
+   }
+-  PyMem_DEL(ho);
++  PyObject_DEL(ho);
+ }
+ 
+ PyObject * p_cgi_to_object (CGI *data)
+diff -urN clearsilver-0.10.3.orig/python/neo_cs.c clearsilver-0.10.3/python/neo_cs.c
+--- clearsilver-0.10.3.orig/python/neo_cs.c	2006-09-26 15:11:33.000000000 +0200
++++ clearsilver-0.10.3/python/neo_cs.c	2006-09-26 15:14:39.000000000 +0200
+@@ -54,7 +54,7 @@
+   {
+     cs_destroy (&(ho->data));
+   }
+-  PyMem_DEL(ho);
++  PyObject_DEL(ho);
+ }
+ 
+ PyObject * p_cs_to_object (CSPARSE *data)
+diff -urN clearsilver-0.10.3.orig/python/neo_util.c clearsilver-0.10.3/python/neo_util.c
+--- clearsilver-0.10.3.orig/python/neo_util.c	2006-09-26 15:11:33.000000000 +0200
++++ clearsilver-0.10.3/python/neo_util.c	2006-09-26 15:14:10.000000000 +0200
+@@ -76,7 +76,7 @@
+   {
+     hdf_destroy (&(ho->data));
+   }
+-  PyMem_DEL(ho);
++  PyObject_DEL(ho);
+ }
+ 
+ PyObject * p_hdf_to_object (HDF *data, int dealloc)
diff --git a/dev-libs/clearsilver/files/0.10.3-missing-csr.patch b/dev-libs/clearsilver/files/0.10.3-missing-csr.patch
new file mode 100644
index 000000000000..27ae49abad05
--- /dev/null
+++ b/dev-libs/clearsilver/files/0.10.3-missing-csr.patch
@@ -0,0 +1,10 @@
+--- cs/Makefile.orig	2006-09-02 19:28:05 +0000
++++ cs/Makefile	2006-09-02 19:28:45 +0000
+@@ -91,6 +91,7 @@
+ 	$(INSTALL) -m 644 cs.h $(DESTDIR)$(cs_includedir)/cs
+ 	$(INSTALL) -m 644 $(CS_LIB) $(DESTDIR)$(libdir)
+ 	$(INSTALL) $(CSTEST_EXE) $(DESTDIR)$(bindir)
++	$(INSTALL) $(CSR_EXE) $(DESTDIR)$(bindir)
+ 
+ clean:
+ 	$(RM) core *.o
diff --git a/dev-libs/clearsilver/files/0.10.3-static.cgi.patch b/dev-libs/clearsilver/files/0.10.3-static.cgi.patch
new file mode 100644
index 000000000000..6af4b56e79d3
--- /dev/null
+++ b/dev-libs/clearsilver/files/0.10.3-static.cgi.patch
@@ -0,0 +1,12 @@
+diff -urN clearsilver-0.10.3.orig/cgi/Makefile clearsilver-0.10.3/cgi/Makefile
+--- clearsilver-0.10.3.orig/cgi/Makefile	2006-09-27 23:41:09.000000000 +0200
++++ clearsilver-0.10.3/cgi/Makefile	2006-09-27 23:41:25.000000000 +0200
+@@ -10,7 +10,7 @@
+ CGI_SRC = cgiwrap.c cgi.c html.c date.c rfc2388.c
+ CGI_OBJ = $(CGI_SRC:%.c=%.o)
+ 
+-STATIC_EXE = static.cgi
++STATIC_EXE = cs_static.cgi
+ STATIC_SRC = static.c
+ STATIC_OBJ = $(STATIC_SRC:%.c=%.o)
+ STATIC_CSO = $(STATIC_EXE:%.cgi=%.cso)
diff --git a/dev-libs/clearsilver/files/digest-clearsilver-0.10.3 b/dev-libs/clearsilver/files/digest-clearsilver-0.10.3
new file mode 100644
index 000000000000..3b7d70fe0239
--- /dev/null
+++ b/dev-libs/clearsilver/files/digest-clearsilver-0.10.3
@@ -0,0 +1,3 @@
+MD5 ff4104b0e58bca1b61d528edbd902769 clearsilver-0.10.3.tar.gz 592708
+RMD160 95910842194faa67fb5aefcd3b0ed5b20595cfb8 clearsilver-0.10.3.tar.gz 592708
+SHA256 71d8c6459a4be1912dbc445e2e9d46303be6623cea51563c21abe39c8b5b0bd2 clearsilver-0.10.3.tar.gz 592708