Add systemd file bug #475874

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

4 files changed, 231 insertions, 8 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index fd27d68e11db..a99b649b5c06 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.96 2012/11/25 17:24:03 lu_zero Exp $
+# 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 $
+
+*cherokee-1.2.101-r3 (05 Jul 2013)
+
+  05 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  +cherokee-1.2.101-r3.ebuild, +files/cherokee.service:
+  Add systemd file bug #475874
 
   25 Nov 2012; Luca Barbato <lu_zero@gentoo.org> cherokee-1.2.101-r2.ebuild,
   +files/cherokee-1.2.101-libav-9.patch:
@@ -652,4 +658,3 @@
  
   13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Added missing changelog entry.
-
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 959e6b4402c2..ccf631d29025 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -7,15 +7,27 @@ AUX cherokee-1.2.99-gentoo.patch 1763 SHA256 66b3e85370082feb20205ed484a858a7965
 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
 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
-MISC ChangeLog 22129 SHA256 dda126dc725ade44c27039cae665133067840c28abae524d4512869ac0b4a739 SHA512 60e72a29c895e9a9dbfc252c70d577df7321a84697b6f90e8a60b081c9d5a78da7c544484786ad013e4be477be3340eadde459ffec5e7a8b631f0ac596c00e4a WHIRLPOOL 8a9afabd4f95064ff0bd26fa180323663b8ee57bd56a06d89d02e72269b6a2eec679d72d3e5ef024f4928910c1824536dff9033e3498812009c2aa8d698870d9
+EBUILD cherokee-1.2.101-r3.ebuild 5198 SHA256 7646efd3062ed8a0422dddd1bd6147e9ca6bc6fd28d564e11acc62d4c61c73bf SHA512 4b2711a8aa8b548e4d9ed0f1753b5ec677668ed5ada2808cd22e5e0ed182263e0583a2e258edc40c01bdb811489783a49a335f05b55b1513c0e0b652a36d0258 WHIRLPOOL f010f1d3e03777aff28e0260a4bbc5670be4fec716b700d1d6b57608404f607694882afd51748a8afbd0e9c07d7c119792bfdc15321e1a865000a9d2724cf440
+MISC ChangeLog 22308 SHA256 38f0eb0db6f210e64b9ee63d59149b4dd11114578a2f0aa30fb61b53261bcaa5 SHA512 4963720ff89d0ccaa3c75885de914ca7e0957d6457035f80afd26021f530e1a85dfa4c2a7a26094d598b36388cf110a6fb7a892378b8bc528ab9acca86131c6d WHIRLPOOL 2a07c8e0f21fb4bf6782382f3b9a0279f630f2ce735d47181aa7a31ec246838ed583745aa54d99652ed4b1a032cc321056d92597beca4bcdca74b1154595b502
 MISC metadata.xml 440 SHA256 21e70301f21aa69d90ebede277859fcbdd5194528b4ff186610d0143408a0949 SHA512 74b1ea827c31205fe666c6be1475959857148eec167754f11dcccb5098daf3d64ad950793983d7920ea26fd8ac864c7da606c37ecff9841b714ba7b9ad24516d WHIRLPOOL 370deef54eaeaceec348852489cea16e24d9aa472bbbaf93ac18e6c08d160492e108145bfa8ef59636c85e0c2d3a1bd191a0e371ac2e66615fc3d9c34544d547
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlCyVDwACgkQcXOrnRGRc45RbQD/eBQ7P+cTlG8i+Y1GOqHXKagj
-IlB66EKEslBam5wyqcYBAMmV02XnYWRlGqSbaPvZ0LkT+zLPzSsrrq//RbQB0axI
-=jRCt
+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
 -----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
new file mode 100644
index 000000000000..b440a784e819
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.2.101-r3.ebuild
@@ -0,0 +1,196 @@
+# 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.101-r3.ebuild,v 1.1 2013/07/05 17:49:14 blueness Exp $
+
+EAPI=4
+PYTHON_DEPEND="admin? 2"
+PYTHON_USE_WITH="threads"
+
+inherit eutils multilib pam python versionator systemd
+
+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.service b/www-servers/cherokee/files/cherokee.service
new file mode 100644
index 000000000000..a2d703185d37
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Cherokee web server
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
+
+[Install]
+WantedBy=multi-user.target