diff options
| -rw-r--r-- | www-servers/cherokee/ChangeLog | 10 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-0.99.30.ebuild | 121 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-0.99.42.ebuild | 136 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-0.99.44.ebuild | 136 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-0.99.48.ebuild | 136 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-1.0.4.ebuild (renamed from www-servers/cherokee/cherokee-1.0.0.ebuild) | 18 |
6 files changed, 23 insertions, 534 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog index b10f39e467e1..5713837ed184 100644 --- a/www-servers/cherokee/ChangeLog +++ b/www-servers/cherokee/ChangeLog @@ -1,6 +1,14 @@ # 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.67 2010/06/16 11:54:54 bass Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.68 2010/06/23 09:56:09 bass Exp $ + +*cherokee-1.0.4 (23 Jun 2010) + + 23 Jun 2010; J. Alberto Suárez López <bass@gentoo.org> + -cherokee-0.99.30.ebuild, -cherokee-0.99.42.ebuild, + -cherokee-0.99.44.ebuild, -cherokee-0.99.48.ebuild, + -cherokee-1.0.0.ebuild, +cherokee-1.0.4.ebuild: + version bump. remove old ebuilds *cherokee-1.0.2-r1 (16 Jun 2010) diff --git a/www-servers/cherokee/cherokee-0.99.30.ebuild b/www-servers/cherokee/cherokee-0.99.30.ebuild deleted file mode 100644 index 6705915c17f6..000000000000 --- a/www-servers/cherokee/cherokee-0.99.30.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.30.ebuild,v 1.1 2009/11/30 16:47:38 bass Exp $ - -inherit 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" - -RDEPEND=" - >=sys-libs/zlib-1.1.4-r1 - nls? ( sys-devel/gettext ) - ssl? ( dev-libs/openssl ) - pam? ( virtual/pam ) - admin? ( dev-lang/python ) - geoip? ( dev-libs/geoip ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - fastcgi? ( www-servers/spawn-fcgi ) - ffmpeg? ( media-video/ffmpeg )" -DEPEND="${RDEPEND}" - -src_compile() { - 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" - - emake || 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/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} - use admin || rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin - - # Puts logs in /var/log/cherokee/ - dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf - -} - -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 -} diff --git a/www-servers/cherokee/cherokee-0.99.42.ebuild b/www-servers/cherokee/cherokee-0.99.42.ebuild deleted file mode 100644 index 8b91252762c8..000000000000 --- a/www-servers/cherokee/cherokee-0.99.42.ebuild +++ /dev/null @@ -1,136 +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-0.99.42.ebuild,v 1.1 2010/02/08 08:35:27 bass Exp $ - -inherit 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" - -RDEPEND=" - >=sys-libs/zlib-1.1.4-r1 - nls? ( sys-devel/gettext ) - ssl? ( dev-libs/openssl ) - pam? ( virtual/pam ) - admin? ( dev-lang/python ) - geoip? ( dev-libs/geoip ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - fastcgi? ( www-servers/spawn-fcgi ) - ffmpeg? ( media-video/ffmpeg )" -DEPEND="${RDEPEND}" - -src_compile() { - 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" - - emake || 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} - use admin || rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin - - # Puts logs in /var/log/cherokee/ - dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf - -} - -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-0.99.44.ebuild b/www-servers/cherokee/cherokee-0.99.44.ebuild deleted file mode 100644 index c8bb07209830..000000000000 --- a/www-servers/cherokee/cherokee-0.99.44.ebuild +++ /dev/null @@ -1,136 +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-0.99.44.ebuild,v 1.1 2010/04/21 10:09:50 jokey Exp $ - -inherit 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" - -RDEPEND=" - >=sys-libs/zlib-1.1.4-r1 - nls? ( sys-devel/gettext ) - ssl? ( dev-libs/openssl ) - pam? ( virtual/pam ) - admin? ( dev-lang/python ) - geoip? ( dev-libs/geoip ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - fastcgi? ( www-servers/spawn-fcgi ) - ffmpeg? ( media-video/ffmpeg )" -DEPEND="${RDEPEND}" - -src_compile() { - 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" - - emake || die "emake failed" -} - -src_install () { - emake 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} - use admin || rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin - - # Puts logs in /var/log/cherokee/ - dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf - -} - -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-0.99.48.ebuild b/www-servers/cherokee/cherokee-0.99.48.ebuild deleted file mode 100644 index d5d9669ef7a9..000000000000 --- a/www-servers/cherokee/cherokee-0.99.48.ebuild +++ /dev/null @@ -1,136 +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-0.99.48.ebuild,v 1.1 2010/04/30 09:41:45 bass Exp $ - -inherit 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" - -RDEPEND=" - >=sys-libs/zlib-1.1.4-r1 - nls? ( sys-devel/gettext ) - ssl? ( dev-libs/openssl ) - pam? ( virtual/pam ) - admin? ( dev-lang/python ) - geoip? ( dev-libs/geoip ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - fastcgi? ( www-servers/spawn-fcgi ) - ffmpeg? ( media-video/ffmpeg )" -DEPEND="${RDEPEND}" - -src_compile() { - 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" - - emake || die "emake failed" -} - -src_install () { - emake 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} - use admin || rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin - - # Puts logs in /var/log/cherokee/ - dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf - -} - -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.0.ebuild b/www-servers/cherokee/cherokee-1.0.4.ebuild index 3cdee1556a35..bd125c3e8a5a 100644 --- a/www-servers/cherokee/cherokee-1.0.0.ebuild +++ b/www-servers/cherokee/cherokee-1.0.4.ebuild @@ -1,8 +1,11 @@ # 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.0.ebuild,v 1.2 2010/05/17 16:47:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.4.ebuild,v 1.1 2010/06/23 09:56:09 bass Exp $ -inherit eutils pam versionator libtool +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" @@ -19,7 +22,6 @@ RDEPEND=" nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl ) pam? ( virtual/pam ) - admin? ( dev-lang/python ) geoip? ( dev-libs/geoip ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) @@ -27,6 +29,10 @@ RDEPEND=" ffmpeg? ( media-video/ffmpeg )" DEPEND="${RDEPEND}" +src_prepare() { + python_convert_shebangs -r 2 . +} + src_compile() { local myconf @@ -72,7 +78,7 @@ src_compile() { --localstatedir=/var \ || die "configure failed" - emake || die "emake failed" + emake -j1 || die "emake failed" } src_install () { @@ -108,6 +114,10 @@ src_install () { } +pkg_setup() { + python_set_active_version 2 +} + pkg_postinst() { enewgroup cherokee enewuser cherokee -1 -1 /var/www/localhost cherokee |