Bumping clearsilver-0.10.1. Removed RESTRICT="nomirror" for this release, as permitted by the licence. Added upstream contact to metadata.xml.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 164 insertions, 16 deletions

diff --git a/dev-libs/clearsilver/ChangeLog b/dev-libs/clearsilver/ChangeLog
index 8ff326627b95..cd10e2922062 100644
--- a/dev-libs/clearsilver/ChangeLog
+++ b/dev-libs/clearsilver/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2005/08/04 21:10:21 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.14 2005/08/29 22:44:39 dju Exp $
+
+*clearsilver-0.10.1 (29 Aug 2005)
+
+  29 Aug 2005; Julien Allanos <dju@gentoo.org>
+  +files/clearsilver-0.10.1-fPIC.patch, +files/configure-python24.patch,
+  metadata.xml, +clearsilver-0.10.1.ebuild:
+  Bumping clearsilver-0.10.1. Removed RESTRICT="nomirror" for this release,
+  as permitted by the licence. Added upstream contact to metadata.xml.
 
 *clearsilver-0.9.14-r1 (04 Aug 2005)
 
diff --git a/dev-libs/clearsilver/Manifest b/dev-libs/clearsilver/Manifest
index e6af337f5116..dbc1e0a4df7a 100644
--- a/dev-libs/clearsilver/Manifest
+++ b/dev-libs/clearsilver/Manifest
@@ -1,22 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ea47b883c6d7ab3027bfce43e6daa863 clearsilver-0.9.14.ebuild 1832
+MD5 7b32c4602a489fe70dc1b29b8cf66470 clearsilver-0.10.1.ebuild 1670
 MD5 ad68da3ab962d3aafb89a660ecc33284 clearsilver-0.9.7.ebuild 2249
-MD5 aab6da2a83eb6c53287bfe96840095c4 ChangeLog 2045
-MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220
+MD5 63955ce8356d18228adab6da9ad99190 ChangeLog 2390
+MD5 a9ab8b66105d9636c9a5be8d4d20ee18 metadata.xml 274
 MD5 14b703e1a4838014bfe2a3e313948b17 clearsilver-0.9.14-r1.ebuild 1892
 MD5 478f0f67e9ea8486fbea128e5c80dd24 files/digest-clearsilver-0.9.7 69
 MD5 4c227dbc14edacb199c6a4df09c64fce files/0.9.7-python.patch 391
+MD5 e23c35c14e1c418835c33683eae9d7b9 files/digest-clearsilver-0.10.1 70
 MD5 b549fb2f91db6d0719294ae1ef45345b files/digest-clearsilver-0.9.14 70
 MD5 98ca2a60a7171f98d9a37f1e8cc56ba2 files/clearsilver-0.9.7-python24.patch 888
 MD5 50cea20dc6a84df4ce015e7d821e97d2 files/clearsilver-0.9.14-python24.patch 867
 MD5 b549fb2f91db6d0719294ae1ef45345b files/digest-clearsilver-0.9.14-r1 70
 MD5 d648fb3213edc267b7f415eb9be4d781 files/clearsilver-0.9.14-fPIC.patch 2942
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC8oRM2G5bA0cA/ScRApk/AJ42yCeKeb8ITqexMu6XTxNXjS0i+QCgo4I+
-z6T2xyqsZGHfs44g7r1k7uY=
-=RkAF
------END PGP SIGNATURE-----
+MD5 67ba91b55c05fa5dc211dfb4dcd8ae0d files/clearsilver-0.10.1-fPIC.patch 2384
+MD5 50cea20dc6a84df4ce015e7d821e97d2 files/configure-python24.patch 867
diff --git a/dev-libs/clearsilver/clearsilver-0.10.1.ebuild b/dev-libs/clearsilver/clearsilver-0.10.1.ebuild
new file mode 100644
index 000000000000..fd56e7b03fc3
--- /dev/null
+++ b/dev-libs/clearsilver/clearsilver-0.10.1.ebuild
@@ -0,0 +1,67 @@
+# 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.10.1.ebuild,v 1.1 2005/08/29 22:44:39 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 python
+
+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"
+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}
+	epatch ${FILESDIR}/configure-python24.patch
+	epatch ${FILESDIR}/${P}-fPIC.patch
+	sed -i s,bin/httpd,bin/apache,g configure || die "sed failed"
+	chmod 755 config.*
+}
+
+src_compile() {
+#	local jdkhome=`java-config -O`
+#	use java && myconf="${myconf} --with-java=${jdkhome}" \
+
+	econf \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable zlib compression) \
+		"--disable-apache" \
+		"--disable-ruby" \
+		"--disable-java" \
+		"--disable-csharp" \
+		|| die "./configure failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	cd ${S}
+	sed -i s,/usr/local,/usr, scripts/document.py
+	python_version
+	sed -i s,/usr/lib/portage/pym,/usr/lib/python${PYVER}/site-packages, rules.mk
+	make DESTDIR=${D} install || die "make install failed"
+
+	dodoc ${DOCS}
+}
diff --git a/dev-libs/clearsilver/files/clearsilver-0.10.1-fPIC.patch b/dev-libs/clearsilver/files/clearsilver-0.10.1-fPIC.patch
new file mode 100644
index 000000000000..1652d8b9e4bb
--- /dev/null
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.1-fPIC.patch
@@ -0,0 +1,59 @@
+diff -urN clearsilver-0.10.1.orig/cgi/Makefile clearsilver-0.10.1/cgi/Makefile
+--- clearsilver-0.10.1.orig/cgi/Makefile	2005-08-28 21:20:03.154672096 +0000
++++ clearsilver-0.10.1/cgi/Makefile	2005-08-28 21:22:22.077552608 +0000
+@@ -15,6 +15,7 @@
+ STATIC_OBJ = $(STATIC_SRC:%.c=%.o)
+ STATIC_CSO = $(STATIC_EXE:%.cgi=%.cso)
+ 
++CFLAGS += -fPIC
+ DLIBS += -lneo_cgi -lneo_cs -lneo_utl # -lefence
+ 
+ TARGETS = $(CGI_LIB) $(STATIC_EXE) $(STATIC_CSO)
+diff -urN clearsilver-0.10.1.orig/cs/Makefile clearsilver-0.10.1/cs/Makefile
+--- clearsilver-0.10.1.orig/cs/Makefile	2005-08-28 21:20:03.141674072 +0000
++++ clearsilver-0.10.1/cs/Makefile	2005-08-28 21:22:42.327474152 +0000
+@@ -22,7 +22,7 @@
+ CSDUMP_SRC = csdump.c
+ CSDUMP_OBJ = $(CSDUMP_SRC:%.c=%.o)
+ 
+-CFLAGS += -I$(NEOTONIC_ROOT)
++CFLAGS += -I$(NEOTONIC_ROOT) -fPIC
+ LIBS += -L$(LIB_DIR) -lneo_cs -lneo_utl # -lefence
+ 
+ TARGETS = $(CS_LIB) $(CSTEST_EXE) $(CSR_EXE) test
+diff -urN clearsilver-0.10.1.orig/java-jni/Makefile clearsilver-0.10.1/java-jni/Makefile
+--- clearsilver-0.10.1.orig/java-jni/Makefile	2005-08-28 21:20:03.170669664 +0000
++++ clearsilver-0.10.1/java-jni/Makefile	2005-08-28 21:23:03.941188368 +0000
+@@ -16,7 +16,7 @@
+ NEO_UTIL_OBJ = $(NEO_UTIL_SRC:%.c=%.o)
+ 
+ 
+-CFLAGS += -I$(NEOTONIC_ROOT) -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux
++CFLAGS += -I$(NEOTONIC_ROOT) -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux -fPIC
+ DLIBS += -lneo_cgi -lneo_cs -lneo_utl 
+ LIBS += -L$(LIB_DIR) $(DLIBS)
+ 
+diff -urN clearsilver-0.10.1.orig/python/Makefile clearsilver-0.10.1/python/Makefile
+--- clearsilver-0.10.1.orig/python/Makefile	2005-08-28 21:20:03.156671792 +0000
++++ clearsilver-0.10.1/python/Makefile	2005-08-28 21:23:24.182111280 +0000
+@@ -11,7 +11,7 @@
+ NEO_UTIL_SRC = neo_cgi.c neo_util.c neo_cs.c
+ NEO_UTIL_OBJ = $(NEO_UTIL_SRC:%.c=%.o)
+ 
+-CFLAGS += -I$(NEOTONIC_ROOT) $(PYTHON_INC)
++CFLAGS += -I$(NEOTONIC_ROOT) $(PYTHON_INC) -fPIC
+ DLIBS += -lneo_cgi -lneo_cs -lneo_utl 
+ LIBS += -L$(LIB_DIR) $(DLIBS) $(DB2_LIB)
+ 
+diff -urN clearsilver-0.10.1.orig/util/Makefile clearsilver-0.10.1/util/Makefile
+--- clearsilver-0.10.1.orig/util/Makefile	2005-08-28 21:20:03.128676048 +0000
++++ clearsilver-0.10.1/util/Makefile	2005-08-28 21:25:26.469520768 +0000
+@@ -13,6 +13,8 @@
+ UTL_OBJ = $(UTL_SRC:%.c=%.o) $(EXTRA_UTL_OBJS)
+ UTL_HDR = $(UTL_SRC:%.c=%.h)
+ 
++CFLAGS += -fPIC
++
+ TARGETS = $(UTL_LIB)
+ 
+ all: $(TARGETS)
diff --git a/dev-libs/clearsilver/files/configure-python24.patch b/dev-libs/clearsilver/files/configure-python24.patch
new file mode 100644
index 000000000000..abaac5092f22
--- /dev/null
+++ b/dev-libs/clearsilver/files/configure-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 "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)"`
+     BUILD_WRAPPERS="$BUILD_WRAPPERS python"
+   fi
+ fi
diff --git a/dev-libs/clearsilver/files/digest-clearsilver-0.10.1 b/dev-libs/clearsilver/files/digest-clearsilver-0.10.1
new file mode 100644
index 000000000000..fa2cd7327b88
--- /dev/null
+++ b/dev-libs/clearsilver/files/digest-clearsilver-0.10.1
@@ -0,0 +1 @@
+MD5 02f52354728c1f3603ce4d02a1eec824 clearsilver-0.10.1.tar.gz 563655
diff --git a/dev-libs/clearsilver/metadata.xml b/dev-libs/clearsilver/metadata.xml
index f1850ed53c18..ae5e8e00c525 100644
--- a/dev-libs/clearsilver/metadata.xml
+++ b/dev-libs/clearsilver/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>web-apps</herd>
-<maintainer>
-  <email>dju@gentoo.org</email>
-</maintainer>
+<maintainer><email>dju@gentoo.org</email></maintainer>
+<maintainer><email>blong@fiction.net</email></maintainer>
 </pkgmetadata>