Version bump

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

6 files changed, 294 insertions, 15 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index a99b649b5c06..178b955b4361 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.97 2013/07/05 17:49:14 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.98 2013/07/17 07:34:08 blueness Exp $
+
+*cherokee-1.2.103 (17 Jul 2013)
+
+  17 Jul 2013; Anthony G. Basile <blueness@gentoo.org> +cherokee-1.2.103.ebuild,
+  +files/cherokee-1.2.103-fix-Makefile-CTK.patch,
+  +files/cherokee-1.2.103-fix-configure.ac.patch,
+  +files/cherokee-1.2.103-linux3.patch:
+  Version bump
 
 *cherokee-1.2.101-r3 (05 Jul 2013)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index ccf631d29025..b2c08060ff67 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -2,6 +2,9 @@
 Hash: SHA256
 
 AUX cherokee-1.2.101-libav-9.patch 941 SHA256 59586d2a449f3803370cc8300a267607714fecfe6d197dcede87b14a22690f6d SHA512 fc3d307f25fd9dfa234706aeff6501f09d04b5c1a687cf309ace53c0dbccc038f46de0f6a17288a9ac8430ea6c21c500ff932c3bb98c39348622a36c1f8ab4de WHIRLPOOL d9c13fcb574a247b1173f6997cd3ee5928533c0ca14bf9fdd265b9e94523e7d535782f9978253e35e85e6f0960dc6584cab59116d258a9b7b039521ead86d37d
+AUX cherokee-1.2.103-fix-Makefile-CTK.patch 416 SHA256 b742ea0be6d2a3b489cd1840c9f8f44a49baeb63276d8109701ce997a6a7e405 SHA512 ba42c13de09419b60e144799bf63375f33f268e535ee95c26626e66f931e473a304658c434f6dda6971d0405bfcb6e0a24f4ec18d963e401d602cad892bbb025 WHIRLPOOL 593abf4048dc392ac6b76d3bc2ed5d041d105c0299427f72626616149c1e808944e328dcf2e7ae13babf4d44b149894585404ed4385321c2f5907fdf23307591
+AUX cherokee-1.2.103-fix-configure.ac.patch 543 SHA256 402589f79509dfccb116961119b10ce46e84a7bace6de0709b504f820f11621d SHA512 c0daf718f863446b705b471ce6daa8e5581ab38f795a45ba200cbafeccbd1efcbe74a97766e7879631d9fd0e1cd0af88683d01c60fe8643dc1f386ae47ea4cdc WHIRLPOOL 5aeef263bf6bb2a658b7a5c077bb73584195a1c974c429d9d6e8d0110c1c5e42b7825ea7a1b132cf27fd261d052b2a4d737ebbed294469e4eb278becc0a8032f
+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
@@ -9,25 +12,27 @@ AUX cherokee-initd-1.2.99 1185 SHA256 f1cf6e6094948f0ab248a5533c0a19c08c8f6f5bcf
 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 v1.2.103.zip 5783906 SHA256 0e125cba2ad2d0dc48ecca3af4894b92ec5fab422a9d7d27fd0c7a74751e5f35 SHA512 63ba5d41f61d2816df7dce3b572616eca5fc09dd2e9dca9efa2cbf28a38d6d5e1840e4cd302a0eb5780b1a0abe7632232511c77d9e383f0b945d3eca960af4ab WHIRLPOOL 00f592bc41eecd6422a95d6e36bf5c46b4845afe2adad756635d0d2c1e5c1bfde03e633bcbde8cab207c31050dc055e26fcdbf69512a8b61422242905b792754
 EBUILD cherokee-1.2.101-r1.ebuild 4990 SHA256 7b6fafc56edb5ddab3440f82802068db74084b2c9dfba94bc6c258bfb352baa6 SHA512 1664d3d1e7565c7ec6b357deacbc7d49231a9a2ec4ff100bb4759131e37e1bccacb3e47f6cdaf56fcf540fa69e1896c191f7413cc31df29253fe74d0386991f5 WHIRLPOOL f0680ec81b2e02e88c416071e276f15ae37c20c300c741bce9fb55c4fcd0e58d4fb7e5ac24aa2ea643bbc7d0841a080d40b899b29ebd5647b8f7a3a72d703340
 EBUILD cherokee-1.2.101-r2.ebuild 5141 SHA256 6d41d3fe3b9a9bfed30ddd40b28f316a8965a2477245a15bd007d97d86503e30 SHA512 8f48a1b75d4034002c9ebb4724fab5b6271fee0bdf44402c5da05cee003d7a1ec1ced8fa3887794d553c1dfb98639b620fd9cedd72dc449583ca46de30129a27 WHIRLPOOL 05356f1b38e376b98d3c907b370895551bae8c59fdf2fb3d891ef525900935c1d5c27d145b63104550a54781aab83258af4eeb1d140cf5af9210cd8155e2b9fa
 EBUILD cherokee-1.2.101-r3.ebuild 5198 SHA256 7646efd3062ed8a0422dddd1bd6147e9ca6bc6fd28d564e11acc62d4c61c73bf SHA512 4b2711a8aa8b548e4d9ed0f1753b5ec677668ed5ada2808cd22e5e0ed182263e0583a2e258edc40c01bdb811489783a49a335f05b55b1513c0e0b652a36d0258 WHIRLPOOL f010f1d3e03777aff28e0260a4bbc5670be4fec716b700d1d6b57608404f607694882afd51748a8afbd0e9c07d7c119792bfdc15321e1a865000a9d2724cf440
-MISC ChangeLog 22308 SHA256 38f0eb0db6f210e64b9ee63d59149b4dd11114578a2f0aa30fb61b53261bcaa5 SHA512 4963720ff89d0ccaa3c75885de914ca7e0957d6457035f80afd26021f530e1a85dfa4c2a7a26094d598b36388cf110a6fb7a892378b8bc528ab9acca86131c6d WHIRLPOOL 2a07c8e0f21fb4bf6782382f3b9a0279f630f2ce735d47181aa7a31ec246838ed583745aa54d99652ed4b1a032cc321056d92597beca4bcdca74b1154595b502
+EBUILD cherokee-1.2.103.ebuild 5359 SHA256 008463d706c6f2802b5ae8520ae11fb40a9fc598a9e7bed24117689e34a28196 SHA512 cd8daa33ddd6b3db04178f12c976526a8de1eee61878dc1022c5ef0b9c9a6aacbdd57094760aad1782b9cdc7265ccad3c38a23efab71ced34520d0906d8df5ee WHIRLPOOL 9aabd3abc26c740563bd10a195cda6013fdcb69c01465c0d3ffa272fd5d368e59775f5dbfa32c2e53422e4a1a0b89ca0d73d0245216dc5a15fd6692c0e65c23a
+MISC ChangeLog 22578 SHA256 980cc26668d096fa631d5ae5d79b39f2ab5dc6c542f33b9f169e75dc49e03b45 SHA512 2198f3fff3c0271662f2bca50e5c8e1f0447eca7a0621b9153f1d0d25920de5b6fe3625e55fb09f3f1c41f4e5e8a6736eb1a42a7e86cef0841243b85eec551ff WHIRLPOOL 19a0c5bdbf86fa3b0ede98e394c7d36752276eeb56b6d7fab006a4de61c15a57459f9ecd9ca3bef9e2a233dba16a033fd7707880095bcec48f0d8de00c64a4f0
 MISC metadata.xml 440 SHA256 21e70301f21aa69d90ebede277859fcbdd5194528b4ff186610d0143408a0949 SHA512 74b1ea827c31205fe666c6be1475959857148eec167754f11dcccb5098daf3d64ad950793983d7920ea26fd8ac864c7da606c37ecff9841b714ba7b9ad24516d WHIRLPOOL 370deef54eaeaceec348852489cea16e24d9aa472bbbaf93ac18e6c08d160492e108145bfa8ef59636c85e0c2d3a1bd191a0e371ac2e66615fc3d9c34544d547
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR1weMAAoJEJOE+m71LUu6p+EP/R/mVLbJodikzdu6BAdmgBv4
-WMLSYk7qAnV1XXzm4CxjL89vNJi2Tf7KXYQRrzj0ZTK1LMjMAUh878eQR5ePn1FW
-y3jqJXwxgfO8P0998NsLWgrotvk9rg2Yl9fZ96u4FVBr0mTWMy/R5ukFCWe79kCT
-AM/sJ5/qVpxqOn6l+n8lVqlPhAjA30L4WCWYBzzlZyKM0jpHP/m7e1FcmWsxNaBd
-8eU65F+jsdN/t5KR8GYbjTSE4q4zsDEeVpInLHYcWVMA+nqXSwID35S4lUIAcrin
-GwcpsbW3gbBhIAhUBGFmjQ8D/jcKVR3Jg9CTcIDvLnZ4byGiwzHh68max3jaT/xJ
-ymwaMFKgPdN9zTWPiw4i+A6V+1+kTZZx16phlJkOZchgCZfTVK9OXNvC8VdIO5Pi
-kEvQPTfward8FLbIMVdUVGJ2h0tOzV2EBFdVcbWXGu4RzIDOUbgV4iWVufQQPOZ5
-emW5o/igOuXCLST/g6sh0AA4ZQWLraJKaMJyVe6rfLkbIQv6LUHHIr4OzhrQsa/U
-lXg2uBL9eeSC8mWbuvH4iONjBOf1QK5GUGqKz2zX4wDHS2QEl5NrLCm8tQ5NfaT/
-yRvWKymhLrZaRnXRjGBlV0NwQ/oOCSmBUiyg+zRSlMoSD1y8HTr2nBcyWL415UK3
-dDwa/fbg4oGiOeEfeE44
-=vcZC
+iQIcBAEBCAAGBQJR5kmJAAoJEJOE+m71LUu6E6YQAKWQMsp1f5tEzvuYioZnkD3q
+XXUw/8uNP1j6SHh6wEc+KWYCSEqmWNdj7X48nRzHkEUPASKcOn1dnPS25bMrVwi3
+Tq9Us9bcpKu3XpKxr/pOjPOei3sLKLi80PZ6T2cvni+/rhAx3GbNrjlel8JzXpoZ
+FkozJOLklOhm8H+OjSkSzUaELAWFkrySZphRxXQaaFcYSW54j/XG01Xkto7RTfO2
+SvLM2p2AabWf5cC35sJsT2En+XNKl781xXYbUGikeGz+LqVspGdnmvmWxEZ/pxbf
+5bmsiPhp1RbrrdJsnQcYvb/TM7xmYMkBx2JGl5W6VQBLdDooaHpKBWYJ/ykCMhZ/
+xqGI9MHTZB5+bPCQEM/dgK7ep7Oc86xes5OKS0f3sURx1b18PNaBxWNUA5ezwtcP
+jQ0bPm6iniDChg7S8ceQde4zxUAmiMdjZSKphqQ7f7UwRLBkLkct3yByo2HCUEqN
+nGdAKsGsc/JSqKSCOpj55srHD4wEHT8BsFa2NLhtmSifqZ7bc9PfkJeKQBOeTZi2
+85XtaoN+RMaGzI5uSV/Q6++NxyOG6TaVn5S22VNyXOtJd93gIjVBprivuSsQB9st
+3XmuIP3RHR3XFy3J/PFFUa7ErlUaFfv5d4HxV22ASo+ov5pBQf4dJW/FxVA9SXap
+B8dI0bFt4NTVdGbvvumb
+=lJgx
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.2.103.ebuild b/www-servers/cherokee/cherokee-1.2.103.ebuild
new file mode 100644
index 000000000000..c2c2722596e3
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.2.103.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.103.ebuild,v 1.1 2013/07/17 07:34:08 blueness Exp $
+
+EAPI="5"
+PYTHON_DEPEND="admin? 2"
+PYTHON_USE_WITH="threads"
+
+WANT_AUTOMAKE="1.11"
+
+inherit autotools eutils multilib pam python systemd
+
+DESCRIPTION="An extremely fast and tiny web server."
+SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip"
+HOMEPAGE="http://www.cherokee-project.com/"
+S="${WORKDIR}"/webserver-${PV}
+
+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.103-linux3.patch" \
+		"${FILESDIR}/${PN}-1.2.103-fix-configure.ac.patch" \
+		"${FILESDIR}/${PN}-1.2.103-fix-Makefile-CTK.patch"
+
+	${S}/po/admin/generate_POTFILESin.py > po/admin/POTFILES.in
+	eautoreconf
+
+	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 NEWS README.rst
+
+	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.103-fix-Makefile-CTK.patch b/www-servers/cherokee/files/cherokee-1.2.103-fix-Makefile-CTK.patch
new file mode 100644
index 000000000000..98b31823e4dc
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-1.2.103-fix-Makefile-CTK.patch
@@ -0,0 +1,11 @@
+diff -Naur webserver-1.2.103.orig/admin/Makefile.am webserver-1.2.103/admin/Makefile.am
+--- webserver-1.2.103.orig/admin/Makefile.am	2013-01-26 17:52:44.000000000 -0500
++++ webserver-1.2.103/admin/Makefile.am	2013-07-17 03:28:32.000000000 -0400
+@@ -1,6 +1,6 @@
+ ## Cherokee: Makefile.am  -*- makefile -*-
+ 
+-SUBDIRS = plugins wizards CTK icons
++SUBDIRS = plugins wizards icons
+ 
+ if INSTALL_ADMIN
+ SUBDIRS += static
diff --git a/www-servers/cherokee/files/cherokee-1.2.103-fix-configure.ac.patch b/www-servers/cherokee/files/cherokee-1.2.103-fix-configure.ac.patch
new file mode 100644
index 000000000000..3292c1bd7a37
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-1.2.103-fix-configure.ac.patch
@@ -0,0 +1,16 @@
+diff -Naur webserver-1.2.103.orig/configure.ac webserver-1.2.103/configure.ac
+--- webserver-1.2.103.orig/configure.ac	2013-01-26 17:52:44.000000000 -0500
++++ webserver-1.2.103/configure.ac	2013-07-15 08:36:01.000000000 -0400
+@@ -1597,12 +1597,6 @@
+ admin/static/images/flags/Makefile
+ admin/static/images/wizards/Makefile
+ admin/static/images/other/Makefile
+-admin/CTK/Makefile
+-admin/CTK/CTK/Makefile
+-admin/CTK/static/css/Makefile
+-admin/CTK/static/images/Makefile
+-admin/CTK/static/js/Makefile
+-admin/CTK/static/Makefile
+ po/Makefile
+ ])
+ 
diff --git a/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch b/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch
new file mode 100644
index 000000000000..7f96f68ab97e
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch
@@ -0,0 +1,36 @@
+diff -Naur webserver-1.2.103.orig/admin/SystemStats.py webserver-1.2.103/admin/SystemStats.py
+--- webserver-1.2.103.orig/admin/SystemStats.py	2013-01-26 17:52:44.000000000 -0500
++++ webserver-1.2.103/admin/SystemStats.py	2013-07-15 07:27:11.000000000 -0400
+@@ -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 webserver-1.2.103.orig/admin/util.py webserver-1.2.103/admin/util.py
+--- webserver-1.2.103.orig/admin/util.py	2013-01-26 17:52:44.000000000 -0500
++++ webserver-1.2.103/admin/util.py	2013-07-15 07:29:12.000000000 -0400
+@@ -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"):
+diff -Naur webserver-1.2.103.orig/admin/wizards/php.py webserver-1.2.103/admin/wizards/php.py
+--- webserver-1.2.103.orig/admin/wizards/php.py	2013-01-26 17:52:44.000000000 -0500
++++ webserver-1.2.103/admin/wizards/php.py	2013-07-15 07:29:47.000000000 -0400
+@@ -607,7 +607,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