bump version

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 7c513736db31..4af0978f86e0 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.73 2010/08/05 07:24:13 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.74 2010/08/10 10:19:42 bass Exp $
+
+*cherokee-1.0.7 (10 Aug 2010)
+
+  10 Aug 2010; J. Alberto Suárez López <bass@gentoo.org>
+  +cherokee-1.0.7.ebuild:
+  bump version
 
 *cherokee-1.0.6 (05 Aug 2010)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index b9b79abbb5d7..309fd0635452 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.5.tar.gz 5364282 RMD160 00e64a63d861838c6df83b86ce25a518f3331bbb SHA1 61902974f839adbb0459c4df709b4d57f08b7ac2 SHA256 cdf15d9a44204167d203dcd5e57e44ed7114c34beaf363edb66d6419b4ad79e0
 DIST cherokee-1.0.6.tar.gz 5382769 RMD160 88bb78b37d0e7784cfb6778e4f5c88384ede584f SHA1 ba291f14a74fdcb2c8509d8cef986c1838ffb8a6 SHA256 bf977a2d0c1767691565ea2fda64808f56da3af28344f3b42f3e8b17ae2b11ed
+DIST cherokee-1.0.7.tar.gz 5383836 RMD160 5b41c91533c16ab8e5b0f9e18d6a1df7d11b199d SHA1 b3a96ac81a74e1f7a9299b0375929ebb5da42de5 SHA256 fb104c4d2b1fded81bb22bc001d761e358cdc3bb53f3159613fccacb98b1b749
 EBUILD cherokee-1.0.5.ebuild 4151 RMD160 2274420cbe5a3b239b7dd806c096eb3ee071ccd6 SHA1 c695cda42ea6a34886ef5d9e6f31f8f4c0e6c904 SHA256 362dc55d7f062435b6ff90edb16b909787e4cdb51e3008fbd068951780ba33c2
 EBUILD cherokee-1.0.6.ebuild 4151 RMD160 8745e818caebe4f56ebbf0075a218fdc94ae14fd SHA1 aa777590946df5e083f802ff017911bfb6abf72c SHA256 572b9c828cab04d70bc4f1a4e738a3e1edf4a26caec441e0495c7edfea87a7c1
-MISC ChangeLog 18063 RMD160 f6395e1ada0d363ca75aa40ee1e214093b0b2343 SHA1 d912903b6b94482a8f1a853e936f1b0d07ed6bbb SHA256 3ac8e97c698a3111ceb5ce9799679b15aa678e4fcba30c9a54e8cc527531b713
+EBUILD cherokee-1.0.7.ebuild 4151 RMD160 23153fb425065a42c216a8d919cde94b86706db6 SHA1 1956fff89ce2f716255b38c83b3cb38798d300dd SHA256 48e6605a539d100b0b92172ce3c1f79b00426409655fd7dc7ae7544ed5f58dc3
+MISC ChangeLog 18195 RMD160 a700e4064648adeba712d9ff606f8ac4ca638673 SHA1 e7c453eeae01d290b0ea0051dcbae87a53dd2823 SHA256 4a76ccbfa8a173884454333bc6572ed5d20296f1a1c1c95840f8041ef4a5a4e6
 MISC metadata.xml 488 RMD160 6689708f9508ed17b4f67284e8fef3512161b432 SHA1 c7a8168a8e6b119bee60b536552f378cf670130b SHA256 4ee7f5937c157209c4d78429188bcfc36b9c063252760215ce2e70da1ff95496
diff --git a/www-servers/cherokee/cherokee-1.0.7.ebuild b/www-servers/cherokee/cherokee-1.0.7.ebuild
new file mode 100644
index 000000000000..e7b604e0812d
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.0.7.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.7.ebuild,v 1.1 2010/08/10 10:19:42 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"
+
+}