Version bump. Bug #533502. Thanks Leho Kraav.

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

3 files changed, 212 insertions, 15 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 1cf5ac9363ec..c6c9794b5f03 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.104 2015/03/07 16:44:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.105 2015/03/07 16:45:29 blueness Exp $
+
+*cherokee-1.2.104 (07 Mar 2015)
+
+  07 Mar 2015; Anthony G. Basile <blueness@gentoo.org> +cherokee-1.2.104.ebuild:
+  Version bump.  Bug #533502.  Thanks Leho Kraav.
 
   07 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
   -cherokee-1.2.101-r1.ebuild, -cherokee-1.2.101-r2.ebuild:
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index f56b4195dd43..4b3ee80daa2b 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -11,25 +11,27 @@ AUX cherokee.logrotate-r1 377 SHA256 db1b0d69dc323500a37c167e6ff45e2a9cf71098352
 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 5151 SHA256 7b11263d7a591bd0a98845bbf308bb9cf4fcea5fae8f9789b100b881c705a9e7 SHA512 74f90c96d038b27ffe3bed035f6b0a408a361f2acc539573e6f05d2aac1a6a721c2a3d1b18c94082d1eb8e20a4fe53ed3d60f02de47a7e6453c8dc1ab7e11c83 WHIRLPOOL e4dc04929471db3c5a0716c2af8d582809f45f8831ddb75e48b4114074ae716b508f898c5ddac1896308d2afa50ee064f7c98171bc1bd0b4ff56ecfce1574c72
-MISC ChangeLog 23726 SHA256 3a3e0e94ff2c8ffe11e45d0fa4d983413c1fc246d0c939f2cd6856ff0cc6c984 SHA512 d28cb7f34933a1370a2a09eb7f76cb0b22c788a74b323afa789a26c4dad3c17a8f35b306edae19348462a72955f4db27ed3a670a965956c3803c19bae9caabec WHIRLPOOL c08e729b6b126a3bf57151a08b4ab9d83e52d726206c16db660d4a114ae0e022e8308e7d72acb892e7d258d1ec7604889c2c9b1027ac85f02ffb747cc1be029b
+EBUILD cherokee-1.2.104.ebuild 4951 SHA256 e046c7dbb10afc02cffa393bc6c9dd30c5e5d1c50b27b59da051f3b512fcf272 SHA512 93dd83b60d1421b33bc329d3d235225c779650965a25112e1e63fa94a693566cd0aa9f8ea7948781ee1bfd96db987374a37cf5fc00cc48d4ac0ccb45568fa36e WHIRLPOOL fd7a3e32b2aac567423bb5ff7cf04df60a1b11fcd475b8d489985e7e6078e2260e51099cca6a04ff3f65e3d6b23b1881eeb8ba5b13760f5184b31ed26b2da1bb
+MISC ChangeLog 23891 SHA256 9c0d6d50fedc7cc301382a19624272eb3273c0e53a6bc7bdbdab27725e2ce24e SHA512 1e631f8c655cf598d9bf26de398e2a64b788ced54946d2749635279b5040f897082a2c93e49c3b207d16152f0c65ba7b67a0cefeb8cf4d98d98f786b2778209e WHIRLPOOL 7182ead46b20f4a7a8c54283c7c1073c6b0eb4b23b7e2aa8e44f00c43305e71b14f7ae1a1809543e9f2802eed34fac97417861cb410c8165ac6909b6c5a7cb29
 MISC metadata.xml 440 SHA256 21e70301f21aa69d90ebede277859fcbdd5194528b4ff186610d0143408a0949 SHA512 74b1ea827c31205fe666c6be1475959857148eec167754f11dcccb5098daf3d64ad950793983d7920ea26fd8ac864c7da606c37ecff9841b714ba7b9ad24516d WHIRLPOOL 370deef54eaeaceec348852489cea16e24d9aa472bbbaf93ac18e6c08d160492e108145bfa8ef59636c85e0c2d3a1bd191a0e371ac2e66615fc3d9c34544d547
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU+ytmAAoJEJOE+m71LUu6fmQP/1X/7vbBDoChsMFgUJUf6Pwq
-ky300q7KlMFWtNNz3wqJjKW4+CjQupmBYK/h1M8zxFTORskwmQXOC4KPZLhCAW+a
-Fc7CYC9QdR+lrTq6NalXMMa3AndcATBF/oxtS3EfskP+0CphVmJgFjH/sTxdwrk7
-MRRVqu8pUTwklOljCQNynSwKo1AoAFHV4HLAyuk3zWOVrMy3vGlu9lg7wybyDSkM
-iBXDhC5sUmVVEbiAPVqZSmfx+/RGcxToeO0BrZ9cHtrxgdTPNZ0HndsN1xtKHUux
-sR22UKw/mLMhfmO7TyBDuqSOYVawlZ09tGOoGIjIjNXLI1xN5cwfd55cnUe1qcdF
-+m/qaLeN8uRoGpPmR0fGAfIWagPykNG+61FWYRxYIvF74aQbF4JaUkgn5yf4HHIZ
-hCoks69Jktua+21PpD4isJLlFIHzgoytoKNM17hUJ6FIyYCmbRUS+y7KveAwZj0F
-7XCbeplOZvpXmH4GwuXhRoI4GGhx5n6SVm50bMo18jpOe72xYHDKkyMA4Q6zAAxr
-GLEBryuBl5DfAZ490pBZTu2SKTUU9OCGSYU3+d1FqzAcvYxCGUKLm70M47ypY96K
-vm4j7bDgsjQxsAzDMtTyN0V2IdwuEd/AmiFJ/0yowPBrAIXRggrw+ncPABbddW4c
-g/rSwVrRNYH5bUWi1XfC
-=NtSr
+iQIcBAEBCAAGBQJU+yu1AAoJEJOE+m71LUu6n6gQAIxnCsqc2rNugDEBncHPmnKu
+A3Mt0mamItGJc/My2gRZGfSMi7jEm2BjAR8K9Q92BH69Q9UDHlfKR86RzR6iolL/
+e1o24/IeutUC6UkuALWjyUSHBRM4J46fJRUjOuO55fZV45ZbZmLOnAEYfriO/cfv
+xSXPssg9vLLwirH4TgG8cXXod6PeslAwJ/GeXY48wftve9HlJUnlnUU1hybk7uhb
+3GPD4pr2KzaI5P5L0+CFELpxq5lE+TFvveAhfuzjs8KfJuAF2QVWri9P0bMqK0Uo
+9fS3OrDA/MC/1bm9ZcLdWMts6CwJK5crervRJJ3Ip4zkD4HDPxpGXbooE2D5SKVe
++TtGC8esJ1j6vEu9sOSrfAttcrPSEajHXJayM4BydGkbLDDNAr1HTeLrRwf/9Iim
+2D2MFaqLqgNXDxanMoOpQSRqDYwXLxsoABZ8pUvsP490fTMweJmJWlIY/jK/hohS
+sX0pY2TlNNPG7HANkIyrb9oFk6HiJlAok0z0vkh6NI05THQQgnpvnvyaRT7WvzHG
+gRu+kAWxmICPHXrWi8O5Dwtlq8SopMLMBYarKbv57QG4OvJws/Y8RcvvMcxmnhx0
+KRTRdyti6BZfnSiwgJ2uR2Y1B8qDmvrUda+ocPTgCR+axdCZw32nbpjUDuG51KcA
+fp8LDClNK/BEMonKOM09
+=bV2O
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104.ebuild
new file mode 100644
index 000000000000..984727a35219
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.104.ebuild,v 1.1 2015/03/07 16:45:29 blueness Exp $
+
+EAPI="5"
+
+WANT_AUTOMAKE="1.11"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools python-r1 eutils multilib pam systemd user
+
+DESCRIPTION="An extremely fast and tiny web server"
+SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip"
+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"
+
+src_unpack() {
+	unpack ${A}
+	mv "webserver-${PV}" "${S}" || die
+}
+
+pkg_setup() {
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www cherokee
+}
+
+src_prepare() {
+	python_setup
+	epatch \
+		"${FILESDIR}/${PN}-1.2.99-gentoo.patch"
+
+	"${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use admin ; then
+		myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
+	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
+
+	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
+		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
+}