diff options
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/cherokee/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/cherokee/Manifest | 8 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-1.0.9.ebuild | 156 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-1.2.0.ebuild (renamed from www-servers/cherokee/cherokee-1.0.10.ebuild) | 13 |
4 files changed, 17 insertions, 168 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog index fd648daea626..11d7e569bcbb 100644 --- a/www-servers/cherokee/ChangeLog +++ b/www-servers/cherokee/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/cherokee # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.79 2010/12/02 13:55:12 bass Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.80 2011/02/22 21:25:44 bass Exp $ + +*cherokee-1.2.0 (22 Feb 2011) + + 22 Feb 2011; J. Alberto Suárez López <bass@gentoo.org> + -cherokee-1.0.9.ebuild -cherokee-1.0.10.ebuild, +cherokee-1.2.0.ebuild: + version bump *cherokee-1.0.12 (02 Dec 2010) diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest index a3b6b1d81be0..0e3d420f01a8 100644 --- a/www-servers/cherokee/Manifest +++ b/www-servers/cherokee/Manifest @@ -1,9 +1,7 @@ AUX cherokee-initd-0.99.23 542 RMD160 e0ee20b7bb781797c3a53d0e2804e8b0fe985beb SHA1 4a8b43509aa4b9bf1079e0e74ca9d61428672522 SHA256 9e58ed7b3050a17fed08cc682e30dfa14e09eb804084b6cc9b213ccd0843300f -DIST cherokee-1.0.10.tar.gz 5689814 RMD160 ebe6f025fe7f9d345de0543ca34cd7023dd1d1e1 SHA1 5a316c79c31f49744879863a18611af3fb7d3137 SHA256 688b8112506c2692cd0547dc9f4dc0837aa1a4b38d077ec3dacef3acacbe474d DIST cherokee-1.0.12.tar.gz 5710898 RMD160 21022ac54c32324d3d738e7afb104aa76c96374f SHA1 6a514ea6816252400c777cca4d91658575f49091 SHA256 37fbece8df5af26773710100f85008a9d65e3f363885ce7228f32e882b21fc75 -DIST cherokee-1.0.9.tar.gz 5784929 RMD160 ce6502fe2847c0b3a254368e836efcb761b29460 SHA1 fd04b5eb0b6cdc1074e52690bb36f2a1a34d33dc SHA256 ab637e411717a57545f374e0c44b1e1ecb421e0a57a70f5fb456029631c4db46 -EBUILD cherokee-1.0.10.ebuild 4156 RMD160 21beb914a6ddef61e38cbfe377f450d75fb23eac SHA1 926402f376acf82f7182ee9cff55e7e668785b8f SHA256 427deffcafe60cc855ef7bdf0170eafbd76635774fcd62a108321a8e5da30857 +DIST cherokee-1.2.0.tar.gz 5898536 RMD160 e0b9f7af51cf21c94130b3ad3b106821cd35c3b9 SHA1 af8e4ee0e3dce59db86855a59aa0724ca0cfb331 SHA256 835df63bc97324d9a27d9bf3980de25cddae3edc55a2c72b01dc721ac604076a EBUILD cherokee-1.0.12.ebuild 4156 RMD160 475282d32ea58f162b0f1be3a3f2d2fbc0095e9e SHA1 3fc8153a4bae50ededd663efe2c4f83b7e992bdb SHA256 c339938504c78a2ef35abc4eca5045a69f9ef9ab989ada8b5fb3e0c2896f26e3 -EBUILD cherokee-1.0.9.ebuild 4155 RMD160 0599855ec44c4ddfaedfa15bb87955dad9ba9c5d SHA1 502a413d7c0d04d6a4f96353679633990f2b4ef5 SHA256 7d2beefa7032184d44a0d61ba3d0e010f6f2bda4740c36e4723fb34625243d80 -MISC ChangeLog 18957 RMD160 6eabf14b4d70a4bf609663c758aabf11b31722d6 SHA1 32cd876449033742e581b6402873ac33b2866ce4 SHA256 bef8f7a6657d5f653fd5a16fff8db7ff9ae2b2d5ecdc69b2e52ff945dd283fee +EBUILD cherokee-1.2.0.ebuild 4175 RMD160 a6c6f5f3c41516de8430c1544fee0b9d8e58054f SHA1 39aa6f7679f74de3328c53456be89483158cfdd4 SHA256 2f73cf67b8e6237a0479f79bd7ca31fe8588297b0272b2ef75dff5bc86f4ef70 +MISC ChangeLog 19137 RMD160 871be549bf7bbc7aa1294de112e603a473772227 SHA1 4e971eb50fe4249e7077f538ceb793a055532c9e SHA256 7f8c0481e36fc79d402326f969d092e6475feb2c9cb9f19aae7fc7f51daf38fc MISC metadata.xml 488 RMD160 6689708f9508ed17b4f67284e8fef3512161b432 SHA1 c7a8168a8e6b119bee60b536552f378cf670130b SHA256 4ee7f5937c157209c4d78429188bcfc36b9c063252760215ce2e70da1ff95496 diff --git a/www-servers/cherokee/cherokee-1.0.9.ebuild b/www-servers/cherokee/cherokee-1.0.9.ebuild deleted file mode 100644 index c1c2bf794516..000000000000 --- a/www-servers/cherokee/cherokee-1.0.9.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.9.ebuild,v 1.1 2010/11/18 10:30:59 bass Exp $ - -EAPI=2 -PYTHON_DEPEND="admin? 2" - -inherit python eutils pam versionator libtool - -DESCRIPTION="An extremely fast and tiny web server." -SRC_URI="http://www.cherokee-project.com/download/$(get_version_component_range 1-2)/${PV}/${P}.tar.gz" -HOMEPAGE="http://www.cherokee-project.com/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="ipv6 nls ssl static pam coverpage threads kernel_linux admin debug geoip -ldap mysql ffmpeg fastcgi rrdtool" - -RDEPEND=" - >=sys-libs/zlib-1.1.4-r1 - rrdtool? ( net-analyzer/rrdtool ) - nls? ( sys-devel/gettext ) - ssl? ( dev-libs/openssl ) - pam? ( virtual/pam ) - geoip? ( dev-libs/geoip ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - fastcgi? ( www-servers/spawn-fcgi ) - ffmpeg? ( media-video/ffmpeg )" -DEPEND="${RDEPEND}" - -src_prepare() { - python_convert_shebangs -r 2 . -} - -src_configure() { - local myconf - - if use static ; then - myconf="${myconf} --enable-static --enable-static-module=all" - else - myconf="${myconf} --disable-static" - fi - - if use debug ; then - myconf="${myconf} --enable-trace" - fi - - local os="Unknown" - case "${CHOST}" in - *-freebsd*) - os="FreeBSD" ;; - *-netbsd*) - os="NetBSD" ;; - *-openbsd*) - os="OpenBSD" ;; - *) - os="Linux" ;; - esac - - # No options to enable or disable ssl since Cherokee 0.11 - econf \ - ${myconf} \ - $(use_enable pam) \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_enable threads pthread) \ - $(use_enable kernel_linux epoll) \ - $(use_with geoip) \ - $(use_with ldap) \ - $(use_with mysql) \ - $(use_with ffmpeg) \ - --disable-dependency-tracking \ - --enable-os-string="Gentoo ${os}" \ - --with-wwwroot=/var/www/localhost/htdocs \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - || die "configure failed" -} - -src_compile() { - emake -j1 || die "emake failed" -} - -src_install () { - emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed" - - dodoc AUTHORS ChangeLog - - use pam && pamd_mimic system-auth cherokee auth account session - newinitd "${FILESDIR}/${PN}-initd-0.99.23" ${PN} || die "newinitd failed" - - dodir /usr/share/doc/${PF}/contrib - insinto /usr/share/${PF}/contrib - doins contrib/07to08.py - doins contrib/08to09.py - doins contrib/09to010.py - doins contrib/011to098.py - doins contrib/098to099.py - doins contrib/0999to09910.py - doins contrib/make-cert.sh - - keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs - - use coverpage || rm -rf "${D}"/var/www/localhost/htdocs/{index.html,images} - if use admin ; then - exeinto /usr/share/cherokee/admin - doexe admin/server.py - else - rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin - fi - - # Puts logs in /var/log/cherokee/ - dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf - -} - -pkg_setup() { - python_set_active_version 2 -} - -pkg_postinst() { - enewgroup cherokee - enewuser cherokee -1 -1 /var/www/localhost cherokee - install -o cherokee -g cherokee -m0775 -d "${ROOT}"var/log/cherokee - - # check if user/group was defined if not add it - gr="/bin/grep -q" - ec="/bin/echo" - $gr server\!user /etc/cherokee/cherokee.conf ; rtu=$? - $gr server\!group /etc/cherokee/cherokee.conf ; rtg=$? - - [[ "x$rtu" == "x1" ]] && $ec server\!user = cherokee >> /etc/cherokee/cherokee.conf - [[ "x$rtg" == "x1" ]] && $ec server\!group = cherokee >> /etc/cherokee/cherokee.conf - - if use admin ; then - echo "" - elog "Just run 'cherokee-admin' and go to: http://localhost:9090" - echo "" - else - echo "" - elog "Try USE=admin if you want an easy way to configure cherokee." - echo "" - fi - - echo "" - elog "Config format can change in different versions. Check converter script in:" - elog " /usr/share/cherokee-0.99.15/contrib/" - elog "for example:" - elog " PYTHONPATH="/usr/share/cherokee/admin/" python \\" - elog " /usr/share/cherokee-0.99.15/contrib/0999to09910.py \\" - elog " /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15" - -} diff --git a/www-servers/cherokee/cherokee-1.0.10.ebuild b/www-servers/cherokee/cherokee-1.2.0.ebuild index 4c6350c63d94..9b9d248feedf 100644 --- a/www-servers/cherokee/cherokee-1.0.10.ebuild +++ b/www-servers/cherokee/cherokee-1.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.10.ebuild,v 1.1 2010/11/25 12:56:01 bass Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.0.ebuild,v 1.1 2011/02/22 21:25:44 bass Exp $ EAPI=2 PYTHON_DEPEND="admin? 2" @@ -14,8 +14,7 @@ HOMEPAGE="http://www.cherokee-project.com/" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="ipv6 nls ssl static pam coverpage threads kernel_linux admin debug geoip -ldap mysql ffmpeg fastcgi rrdtool" +IUSE="ipv6 nls ssl static pam coverpage kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi rrdtool" RDEPEND=" >=sys-libs/zlib-1.1.4-r1 @@ -60,12 +59,14 @@ src_configure() { esac # No options to enable or disable ssl since Cherokee 0.11 + + # This make cherokee 1.2 sad + # $(use_enable threads pthread) \ econf \ ${myconf} \ $(use_enable pam) \ $(use_enable ipv6) \ $(use_enable nls) \ - $(use_enable threads pthread) \ $(use_enable kernel_linux epoll) \ $(use_with geoip) \ $(use_with ldap) \ @@ -81,7 +82,7 @@ src_configure() { } src_compile() { - emake -j1 || die "emake failed" + emake || die "emake failed" } src_install () { |