11 files changed, 63 insertions, 834 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index e525a2bf2f23..bff13b8856b3 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.86 2011/09/16 11:57:03 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.87 2011/10/17 16:24:30 matsuu Exp $
+
+*cherokee-1.2.100 (17 Oct 2011)
+
+  17 Oct 2011; MATSUU Takuto <matsuu@gentoo.org> -files/cherokee-initd-0.99.23,
+  -cherokee-1.0.12.ebuild, -files/cherokee-initd-1.2.0, -cherokee-1.2.0.ebuild,
+  -cherokee-1.2.1.ebuild, -cherokee-1.2.2.ebuild, -files/cherokee-initd-1.2.98,
+  -cherokee-1.2.98.ebuild, -files/cherokee-1.2.98-gentoo.patch,
+  +cherokee-1.2.100.ebuild:
+  Version bumped. Removed old versions.
 
 *cherokee-1.2.99 (16 Sep 2011)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index dc09b04e30f6..be3293ec7ed9 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,43 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX cherokee-1.2.98-gentoo.patch 1036 RMD160 6fd579df2edcca221e607084c45a01ef15da1385 SHA1 6f7b682e833bdb7253f1a7881f41c52b1cd6f328 SHA256 5c32626584e45871f95069f24d840d6fdd07d5542eef8273e79739330a3d4093
 AUX cherokee-1.2.98-linux3.patch 1914 RMD160 aafe83b052218dc703c22f8d30b92e2027a4baad SHA1 d101cb335ded17dd18b7ff19ada4caa74bbf9146 SHA256 cc03fa321bb01cd4a7026685ef2e3fc606fd53da056f629307c6e1904987ad1b
 AUX cherokee-1.2.99-gentoo.patch 1763 RMD160 d691687e383bb594e536ad87159a8f4aa6eb88ba SHA1 e0de18027a32fade9b871cef204587ff18f49131 SHA256 66b3e85370082feb20205ed484a858a79656e0adb793fea5be796632fc327201
 AUX cherokee-confd-1.2.98 144 RMD160 05e5dc30e647624c27d0ebb6015d0ca1d4278593 SHA1 e187c35650ef045f7a19b6b72b88081269774948 SHA256 48331d56dfa6743444e0b01ce4df2013b27dd30804c88365257d560cc6adcab0
-AUX cherokee-initd-0.99.23 542 RMD160 e0ee20b7bb781797c3a53d0e2804e8b0fe985beb SHA1 4a8b43509aa4b9bf1079e0e74ca9d61428672522 SHA256 9e58ed7b3050a17fed08cc682e30dfa14e09eb804084b6cc9b213ccd0843300f
-AUX cherokee-initd-1.2.0 717 RMD160 79d5e72dabc0183ae7e8d6453d83b1e549cac736 SHA1 04efcc25ab326a695944b45e12a1057a3574181e SHA256 c6cd9b7ab782aa5f3242bbdfcefabf4fff05ea253e7af1175df5eb2da7e6255d
-AUX cherokee-initd-1.2.98 1156 RMD160 4cba17ac3161b4d32be7b639dacc16966acceebb SHA1 871bb838f1f0fa4c881426e9c35b8a6557db2d98 SHA256 2af14cf2c6085c1f110ff376a4d66b08bfd6469b4e93d801dbbf4629eaf16010
 AUX cherokee-initd-1.2.99 1185 RMD160 d93399b6efe894248933ab45ccecb83738106d83 SHA1 e8d975c93682773e0f074261a54fbac773058e4d SHA256 f1cf6e6094948f0ab248a5533c0a19c08c8f6f5bcfa004072e3ecf1b2b2ace83
 AUX cherokee.logrotate 346 RMD160 4e6af617cd12f48eb6f2cb3925177c899451e223 SHA1 ec7c688287773bc366a9b854108d46894541ad38 SHA256 099d13bf37f469a565f0fb4837a2136abb2e6e94c5000fc03d88eca611b4f930
-DIST cherokee-1.0.12.tar.gz 5710898 RMD160 21022ac54c32324d3d738e7afb104aa76c96374f SHA1 6a514ea6816252400c777cca4d91658575f49091 SHA256 37fbece8df5af26773710100f85008a9d65e3f363885ce7228f32e882b21fc75
-DIST cherokee-1.2.0.tar.gz 5898536 RMD160 e0b9f7af51cf21c94130b3ad3b106821cd35c3b9 SHA1 af8e4ee0e3dce59db86855a59aa0724ca0cfb331 SHA256 835df63bc97324d9a27d9bf3980de25cddae3edc55a2c72b01dc721ac604076a
-DIST cherokee-1.2.1.tar.gz 6041090 RMD160 d6285e8dd157b689eb1b2cd2369daf2bf812ba59 SHA1 982bc99e966218661abd562d604aea32923bfde9 SHA256 8ce6f35f521b8b0a45b5c95587b3653a137f9d8eed5ee7ffd3e8fa6cb922a668
-DIST cherokee-1.2.2.tar.gz 6108853 RMD160 1fa6cd0daae90bcf79b1d4cc7e63b318fbe0ed5e SHA1 6fe2df38308cd05d1531f5d4db5198b8438b5134 SHA256 1dc3afbdb510030d5a1801e01936bc863d0b5811b512b288b46d8143a6cfc475
-DIST cherokee-1.2.98.tar.gz 6163984 RMD160 b16b981674cb0213c2d7703016cf29c28c6d2866 SHA1 3efcf8115268f8b4ff97b8dc79234a68c41905da SHA256 042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d
+DIST cherokee-1.2.100.tar.gz 6281629 RMD160 1282692dac135f73bf0604e2c2ca753baa2f40b3 SHA1 2ed95504c7f156227f9b688a901608be21cf3dff SHA256 1d691374bf395f3bd8a0bdaadc5dce2ad9251161ae92a214ff6de08369b15d36
 DIST cherokee-1.2.99.tar.gz 6179707 RMD160 59ba7eb005a4013959afcb826faa0a778e5cc4b2 SHA1 db602b03e531b98492ca0b6535a9630f08d8528a SHA256 0e8cfb90095082f369bc5315a6232b76b42799c8adc716ff46fe7d02bbc0e783
-EBUILD cherokee-1.0.12.ebuild 4157 RMD160 200c962991c6c947e234b9fa4546f1dd3d827d7d SHA1 0d4832f2361d8e83bba07b42002a7de0a9697db1 SHA256 a5c85e604e4a02ab4a20c88ebf6c7b70f01f46491fe1a4a6179f79151867a07a
-EBUILD cherokee-1.2.0.ebuild 4152 RMD160 c2beb0bf529e26ebfc729d0f536a0a5e4c7282c7 SHA1 fd04a0bf5e8d00cd52a0b9d3e6554164236c1036 SHA256 965f7ee1e40fde54b1f8c3a4f3da95dfae4500559a9bbab3382ab543d0b3954c
-EBUILD cherokee-1.2.1.ebuild 4152 RMD160 7ceeda0703cd4a3bac513ba7bdb636d11034dcc7 SHA1 51206f2a53d226fbd877e8eee03e159a80cd90b9 SHA256 923c7cbea1560abca1aedae25cd450d9d0c800a60731a29c9aed64257c4d7a37
-EBUILD cherokee-1.2.2.ebuild 4155 RMD160 fc1b4231c75ca4a2026a42c37844a74d24f8bfdd SHA1 749f5eb584e5da1b586c470b2bd23331c27f5f44 SHA256 506142d95260e31854d5313c654b6eaa27612fadc05e6b7ee38704d57c776115
-EBUILD cherokee-1.2.98.ebuild 4281 RMD160 f0dd7f5f104d8b7866bbb183f0289a09e80353ff SHA1 a8686f1ba7afb9bd3bafcf2d51c5efe184ce1f4d SHA256 6fc04dc05659d8ac3c98a594e248216e68599bd90f512613e9bde5dee8a2d32b
+EBUILD cherokee-1.2.100.ebuild 5148 RMD160 fd52adfab6dfe7ee1bda442936af4de49a098765 SHA1 06d2cec000b4e30c3f383a00c2efddb92ed32764 SHA256 a32535eb94d646d119d799d07453113113db1d2a252c6ef98f304374b1c83890
 EBUILD cherokee-1.2.99.ebuild 5139 RMD160 e5fbac07e43d770f274509dd0e421564ba27a9bc SHA1 b24d4107d5bf711c580d74f5c3192dbd6a98cd5a SHA256 6f428fe5b8114b7169607b1b6d659b3c5d575511f51f8be9cb0e7380f9c1dbec
-MISC ChangeLog 20444 RMD160 f4b3317a197eb53989fc020ae19f0d0899d76c3a SHA1 5d4626e537865c9f314f4254b86fe53535e8228c SHA256 40fd632ebe1037e59b2dab35c9a7171cf3a0c2885aa115b7563c114b64b0890e
+MISC ChangeLog 20850 RMD160 7c00dea4d4a416627586d880be041ea95976e4fc SHA1 74afcbd7cdb7ef5143ada143ac4beedef1cd3db3 SHA256 af48030ea349af5b6a6d9b4d4940f5be8f5130bfd52b66f5d5f70f329754de04
 MISC metadata.xml 488 RMD160 6689708f9508ed17b4f67284e8fef3512161b432 SHA1 c7a8168a8e6b119bee60b536552f378cf670130b SHA256 4ee7f5937c157209c4d78429188bcfc36b9c063252760215ce2e70da1ff95496
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOczmXAAoJECaGw+YFKA1pMkMP/1m1a65smxeX8oiT1xeKi7KP
-9NUyXbWWteTv4oydpKoIiIlckpUXNHlH+l4C4hBSLx1xD1RzmrlfBDFRpqWbvT96
-Cy9Lmp3aIh/iAXxxtWItlJYWf+o2ZJm8Z1wSTfFpjXKA52u/eq1xZh/rU6eos2bW
-SGdRnhvpE1Bom+EpDheLpMcoxD7zm53w3qo4r48egfWhLyYGLawgndjo+aSJ+Z3J
-DSM8lx2a9a2BUGql8wTMm3l9N3PIjTPd20VdanHj7Unk61yVI518hD/DmHonKkpI
-EXPUJQBjBlrfUvJo3Qd60eZQJti7i6W4YV/MAAMlkShWuVKs5TGtqR/pBGBZ0c/X
-ZduB3i6Jwzpm62t4xMst709GO7vTMgdEtwvJRHBaWZjPga6aaGTi63osDIyBXyK6
-GGFo9thCDv33B4qe3MEibvv/sY+oOVeXfW6pnp3OcTLTCJ83EAJjz0QOXQCsK7pl
-eqgr+okymQkuH3Gx+XBdNsZcB8ctfJID/VRCLzwpJhi+yi6AeMwb72y8l9KpWgVa
-jkfF1/NX/WPSJ1tznXxfqEGldBkp9odO3Mq8fGvHj91M/87hnGu/Nf1lxw17C8DD
-eYNR204MPfyXBvTSvp30yAuMcYSlAldBuX5ijR5KAJFFMdSpQBFPjD505etnUFrg
-6CtlE86R4v2ry1IJsynn
-=+7Aq
+iQIcBAEBAgAGBQJOnFbHAAoJECaGw+YFKA1p8AwP/AwwKvVPWpHFmxVxZJMAG8hC
+V0FLntpDHW+NZrLIx9o6WrEP8eYFOgLmx80f7SkutCt98bhD8i+h8FLe2ovbuMbO
+yTcg7y7rcsri8mdloYxcWKYTN2oxdqgA2k9U/AIVnEiqcbbXUF6E8ZavVM+X8bKL
+VKjUE8HmlNZCc8l+7j/AhEdM7mje8Wal58acf9ZjWUcIErsGi7ww96PgQAq7Bm4v
+YOYx6M3wMpqNjIAQeWoe9katPWYdxbCPajkcDkFVwuo9Kcwl/mJDhU4twr2CefNw
+Gdu9hVI3HHzEcN+JJ7sshV0/vBsR/3KVEMa+zBZDV2uwGOmiAPklbKh+hPN5DSWu
+2t/CEQ/F2lFlBE960/mqLtEpczupwei6CVA/62J6NL+nSfTZ0gSQXbnqLxR0RU0X
++kthipdPklDOJdO9+KYDnymjGl3eNy3dS3h6Z2BDD9z7g7QBYnnhPbp0SJbi2MDB
+km/O48BkbeJutndGd3HAD3c+ycYAmHPSmbczEBudYlgS6bu38DN9248cmH28HV/+
+U3KLgPf4+wWHiPQcg7odUeBt5Krfm7zTZPRaqF28h5JBF+mJVkRqCXHdsf5a6y8O
+G8J6J16UraRJDg9BPWjB5AYipPByJStZa9y4zSmKASoQA+wFxq3/5Y2JNr/MrZ2p
+HoKQ9i2tswjsD+fMLGDV
+=hu3K
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.0.12.ebuild b/www-servers/cherokee/cherokee-1.0.12.ebuild
deleted file mode 100644
index 150f042f9380..000000000000
--- a/www-servers/cherokee/cherokee-1.0.12.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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.12.ebuild,v 1.2 2011/04/04 12:06:58 scarabeus 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="~amd64 ~x86"
-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? ( virtual/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.2.0.ebuild b/www-servers/cherokee/cherokee-1.2.0.ebuild
deleted file mode 100644
index abaed828b06b..000000000000
--- a/www-servers/cherokee/cherokee-1.2.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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.2.0.ebuild,v 1.4 2011/04/04 12:06:58 scarabeus 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="~amd64 ~x86"
-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
-	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? ( virtual/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
-
-	# This make cherokee 1.2 sad
-	#	$(use_enable threads pthread) \
-	econf \
-		${myconf} \
-		$(use_enable pam) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(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 || 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-1.2.0" ${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/${PF}/contrib/"
-	elog "for example:"
-	elog "	  PYTHONPATH="/usr/share/cherokee/admin/" python \\"
-	elog "	  /usr/share/${PF}/contrib/0999to09910.py \\"
-	elog "	  /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15"
-
-}
diff --git a/www-servers/cherokee/cherokee-1.2.1.ebuild b/www-servers/cherokee/cherokee-1.2.1.ebuild
deleted file mode 100644
index 406fcf94a64b..000000000000
--- a/www-servers/cherokee/cherokee-1.2.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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.2.1.ebuild,v 1.2 2011/04/04 12:06:58 scarabeus 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="~amd64 ~x86"
-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
-	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? ( virtual/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
-
-	# This make cherokee 1.2 sad
-	#	$(use_enable threads pthread) \
-	econf \
-		${myconf} \
-		$(use_enable pam) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(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 || 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-1.2.0" ${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/${PF}/contrib/"
-	elog "for example:"
-	elog "	  PYTHONPATH="/usr/share/cherokee/admin/" python \\"
-	elog "	  /usr/share/${PF}/contrib/0999to09910.py \\"
-	elog "	  /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15"
-
-}
diff --git a/www-servers/cherokee/cherokee-1.2.98.ebuild b/www-servers/cherokee/cherokee-1.2.100.ebuild
index 1107dfa8e5ef..982ca477c4b3 100644
--- a/www-servers/cherokee/cherokee-1.2.98.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.100.ebuild
@@ -1,6 +1,6 @@
 # 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.2.98.ebuild,v 1.1 2011/08/26 11:58:08 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.100.ebuild,v 1.1 2011/10/17 16:24:30 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="admin? 2"
@@ -48,8 +48,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/${P}-gentoo.patch" \
-		"${FILESDIR}/${P}-linux3.patch"
+		"${FILESDIR}/${PN}-1.2.99-gentoo.patch" \
+		"${FILESDIR}/${PN}-1.2.98-linux3.patch"
 
 	python_convert_shebangs -r 2 .
 }
@@ -126,43 +126,64 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog README || die
 
-	use pam && pamd_mimic system-auth cherokee auth account session
+	if use pam ; then
+		pamd_mimic system-auth cherokee auth account session || die
+	fi
 
-	newinitd "${FILESDIR}/${PN}-initd-${PV}" ${PN} || die "newinitd ${PN} failed"
-	newconfd "${FILESDIR}/${PN}-confd-${PV}" ${PN} || die "newconfd ${PN} failed"
+	newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN} || die "newinitd ${PN} failed"
+	newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN} || die "newconfd ${PN} failed"
 
 	if ! use admin ; then
 		rm -r \
 			"${ED}"/usr/bin/cherokee-admin-launcher \
 			"${ED}"/usr/bin/CTK-run \
 			"${ED}"/usr/sbin/cherokee-admin \
-			"${ED}"/usr/share/cherokee/admin
+			"${ED}"/usr/share/cherokee/admin || die
 	fi
 
 	exeinto /usr/share/doc/${PF}/contrib
-	doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py}
+	doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py} || die
+
+	keepdir \
+		/var/www/localhost/htdocs \
+		/var/log/cherokee \
+		/var/lib/cherokee/graphs/images || die
+	fowners cherokee:cherokee \
+		/var/log/cherokee \
+		/var/lib/cherokee/graphs \
+		/var/lib/cherokee/graphs/images || die
 
-	keepdir /var/www/localhost/htdocs /var/log/cherokee
-	fowners cherokee:cherokee /var/log/cherokee
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN} || die
 
 	if ! use coverpage ; then
-		rm -rf "${ED}"/var/www/localhost/htdocs/*
+		rm -r "${ED}"/var/www/localhost/htdocs/* || die
 	fi
 }
 
 pkg_postinst() {
+	elog
 	if use admin ; then
 		python_mod_optimize "${EPREFIX}/usr/share/cherokee/admin/"
-		echo
 		elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
-		echo
+		elog
+		elog "Cherokee currently supports configuration versioning, so from now on,"
+		elog "whenever a change is made to the configuration file format,"
+		elog "Cherokee-Admin will be able to automatically convert yours to the new"
+		elog "release. You simply have to load Cherokee-Admin and it will be converted"
+		elog "once you proceed to saving it."
+		elog
+		elog "There is also a command line utility that you can use to do the exact"
+		elog "same thing. Config format can change in different versions. It is"
+		elog "provided under:"
+		elog "	${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py"
 	else
-		echo
 		elog "Try USE=admin if you want an easy way to configure cherokee."
-		echo
 	fi
+	elog
 	elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}."
-	echo
+	elog
 }
 
 pkg_postrm() {
diff --git a/www-servers/cherokee/cherokee-1.2.2.ebuild b/www-servers/cherokee/cherokee-1.2.2.ebuild
deleted file mode 100644
index 982f235c4caa..000000000000
--- a/www-servers/cherokee/cherokee-1.2.2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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.2.2.ebuild,v 1.1 2011/05/24 07:03:20 polynomial-c 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="~amd64 ~x86"
-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
-	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? ( virtual/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
-
-	# This make cherokee 1.2 sad
-	#	$(use_enable threads pthread) \
-	econf \
-		${myconf} \
-		$(use_enable pam) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(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 || 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-1.2.0" ${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/${PF}/contrib/"
-	elog "for example:"
-	elog "	  PYTHONPATH="/usr/share/cherokee/admin/" python \\"
-	elog "	  /usr/share/${PF}/contrib/0999to09910.py \\"
-	elog "	  /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15"
-
-}
diff --git a/www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch b/www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch
deleted file mode 100644
index cc547e9118d6..000000000000
--- a/www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur cherokee-1.2.98.orig/cherokee.conf.sample.pre cherokee-1.2.98/cherokee.conf.sample.pre
---- cherokee-1.2.98.orig/cherokee.conf.sample.pre	2011-05-03 18:01:42.000000000 +0900
-+++ cherokee-1.2.98/cherokee.conf.sample.pre	2011-08-25 17:51:33.615130274 +0900
-@@ -18,6 +18,8 @@
- server!server_tokens = full
- server!panic_action = %prefix%/bin/cherokee-panic
- server!pid_file = %localstatedir%/run/cherokee.pid
-+server!user = cherokee
-+server!group = cherokee
- 
- # Default virtual server
- #
-@@ -27,11 +29,11 @@
- 
- vserver!1!logger = combined
- vserver!1!logger!access!type = file
--vserver!1!logger!access!filename = %localstatedir%/log/cherokee.access
-+vserver!1!logger!access!filename = %localstatedir%/log/cherokee/cherokee.access
- vserver!1!logger!access!buffsize = 16384
- 
- vserver!1!error_writer!type = file
--vserver!1!error_writer!filename = %localstatedir%/log/cherokee.error
-+vserver!1!error_writer!filename = %localstatedir%/log/cherokee/cherokee.error
- 
- vserver!1!rule!1!match = default
- vserver!1!rule!1!handler = common
diff --git a/www-servers/cherokee/files/cherokee-initd-0.99.23 b/www-servers/cherokee/files/cherokee-initd-0.99.23
deleted file mode 100644
index 2ffdde46a1ab..000000000000
--- a/www-servers/cherokee/files/cherokee-initd-0.99.23
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opt="reload"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Cherokee Web Server"
-	start-stop-daemon --start -b \
-		--exec /usr/sbin/cherokee
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Cherokee Web Server"
-	start-stop-daemon --stop \
-		--exec /usr/sbin/cherokee
-	eend $?
-}
-
-reload() {
-	ebegin "Restarting Cherokee Web Server and closing all open connections"
-	start-stop-daemon --stop \
-		--signal USR1
-	eend $?
-}
-
diff --git a/www-servers/cherokee/files/cherokee-initd-1.2.0 b/www-servers/cherokee/files/cherokee-initd-1.2.0
deleted file mode 100644
index 046ef70cacea..000000000000
--- a/www-servers/cherokee/files/cherokee-initd-1.2.0
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="graceful reload"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Cherokee Web Server"
-	start-stop-daemon --start -b \
-		--exec /usr/sbin/cherokee
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Cherokee Web Server"
-	start-stop-daemon --stop \
-		--exec /usr/sbin/cherokee
-	eend $?
-}
-
-graceful() {
-	ebegin "Gracefully restarting Cherokee Web Server"
-	start-stop-daemon \
-		--exec /usr/sbin/cherokee \
-		--signal HUP
-	eend $?
-}
-
-reload() {
-	ebegin "Restarting Cherokee Web Server and closing all open connections"
-	start-stop-daemon \
-		--exec /usr/sbin/cherokee \
-		--signal USR1
-	eend $?
-}
diff --git a/www-servers/cherokee/files/cherokee-initd-1.2.98 b/www-servers/cherokee/files/cherokee-initd-1.2.98
deleted file mode 100644
index 9c4136f24938..000000000000
--- a/www-servers/cherokee/files/cherokee-initd-1.2.98
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="${ops} configtest graceful reload"
-
-CHEROKEE="/usr/sbin/cherokee"
-
-depend() {
-	need net
-	use dns ldap logger mysql netmount
-}
-
-checkconfig() {
-	${CHEROKEE} -t 1>/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} has detected an error in your config:"
-		${CHEROKEE} -t ${CHEROKEE_OPTS}
-	fi
-	return $?
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet \
-		--exec ${CHEROKEE} -- -d ${CHEROKEE_OPTS}
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet \
-		--exec ${CHEROKEE}
-	eend $?
-}
-
-graceful() {
-	checkconfig || return 1
-
-	ebegin "Gracefully restarting ${SVCNAME}"
-	start-stop-daemon \
-		--exec ${CHEROKEE} \
-		--signal HUP
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Restarting ${SVCNAME} and closing all open connections"
-	start-stop-daemon \
-		--exec ${CHEROKEE} \
-		--signal USR1
-	eend $?
-}