From 1033e057dd72e23be7c2acae3d77fd800546adcd Mon Sep 17 00:00:00 2001 From: Julien Allanos Date: Sun, 5 Feb 2006 21:42:34 +0000 Subject: Version bump to 0.10.2, closes bug #119159. Removed old ebuild. (Portage version: 2.0.54) --- dev-libs/clearsilver/ChangeLog | 10 ++- dev-libs/clearsilver/Manifest | 2 + dev-libs/clearsilver/clearsilver-0.10.2.ebuild | 65 +++++++++++++++++++ dev-libs/clearsilver/clearsilver-0.9.14-r1.ebuild | 70 --------------------- .../files/clearsilver-0.9.14-fPIC.patch | 73 ---------------------- .../files/clearsilver-0.9.14-python24.patch | 20 ------ .../clearsilver/files/digest-clearsilver-0.10.2 | 1 + .../clearsilver/files/digest-clearsilver-0.9.14-r1 | 1 - 8 files changed, 77 insertions(+), 165 deletions(-) create mode 100644 dev-libs/clearsilver/clearsilver-0.10.2.ebuild delete mode 100644 dev-libs/clearsilver/clearsilver-0.9.14-r1.ebuild delete mode 100644 dev-libs/clearsilver/files/clearsilver-0.9.14-fPIC.patch delete mode 100644 dev-libs/clearsilver/files/clearsilver-0.9.14-python24.patch create mode 100644 dev-libs/clearsilver/files/digest-clearsilver-0.10.2 delete mode 100644 dev-libs/clearsilver/files/digest-clearsilver-0.9.14-r1 (limited to 'dev-libs') diff --git a/dev-libs/clearsilver/ChangeLog b/dev-libs/clearsilver/ChangeLog index a73ab5589259..82efa27bf08d 100644 --- a/dev-libs/clearsilver/ChangeLog +++ b/dev-libs/clearsilver/ChangeLog @@ -1,6 +1,14 @@ # 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.22 2006/01/12 22:56:36 dju Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.23 2006/02/05 21:42:33 dju Exp $ + +*clearsilver-0.10.2 (05 Feb 2006) + + 05 Feb 2006; Julien Allanos + -files/clearsilver-0.9.14-fPIC.patch, + -files/clearsilver-0.9.14-python24.patch, -clearsilver-0.9.14-r1.ebuild, + +clearsilver-0.10.2.ebuild: + Version bump to 0.10.2, closes bug #119159. Removed old ebuild. 12 Jan 2006; Julien Allanos metadata.xml: Removed upstream from metadata.xml. diff --git a/dev-libs/clearsilver/Manifest b/dev-libs/clearsilver/Manifest index 95fbf03bd9d9..fe94186a5b18 100644 --- a/dev-libs/clearsilver/Manifest +++ b/dev-libs/clearsilver/Manifest @@ -1,10 +1,12 @@ MD5 4a0d2114f917a5736d74443f3948c1d3 ChangeLog 3576 MD5 29abb063c48042e9ffe56b50c39c8a84 clearsilver-0.10.1.ebuild 1723 +MD5 c9263fd6d19e1704fb6863492d58674a clearsilver-0.10.2.ebuild 1357 MD5 7f16986964706012fed064252af5ec8d clearsilver-0.9.14-r1.ebuild 1700 MD5 67ba91b55c05fa5dc211dfb4dcd8ae0d files/clearsilver-0.10.1-fPIC.patch 2384 MD5 d648fb3213edc267b7f415eb9be4d781 files/clearsilver-0.9.14-fPIC.patch 2942 MD5 50cea20dc6a84df4ce015e7d821e97d2 files/clearsilver-0.9.14-python24.patch 867 MD5 50cea20dc6a84df4ce015e7d821e97d2 files/configure-python24.patch 867 MD5 e23c35c14e1c418835c33683eae9d7b9 files/digest-clearsilver-0.10.1 70 +MD5 4656167f71fc08ddc3a706fd4c488568 files/digest-clearsilver-0.10.2 70 MD5 b549fb2f91db6d0719294ae1ef45345b files/digest-clearsilver-0.9.14-r1 70 MD5 908db14d15dc92bfbb6aa8ce5b426f46 metadata.xml 216 diff --git a/dev-libs/clearsilver/clearsilver-0.10.2.ebuild b/dev-libs/clearsilver/clearsilver-0.10.2.ebuild new file mode 100644 index 000000000000..2ef61c2a946c --- /dev/null +++ b/dev-libs/clearsilver/clearsilver-0.10.2.ebuild @@ -0,0 +1,65 @@ +# 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.2.ebuild,v 1.1 2006/02/05 21:42:33 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" +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} + + # fix typo in configure + sed -i s,\$\?PYTHON_SITE,\$PYTHON_SITE, configure || die "sed failed" +} + +src_compile() { + econf \ + $(use_enable perl) \ + $(use_enable 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/clearsilver-0.9.14-r1.ebuild b/dev-libs/clearsilver/clearsilver-0.9.14-r1.ebuild deleted file mode 100644 index 1ff14146ca50..000000000000 --- a/dev-libs/clearsilver/clearsilver-0.9.14-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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.9.14-r1.ebuild,v 1.5 2005/11/28 13:20:49 mcummings 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 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" -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}/${P}-python24.patch - epatch ${FILESDIR}/${P}-fPIC.patch - sed -i s,bin/httpd,bin/apache,g configure || die "sed failed" -} - -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} - - if use perl ; then - fixlocalpod - fi -} diff --git a/dev-libs/clearsilver/files/clearsilver-0.9.14-fPIC.patch b/dev-libs/clearsilver/files/clearsilver-0.9.14-fPIC.patch deleted file mode 100644 index 969c3c816d34..000000000000 --- a/dev-libs/clearsilver/files/clearsilver-0.9.14-fPIC.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -urN clearsilver-0.9.14.orig/cgi/Makefile clearsilver-0.9.14/cgi/Makefile ---- clearsilver-0.9.14.orig/cgi/Makefile 2005-01-11 21:55:41.000000000 +0000 -+++ clearsilver-0.9.14/cgi/Makefile 2005-08-04 21:53:11.000000000 +0100 -@@ -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.9.14.orig/cs/Makefile clearsilver-0.9.14/cs/Makefile ---- clearsilver-0.9.14.orig/cs/Makefile 2004-08-05 02:39:01.000000000 +0100 -+++ clearsilver-0.9.14/cs/Makefile 2005-08-04 21:54:32.000000000 +0100 -@@ -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.9.14.orig/java-jni/Makefile clearsilver-0.9.14/java-jni/Makefile ---- clearsilver-0.9.14.orig/java-jni/Makefile 2003-11-05 00:42:27.000000000 +0000 -+++ clearsilver-0.9.14/java-jni/Makefile 2005-08-04 21:31:54.000000000 +0100 -@@ -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.9.14.orig/python/Makefile clearsilver-0.9.14/python/Makefile ---- clearsilver-0.9.14.orig/python/Makefile 2004-02-27 03:34:39.000000000 +0000 -+++ clearsilver-0.9.14/python/Makefile 2005-08-04 21:30:34.000000000 +0100 -@@ -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.9.14.orig/rules.mk.in clearsilver-0.9.14/rules.mk.in ---- clearsilver-0.9.14.orig/rules.mk.in 2004-11-16 23:05:10.000000000 +0000 -+++ clearsilver-0.9.14/rules.mk.in 2005-08-04 21:49:50.000000000 +0100 -@@ -78,8 +78,8 @@ - OUTPUT_OPTION = -o $@ - LD = $(CC) -o - LDFLAGS = -L$(LIB_DIR) @LDFLAGS@ --LDSHARED = $(CC) -shared -fPic --CPPLDSHARED = $(CPP) -shared -fPic -+LDSHARED = $(CC) -shared -fPIC -+CPPLDSHARED = $(CPP) -shared -fPIC - AR = @AR@ cr - RANLIB = @RANLIB@ - DEP_LIBS = $(DLIBS:-l%=$(LIB_DIR)lib%.a) -diff -urN clearsilver-0.9.14.orig/util/Makefile clearsilver-0.9.14/util/Makefile ---- clearsilver-0.9.14.orig/util/Makefile 2003-07-25 06:46:15.000000000 +0100 -+++ clearsilver-0.9.14/util/Makefile 2005-08-04 21:56:12.000000000 +0100 -@@ -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/clearsilver-0.9.14-python24.patch b/dev-libs/clearsilver/files/clearsilver-0.9.14-python24.patch deleted file mode 100644 index abaac5092f22..000000000000 --- a/dev-libs/clearsilver/files/clearsilver-0.9.14-python24.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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.2 b/dev-libs/clearsilver/files/digest-clearsilver-0.10.2 new file mode 100644 index 000000000000..d6fed027540d --- /dev/null +++ b/dev-libs/clearsilver/files/digest-clearsilver-0.10.2 @@ -0,0 +1 @@ +MD5 10e19526e87b712068e9073469b10d94 clearsilver-0.10.2.tar.gz 584318 diff --git a/dev-libs/clearsilver/files/digest-clearsilver-0.9.14-r1 b/dev-libs/clearsilver/files/digest-clearsilver-0.9.14-r1 deleted file mode 100644 index 20f10c0b849e..000000000000 --- a/dev-libs/clearsilver/files/digest-clearsilver-0.9.14-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 2161936b7828e8cbdc4f45812d15e3f6 clearsilver-0.9.14.tar.gz 366041 -- cgit v1.2.3-65-gdbad