diff options
| -rw-r--r-- | dev-libs/clearsilver/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/clearsilver/Manifest | 10 | ||||
| -rw-r--r-- | dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild | 43 |
3 files changed, 34 insertions, 26 deletions
diff --git a/dev-libs/clearsilver/ChangeLog b/dev-libs/clearsilver/ChangeLog index 11fdfe69d8b1..467885e9a680 100644 --- a/dev-libs/clearsilver/ChangeLog +++ b/dev-libs/clearsilver/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/clearsilver -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.41 2011/03/26 10:47:23 tove Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.42 2012/03/16 02:32:59 floppym Exp $ + + 16 Mar 2012; Mike Gilbert <floppym@gentoo.org> clearsilver-0.10.5-r1.ebuild: + Python-related improvements by Arfrever. Bug 312179. 26 Mar 2011; Torsten Veller <tove@gentoo.org> -clearsilver-0.10.5.ebuild: Cleanup diff --git a/dev-libs/clearsilver/Manifest b/dev-libs/clearsilver/Manifest index c341be1bb489..2a5874f25a29 100644 --- a/dev-libs/clearsilver/Manifest +++ b/dev-libs/clearsilver/Manifest @@ -5,13 +5,13 @@ AUX clearsilver-0.10.5-libdir.patch 693 RMD160 681c05d73d7679a0021e5231ae23fc2f7 AUX clearsilver-0.10.5-libz.patch 276 RMD160 6188b48684c8051a6b3b4a696138ce72a3730507 SHA1 7d5f0bcb34221fd14965cf7611f748ef8a04d031 SHA256 51e769a619a23aff2b2a26e17954eba6cd3101f581b1807465226f55e0f42d02 AUX clearsilver-0.10.5-perl_installdir.patch 857 RMD160 614eff88f66b68d930ad622d47733886e8737bed SHA1 160db766b139e5432e234684b06d32cc44ad2fe1 SHA256 d08fc906d7cec21419166b2de962e1fc0485445552d03fc16024125094285212 DIST clearsilver-0.10.5.tar.gz 439190 RMD160 bd5c616f326b544df8a74eec71a98a474b408249 SHA1 138865dc91e27328fe29fcaaac1bc6558f19dd75 SHA256 1e9da038deafddd3d0c1c510626c28be5a0f4f17b9091d577fd30e7c5ba88680 -EBUILD clearsilver-0.10.5-r1.ebuild 1771 RMD160 93c3a23376209cde5dda5632fc5ce7df30af92ca SHA1 401af2610c1932f43f19fcf208eff3882ad7e824 SHA256 1b1b4ab638cba8135937996f831c4718d7fad6b7d24072fa2f807bb83dbdb56b -MISC ChangeLog 6406 RMD160 882f1dc924b0efe4130b95b1d6cd50b9600b03ed SHA1 a95d8b66c66847aaa338d51caef91a291f701b49 SHA256 01bb1aeee2d7a3828c384174f32b4d62924c79958580659c8c620620d7cee5e3 +EBUILD clearsilver-0.10.5-r1.ebuild 1752 RMD160 9052b5fcc27e62e593d8d81dda3d31b24fcf9043 SHA1 a0820a0d1194bbb7238dd88b7f242f06f3fd8da7 SHA256 083074ef38ec1f1f21a0ffaa1162ff0176f985246628df3cb0daa7cb6189c9ed +MISC ChangeLog 6544 RMD160 edf14f835f525104ebb9f0c55efac1ffef70286e SHA1 80f8ca78ab9d6b7eecf95c4b6dc620a217d8acc8 SHA256 33aadb90265bd9a49cc7edd88c1129f3db6b6ad2e7d9092971ec91bf49d881fe MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk2NxEAACgkQV3J2n04EauxFvwCgyt2dKOaZIhbOTeDgvStuFakR -yNgAn17PqNFomvhf0yQczGv1YTeOnb9Z -=c4Qv +iF4EAREIAAYFAk9ipmEACgkQC77qH+pIQ6RPXAD/Y4GxCOn95nAWOfNMhVJLiD0q +Oad+tbBQ5H7TDNqU9bUA/2DLTT8i36lC/Do3FIZOEf2xWLYVErPJ+Vtk1DoK+IeD +=FCww -----END PGP SIGNATURE----- diff --git a/dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild b/dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild index a8718d15a3ce..eebbd8386f63 100644 --- a/dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild +++ b/dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild @@ -1,13 +1,17 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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-r1.ebuild,v 1.4 2011/03/26 10:37:55 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild,v 1.5 2012/03/16 02:32:59 floppym 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 +EAPI="4" +GENTOO_DEPEND_ON_PERL="no" +PYTHON_DEPEND="python? 2" + +inherit autotools eutils multilib perl-app python DESCRIPTION="Clearsilver is a fast, powerful, and language-neutral HTML template system." HOMEPAGE="http://www.clearsilver.net/" @@ -18,20 +22,22 @@ SLOT="0" KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE="perl python zlib" -DEPEND="python? ( dev-lang/python ) - perl? ( dev-lang/perl ) +DEPEND="perl? ( dev-lang/perl ) zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" -DOCS="README INSTALL" +DOCS=(README INSTALL) -if use python ; then - DOCS="${DOCS} README.python" -fi +pkg_setup() { + if use python; then + DOCS+=(README.python) -src_unpack() { - unpack ${A} - cd "${S}" + python_set_active_version 2 + python_pkg_setup + fi +} +src_prepare() { epatch "${FILESDIR}"/${P}-perl_installdir.patch use zlib && epatch "${FILESDIR}"/${P}-libz.patch @@ -44,7 +50,7 @@ src_unpack() { [[ "${ARCH}" == FreeBSD ]] && touch ${S}/features.h ${S}/cgi/features.h } -src_compile() { +src_configure() { econf \ $(use_enable perl) \ $(use_with perl perl /usr/bin/perl) \ @@ -54,16 +60,15 @@ src_compile() { "--disable-apache" \ "--disable-ruby" \ "--disable-java" \ - "--disable-csharp" \ - || die "./configure failed" + "--disable-csharp" +} - emake || die "emake failed" +src_compile() { + default } src_install () { - make DESTDIR="${D}" install || die "make install failed" - - dodoc ${DOCS} || die "dodoc failed" + default if use perl ; then fixlocalpod || die "fixlocalpod failed" |