version bump

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 166 insertions, 2 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index d0544f2c731b..8691bab07ca0 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.71 2010/07/06 12:28:38 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.72 2010/07/07 08:07:02 bass Exp $
+
+*cherokee-1.0.5 (07 Jul 2010)
+
+  07 Jul 2010; J. Alberto Suárez López <bass@gentoo.org>
+  +cherokee-1.0.5.ebuild:
+  version bump
 
   06 Jul 2010; J. Alberto Suárez López <bass@gentoo.org>
   cherokee-1.0.4.ebuild:
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 4d34fa041d5c..4822828f6d55 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,7 +1,9 @@
 AUX cherokee-initd-0.99.23 542 RMD160 e0ee20b7bb781797c3a53d0e2804e8b0fe985beb SHA1 4a8b43509aa4b9bf1079e0e74ca9d61428672522 SHA256 9e58ed7b3050a17fed08cc682e30dfa14e09eb804084b6cc9b213ccd0843300f
 DIST cherokee-1.0.2.tar.gz 5309634 RMD160 e4dc2f8d43974646109f2c1c3f9ea5f542590171 SHA1 fd5c7cdc2fea84d622f5bc8b7a8f5094eca87f0f SHA256 c499c25afd4e6fffa3e126e60970bbb35aeea0611fc28a9c845768cc0a67e35e
 DIST cherokee-1.0.4.tar.gz 5326233 RMD160 b17162efae2e54d57e7a9e8380917c0c26a63031 SHA1 f37bb1670823f6529f1dc58a11fb0567ac8c32fc SHA256 d35e6feb1f9908366958c6674979e11bab397d31652f9c4020716a08e185e509
+DIST cherokee-1.0.5.tar.gz 5364282 RMD160 00e64a63d861838c6df83b86ce25a518f3331bbb SHA1 61902974f839adbb0459c4df709b4d57f08b7ac2 SHA256 cdf15d9a44204167d203dcd5e57e44ed7114c34beaf363edb66d6419b4ad79e0
 EBUILD cherokee-1.0.2-r1.ebuild 4118 RMD160 41ea7cd4f7f8a6922f7fc9ad8c309be92a983289 SHA1 bee1555d24c9a635fb3bc6121972b7149fe35a5b SHA256 e242f2758a31929254e53c760b09f55003c96353b760d1f6bbeac87de383fee1
 EBUILD cherokee-1.0.4.ebuild 4151 RMD160 6ea6f7d6dad2f78cf3f59694f340d72413b37717 SHA1 aff1faeca73a79e99b284a2d50575017792889d4 SHA256 54c1ca53449f80a93e03ab82b8f7c11a39e723a26c19ade029fabdf3e3cdfd71
-MISC ChangeLog 17748 RMD160 08980a79591ff5a7570aa49d590a640690cc0838 SHA1 4b36d3d33efc33da4c6f5da39db243844c07f2c6 SHA256 f7690597583ce59695d3115b4d5c7c899dabd67b9799a41a44fb42f6fa1f21a4
+EBUILD cherokee-1.0.5.ebuild 4151 RMD160 2274420cbe5a3b239b7dd806c096eb3ee071ccd6 SHA1 c695cda42ea6a34886ef5d9e6f31f8f4c0e6c904 SHA256 362dc55d7f062435b6ff90edb16b909787e4cdb51e3008fbd068951780ba33c2
+MISC ChangeLog 17880 RMD160 3038d6de7507f0925a89dfc2ed6239f8b3794d66 SHA1 7038900fc87b81a45f4b816f376614b43c136c3e SHA256 b5d3b20d3486457ef4a065efc5e37401bd657759ecd7f454a97bb89c22c5716f
 MISC metadata.xml 488 RMD160 6689708f9508ed17b4f67284e8fef3512161b432 SHA1 c7a8168a8e6b119bee60b536552f378cf670130b SHA256 4ee7f5937c157209c4d78429188bcfc36b9c063252760215ce2e70da1ff95496
diff --git a/www-servers/cherokee/cherokee-1.0.5.ebuild b/www-servers/cherokee/cherokee-1.0.5.ebuild
new file mode 100644
index 000000000000..2aceb1338385
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.0.5.ebuild
@@ -0,0 +1,156 @@
+# 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.5.ebuild,v 1.1 2010/07/07 08:07:02 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 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"
+
+}