Some further cleanups.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 27 insertions, 276 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index b80254a62aa8..acc8ce4ebbca 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.106 2015/03/07 17:29:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.107 2015/03/07 17:33:25 blueness Exp $
+
+  07 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  -cherokee-1.2.101-r3.ebuild, -files/cherokee-1.2.101-libav-9.patch,
+  -files/cherokee-1.2.98-linux3.patch:
+  Some further cleanups.
 
   07 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
   cherokee-1.2.103-r2.ebuild, cherokee-1.2.104.ebuild:
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index c8e47b56e269..835e173a045a 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,17 +1,33 @@
-AUX cherokee-1.2.101-libav-9.patch 941 SHA256 59586d2a449f3803370cc8300a267607714fecfe6d197dcede87b14a22690f6d SHA512 fc3d307f25fd9dfa234706aeff6501f09d04b5c1a687cf309ace53c0dbccc038f46de0f6a17288a9ac8430ea6c21c500ff932c3bb98c39348622a36c1f8ab4de WHIRLPOOL d9c13fcb574a247b1173f6997cd3ee5928533c0ca14bf9fdd265b9e94523e7d535782f9978253e35e85e6f0960dc6584cab59116d258a9b7b039521ead86d37d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cherokee-1.2.103-linux3.patch 1663 SHA256 045f8298d1856bababfbc5e47398da1edff0a3ad00a05d6ee21ee65757688141 SHA512 7edf790a6b19cbb9049aa9394355adc61c116a69156b7390177a349ea0d8e2df93050897ea7683e854996ef225a10c6109bcadb3be241064ac111e45d9f00df1 WHIRLPOOL 5dedd16384e9e99870fbef1e9fafef33992cdfeff5b8834d7e1f2055878918bcdd65f347764bc09882c9446fd76bf4b690bc72711565d493313478d6b88c57f1
-AUX cherokee-1.2.98-linux3.patch 1914 SHA256 cc03fa321bb01cd4a7026685ef2e3fc606fd53da056f629307c6e1904987ad1b SHA512 558926386ad19df5f69fd445d6cf775fb0b8c4a78db4be49e2cd086dc95719f15b5ac97bb37c249ce3c4f27fcea922bbedb8a669f64972c55de7e91014bcd98c WHIRLPOOL 26362654752f75d2c286b89f05455f8884bb36b39d3c1bd384ed96d72022bd92b229f098e6c4cbd02a816216ccaeb9c5dba34944f5848b0dcde951eb10df1180
 AUX cherokee-1.2.99-gentoo.patch 1763 SHA256 66b3e85370082feb20205ed484a858a79656e0adb793fea5be796632fc327201 SHA512 2f2b1aa03cd7656ceb90f9a94d24704b4a411b3ab99e084444d1f60ce0270bad650b597b1edbdcb4fb0dda750215f42c3f5de3e9f6253825f3742dfbe871be4b WHIRLPOOL e8d03dc5c15e22cc94bae1f6082ee0aabb4990239bb6db9da3dda78565379720af5e61f2f60715505538a9c974e24fb84a2738d8ed593777d4621fcfdc2bfe62
 AUX cherokee-confd-1.2.98 144 SHA256 48331d56dfa6743444e0b01ce4df2013b27dd30804c88365257d560cc6adcab0 SHA512 e010ec9e6d6bd6862c486c494e968cf93ff5f7eeaa523f1bc1fb9db72dc878c17fbc04443e74aef0bbfef1e2ba64ba00a7dc8bbd1b58f6759d2e000c76e88f84 WHIRLPOOL 4ee6e81e60a934c190201b920488dbfb2f073b387da46068c616891c16b6ef05c9932487374b3ca051d3b1a1b8809d7245f289c8128547b6297ce1a32ce48800
 AUX cherokee-initd-1.2.99 1185 SHA256 f1cf6e6094948f0ab248a5533c0a19c08c8f6f5bcfa004072e3ecf1b2b2ace83 SHA512 62478b90e1521765e461d4a1ea9d629229d59fd5154a17b5299bcd6367b4bd0b2a00488648b0362711e554378394c94ae287921e8a003c5a5057bece21a35a77 WHIRLPOOL c4909900d66155846d72192f859b05a02400f18a1b799781194023c1b58102b18f9886f312df73b62d11a96cff0a0df443458b686bed5b13822057168c628de9
 AUX cherokee.logrotate-r1 377 SHA256 db1b0d69dc323500a37c167e6ff45e2a9cf7109835251d46a606b2a37938fed0 SHA512 325e3fd54c7b44ad858f952d15088622f58d71a7be49de804cfd3f415d9775f56598515dc18211324ad2b5e8fea5c0d94877df68442d36c1d6d86ea1c7f6ce28 WHIRLPOOL c6dacdfb1e7dce0df60e8b4fd039ecd43f14e433728d16fbfd0a16c6d59aefbdd137ca798410d4a185c730ddc6dc1a14ee9764f9d7f91b64481d5faa412c4129
 AUX cherokee.service 184 SHA256 a5ba46821799eaeea39c35f46ae51d58a8394f5e729889729f814562561d1edb SHA512 e05cfe0805bcd7f133fc0bf485fbf781b9cc5e6f9e222b8ea89bdc4e9d4531caa6049100670b67d12bdb73c1e93ed5d949cc1828241213cfcd60a39b7424d8ec WHIRLPOOL 1c095ac36f9f17917557b4157318c051cc031829ce13fd4dfabdb46f945af823ca5b92a7a35577de8734f219b4d08963fdddaa0680eed840821fbd430800120a
-DIST cherokee-1.2.101.tar.gz 6320209 SHA256 ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8 SHA512 a2c513cadcc0d43def2199d38c5248eb7dae4d100ea019d3d705e46741df6c0a8f9a164668eb3983d6bdfebdb1e28d29dc8e6bf7f6858c600307067e083e1098 WHIRLPOOL 7363d88c224cf25af635f0be99509bff7441b228564c43c30492d628a33f2d30b9c0c3b85e9ff6cd1171644072c0e8b47152aee5eded4c33b56f3cb3530c66c8
 DIST cherokee-1.2.103.zip 5783906 SHA256 0e125cba2ad2d0dc48ecca3af4894b92ec5fab422a9d7d27fd0c7a74751e5f35 SHA512 63ba5d41f61d2816df7dce3b572616eca5fc09dd2e9dca9efa2cbf28a38d6d5e1840e4cd302a0eb5780b1a0abe7632232511c77d9e383f0b945d3eca960af4ab WHIRLPOOL 00f592bc41eecd6422a95d6e36bf5c46b4845afe2adad756635d0d2c1e5c1bfde03e633bcbde8cab207c31050dc055e26fcdbf69512a8b61422242905b792754
 DIST cherokee-1.2.104.zip 6200164 SHA256 1acc80de22ed0aa4a0d95aa643ac92a2cce435480258081213214bec05da4098 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d WHIRLPOOL b0c13205014daee461538d0b7968bf255fd6633dbf3defeb2505ce463772c6f56b06ef91ff6b055bd589a15d19974d794fcbe039c1552b04a6bd1228a690f417
 DIST cherokee-ctk-master.zip 415092 SHA256 dede313f1d396f1deaf78d9fd9a1270820d2e91761efe827a207b46061f27993 SHA512 c933f15aa7197f5001b3120fd27898b2e97b78998e0bd0d68e7ced16a57950b7e85e4d731ca0420cd8a0fb292b4cd34b9497928183ccca22c9aa3a16285f9ef7 WHIRLPOOL 92453d3478ae238e5d9422fc2e8f0f1406576f9753ba0ed644ae8e093862b72c8c634bdaaeec4c0f725bdef8f4bc5c7113a916c2cdd8fbb0a14db61e54173c57
-EBUILD cherokee-1.2.101-r3.ebuild 5200 SHA256 cf6eea7ad0bdaa145bfab7bded3454a5bc77655b2d17a0732fe2d465a5ef709c SHA512 8546fee2e6be121f87845eb578da52debf233ac9482df96e2daa5433befc32849b253ad8386f22e4687f6ed43edde80d1dc62cb42ef627588b0b2e42d854e2e0 WHIRLPOOL 01ba897dc0cecff55144a42a25f2da7a552b7cb317f5925313ae43f4390741bef6e34ead33cf595b2bf455eb83ae2db0bb17b9d9833c50955b0732838419064c
 EBUILD cherokee-1.2.103-r2.ebuild 5136 SHA256 d996c806a25f5f6c075c189e07b90cd6c13756b380fc80fc7d897a5c5e35691b SHA512 6e0505666b28f4470097f12d892b2dda3cf151bb92d31b79b191f084b75f33df4f424eebfdaee049cb58673d3bbe3c1ef3e89bd47ebaa115eb254484a5ef78ff WHIRLPOOL d9c67e7130ba2e94b9b080dcac6f7ee0083eaabad07ee842c73016290e3929928d2787cc3584b3870f3feb45804bbb8eb2d81a38095bc40a3662598d26a3aa53
 EBUILD cherokee-1.2.104.ebuild 4934 SHA256 acc894be6a2ede8c973c6a02e7646c308a16f1281ba5d012ac31dad329ae26e3 SHA512 8c9e44761bae6cbd4255b41080401233ce958b77d85a32ca4aab3f0ba99c35946aef259b87612e360c01deb5ba095654cfec62daa0e3abbe6beab668257a8894 WHIRLPOOL 0b6078c53630c9114aacfe9c932ea7ab5e70e9363edd9f2870edabb2cae8bfca4e0f680fbfa6f1e41dd6fc20d68f97e66762fc56a820bf69da13d777cece0407
-MISC ChangeLog 24021 SHA256 cd5ccae1c935501eba984a65a212eb8bf4ffb984698b2c1d654a1c67af410239 SHA512 28dfd4006e000b3fb9e6df57f03593a9b531aaf44faed03c1851106369c0b9a21ff8a49bfef0b68b99edfa4f838a8119b2e45a6ec86423e48a93173867448d57 WHIRLPOOL f68f2787c9d8ba686b832c9883b4e2d24f79a019bc58c168f73b13b522b0911aedc4d0b299b9ae02c573268f4f178887d2a6b1d3cc39814ce9fb128fee5e76a6
+MISC ChangeLog 24211 SHA256 7e41126e97bbc5bcf1b1431c1d3b7adc8525419ade4af799fe4ddaad8465822e SHA512 19e97c50d37f9208ad102a7bf0f5e39cb01c5f4f888b2f09029ba0c3f9946e4d15302287e17d35eb4793baefb8bb92331c0ca9c666ddd478e74f382e815d0782 WHIRLPOOL acfb1300f44a886e4121bcb8aa94a17038dbd3ea0c573eda182f7f92e90b4a4e43b91610886164f208f1a83ca2bc0827e7b57f111be330a1387664436db07112
 MISC metadata.xml 440 SHA256 21e70301f21aa69d90ebede277859fcbdd5194528b4ff186610d0143408a0949 SHA512 74b1ea827c31205fe666c6be1475959857148eec167754f11dcccb5098daf3d64ad950793983d7920ea26fd8ac864c7da606c37ecff9841b714ba7b9ad24516d WHIRLPOOL 370deef54eaeaceec348852489cea16e24d9aa472bbbaf93ac18e6c08d160492e108145bfa8ef59636c85e0c2d3a1bd191a0e371ac2e66615fc3d9c34544d547
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJU+zbxAAoJEJOE+m71LUu6jkAQALKIw/OrasfghctCeaghcoM1
+JXVpcJD8AhsxlC5Ms+JNApfw8GCgXwz0XNjR7YDyyiF0ba9cipewX0LhzzPmyb/K
+x6/lJUHiuJHQ79Q6pu/Aw0ArnN1Iqod9/8jASbuS9QgRDIL+PHSd2TZ01f4PVWv5
+MLox64tm3u3UWQSG9N1m8MBZa8ZY2GFCgEUk4NLl4lI5Qtk2GO32Wp1Wj0YG+iXf
+jAQEKUWUxErMzp+A2xgZvvZvpvBWEETx0N6RSFUWTI6ayvIYdSKiIuthrcdUnSVw
+uhzXoh1GkJTXwO8CVyZz1Fnu7b7YhnHtqcKmMhp7qSXRd6c1tSOa4yDv2+GNrVR7
+VRgdLQhbBTN+0hFsE3vfVY75nvxLpbJe5TjxY9mfu+kghrCPUZWdYBKstXQX8adN
+2h/Lb/yB2yY7PpgwiB/ab9EXf4rMnWEImdTcDtA6EVH15z4lqGXA2slQBjUbPD2Q
+m0O5Np/dDgHNwj2mw6hs7QeCz6iGVYyI7QqZ+Jk2V8nZEd3s/tsJZjHoyqBadLsL
++20cipa/8MjVxEosBKtdutHyaDnv8PmqaiH5bjFj8Bz+lB4Rfa1bWVOYZ1FVUcE0
+XVej98uftQv0Xjut8hLd3zEfaKza8p/ZAGRn7lzevDH94uirwd6h1sNqClD26uFj
+3T/vGhlCrvK7+HAXa6gQ
+=0ut2
+-----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.2.101-r3.ebuild b/www-servers/cherokee/cherokee-1.2.101-r3.ebuild
deleted file mode 100644
index aa6595b6d1ae..000000000000
--- a/www-servers/cherokee/cherokee-1.2.101-r3.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.101-r3.ebuild,v 1.3 2014/08/10 20:08:32 slyfox Exp $
-
-EAPI=4
-PYTHON_DEPEND="admin? 2"
-PYTHON_USE_WITH="threads"
-
-inherit eutils multilib pam python versionator systemd user
-
-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 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs"
-
-COMMON_DEPEND="dev-libs/libpcre
-	>=sys-libs/zlib-1.1.4-r1
-	ffmpeg? ( virtual/ffmpeg )
-	geoip? ( dev-libs/geoip )
-	ldap? ( net-nds/openldap )
-	mysql? ( >=virtual/mysql-5 )
-	nls? ( virtual/libintl )
-	pam? ( virtual/pam )
-	php? ( || (
-		dev-lang/php[fpm]
-		dev-lang/php[cgi]
-	) )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
-	rrdtool? ( net-analyzer/rrdtool )"
-
-RESTRICT="test"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	python_pkg_setup
-
-	python_set_active_version 2
-
-	enewgroup cherokee
-	enewuser cherokee -1 -1 /var/www cherokee
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.2.99-gentoo.patch" \
-		"${FILESDIR}/${PN}-1.2.98-linux3.patch" \
-		"${FILESDIR}/${P}-libav-9.patch"
-
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	local myconf
-
-	if use admin ; then
-		myconf="${myconf} --enable-admin --with-python=$(PYTHON -2)"
-	else
-		myconf="${myconf} --disable-admin --without-python"
-	fi
-
-	# Uses autodetect because --with-php requires path to php-{fpm,cgi}.
-	if ! use php ; then
-		myconf="${myconf} --without-php"
-	fi
-
-	if use static ; then
-		myconf="${myconf} --enable-static-module=all"
-	fi
-
-	local os="Unknown"
-	case "${CHOST}" in
-		*-freebsd*)
-			os="FreeBSD" ;;
-		*-netbsd*)
-			os="NetBSD" ;;
-		*-openbsd*)
-			os="OpenBSD" ;;
-		*)
-			os="Linux" ;;
-	esac
-
-	# This make cherokee 1.2 sad
-	#	$(use_enable threads pthread) \
-	econf \
-		$(use_enable debug trace) \
-		$(use_enable debug backtraces) \
-		$(use_enable ipv6) \
-		$(use_enable kernel_linux epoll) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable static-libs static) \
-		$(use_with ffmpeg) \
-		$(use_with geoip) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with ssl libssl) \
-		--disable-dependency-tracking \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-os-string="Gentoo ${os}" \
-		--enable-tmpdir="${EPREFIX}/var/tmp" \
-		--localstatedir="${EPREFIX}/var" \
-		--with-wwwroot="${EPREFIX}${WEBROOT}/htdocs" \
-		--with-cgiroot="${EPREFIX}${WEBROOT}/cgi-bin" \
-		--with-wwwuser=cherokee \
-		--with-wwwgroup=cherokee \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	elif ! use static ; then
-		find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die
-	fi
-
-	dodoc AUTHORS ChangeLog README
-
-	if use pam ; then
-		pamd_mimic system-auth cherokee auth account session || die
-	fi
-
-	newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN}
-	newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN}
-
-	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 || die
-	fi
-
-	exeinto /usr/share/doc/${PF}/contrib
-	doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py}
-
-	#move the htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${ED}"${WEBROOT}/htdocs \
-		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${ED}"${WEBROOT}/htdocs
-
-	keepdir \
-		"${WEBROOT}"/htdocs \
-		/var/log/cherokee \
-		/var/lib/cherokee/graphs/images
-	fowners cherokee:cherokee \
-		/var/log/cherokee \
-		/var/lib/cherokee/graphs \
-		/var/lib/cherokee/graphs/images
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN}
-
-	systemd_dounit "${FILESDIR}"/cherokee.service
-}
-
-pkg_postinst() {
-	elog
-	if use admin ; then
-		python_mod_optimize "${EPREFIX}/usr/share/cherokee/admin/"
-		elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
-		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
-		elog "Try USE=admin if you want an easy way to configure cherokee."
-	fi
-	elog
-	elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}."
-	elog
-}
-
-pkg_postrm() {
-	if use admin ; then
-		python_mod_cleanup "${EPREFIX}/usr/share/cherokee/admin/"
-	fi
-}
diff --git a/www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch b/www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch
deleted file mode 100644
index e7ec110d17c3..000000000000
--- a/www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -burN cherokee-1.2.101.old//cherokee/handler_streaming.c cherokee-1.2.101/cherokee/handler_streaming.c
---- cherokee-1.2.101.old//cherokee/handler_streaming.c	2011-10-12 20:07:44.000000000 +0200
-+++ cherokee-1.2.101/cherokee/handler_streaming.c	2012-11-25 18:08:05.606331619 +0100
-@@ -312,14 +312,14 @@
- 
- 	/* Open the media stream
- 	 */
--	re = av_open_input_file (&hdl->avformat, hdl->local_file.buf, NULL, 0, NULL);
-+	re = avformat_open_input (&hdl->avformat, hdl->local_file.buf, NULL, NULL);
- 	if (re != 0) {
- 		goto error;
- 	}
- 
- 	/* Read the info
- 	 */
--	re = av_find_stream_info (hdl->avformat);
-+	re = avformat_find_stream_info (hdl->avformat, NULL);
- 	if (re < 0) {
- 		goto error;
- 	}
-@@ -380,7 +380,7 @@
- 	if (likely (secs > 0)) {
- 		long tmp;
- 
--		tmp = (hdl->avformat->file_size / secs);
-+		tmp = (avio_size(hdl->avformat->pb) / secs);
- 		if (tmp > rate) {
- 			rate = tmp;
- 			TRACE(ENTRIES, "New rate: %d bytes/s\n", rate);
diff --git a/www-servers/cherokee/files/cherokee-1.2.98-linux3.patch b/www-servers/cherokee/files/cherokee-1.2.98-linux3.patch
deleted file mode 100644
index e1e335264b6c..000000000000
--- a/www-servers/cherokee/files/cherokee-1.2.98-linux3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur cherokee-1.2.98.orig/admin/SystemStats.py cherokee-1.2.98/admin/SystemStats.py
---- cherokee-1.2.98.orig/admin/SystemStats.py	2011-05-03 18:01:41.000000000 +0900
-+++ cherokee-1.2.98/admin/SystemStats.py	2011-08-26 13:05:08.128851462 +0900
-@@ -39,7 +39,7 @@
-     global _stats
- 
-     if not _stats:
--        if sys.platform == 'linux2':
-+        if sys.platform == 'linux2' or sys.platform == 'linux3':
-             _stats = System_stats__Linux()
-         elif sys.platform == 'darwin':
-             _stats = System_stats__Darwin()
-diff -Naur cherokee-1.2.98.orig/admin/market/InstallUtil.py cherokee-1.2.98/admin/market/InstallUtil.py
---- cherokee-1.2.98.orig/admin/market/InstallUtil.py	2011-05-03 18:01:41.000000000 +0900
-+++ cherokee-1.2.98/admin/market/InstallUtil.py	2011-08-26 13:05:06.596844132 +0900
-@@ -56,7 +56,7 @@
-         first_group = str(root_group)
- 
-     # Systems
--    if sys.platform == 'linux2':
-+    if sys.platform == 'linux2' or sys.platform == 'linux3':
-         if os.getuid() == 0:
-             return root_group
-         return first_group
-@@ -72,7 +72,7 @@
- 
- 
- def current_UID_is_admin():
--    if sys.platform == 'linux2':
-+    if sys.platform == 'linux2' or sys.platform == 'linux3':
-         return os.getuid() == 0
-     elif sys.platform == 'darwin':
-         return os.getuid() == 0
-diff -Naur cherokee-1.2.98.orig/admin/util.py cherokee-1.2.98/admin/util.py
---- cherokee-1.2.98.orig/admin/util.py	2011-03-31 17:30:04.000000000 +0900
-+++ cherokee-1.2.98/admin/util.py	2011-08-26 13:05:04.622834682 +0900
-@@ -341,7 +341,7 @@
- def os_get_document_root():
-     if sys.platform == 'darwin':
-         return "/Library/WebServer/Documents"
--    elif sys.platform == 'linux2':
-+    elif sys.platform == 'linux2' or sys.platform == 'linux3':
-         if os.path.exists ("/etc/redhat-release"):
-             return '/var/www'
-         elif os.path.exists ("/etc/fedora-release"):