Move distributed htdocs to doc dir, bug #429632

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 206 insertions, 6 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 62a160ece5f3..d18f8a0124a5 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.94 2012/07/15 17:59:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.95 2012/08/08 12:28:37 blueness Exp $
+
+*cherokee-1.2.101-r2 (08 Aug 2012)
+
+  08 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +cherokee-1.2.101-r2.ebuild:
+  Move distributed htdocs to doc dir, bug #429632
 
   15 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
   cherokee-1.2.101-r1.ebuild:
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index eea9527ae7c6..5c8c94c137f0 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -6,14 +6,15 @@ 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
-DIST cherokee-1.2.101.tar.gz 6320209 RMD160 dd3dedc352ba17bdcefd8e200143b8ffa19ad035 SHA1 b27f149c7d7111207ac8c3cd8a4856c05490d136 SHA256 ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8
+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
-MISC ChangeLog 21816 SHA256 6e908079e7c21a4eb85effa1387bc5463627fca5f9ab072fc414f8f60720fa30 SHA512 c6e108f179e2761e0b8f69ad0339da151ebacfcfbb23179dcc7eb79f6745154c0bd3063c628c1f7fe01e495e90762fe95389d17d751e4d97883a630f73d4b3d2 WHIRLPOOL 27685b9a88656e76dd5a2ea8903e8d5ca2158901095d31fce8bc6342249ffe46ba1781a6b171c5d23c3d228fb550ceb81d199b27358dcd254a8afa5778290e04
+EBUILD cherokee-1.2.101-r2.ebuild 5105 SHA256 98c1f9e242508ddd59a1fd992dc51baa4868e5b037fcd6d6bbe2274df0752730 SHA512 5c9b3bd2d987c388237f619a17d400509e84b3ead3b18354455a10ff289e33d97f0e34ec594cd7195ec2fc22783eddafd49f562f7d2cbd1ab15296e415590052 WHIRLPOOL 354616dfd9a44245aeaec017c936c0713313ceee026898c161430b35f81c548d2e4b2d29b751922fe4cb57747d9066630e0dd1884648ad3bf926e4272c470ffe
+MISC ChangeLog 21989 SHA256 dd1675ee594a981c151757f78e234156afb2b1b72ce1a0f8d1bc13fb948a6cbe SHA512 c1dec6fcb964905409ce499fdf216632a8401abb048200bbddfc9c8d4abacfeb2ebcd929bb65c97d7e794077f2313b60313118c43ce05e972c1382ac09b64daf WHIRLPOOL 42a38444e44ad559d76c523c87aeae4376e24154e208b8c9c9c9e81eff42488f4231a0a0357047ef0316764483d48fb37a699fb7a84dbbadaab6088d13710fed
 MISC metadata.xml 440 SHA256 21e70301f21aa69d90ebede277859fcbdd5194528b4ff186610d0143408a0949 SHA512 74b1ea827c31205fe666c6be1475959857148eec167754f11dcccb5098daf3d64ad950793983d7920ea26fd8ac864c7da606c37ecff9841b714ba7b9ad24516d WHIRLPOOL 370deef54eaeaceec348852489cea16e24d9aa472bbbaf93ac18e6c08d160492e108145bfa8ef59636c85e0c2d3a1bd191a0e371ac2e66615fc3d9c34544d547
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlADBPcACgkQl5yvQNBFVTWZ9QCfVITJ36X9B08xozXd/ytCo66W
-FL0Ani9zSF9kfOYXvkI+hyJwti1R02NW
-=lKoT
+iEYEAREIAAYFAlAiW3gACgkQl5yvQNBFVTWzbACgjsL3tiunqKZXGVtzT4ddnQd+
+wZ4AnRF7l9zK1MLZu7JQzSosnwnGgpqg
+=ik6+
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.2.101-r2.ebuild b/www-servers/cherokee/cherokee-1.2.101-r2.ebuild
new file mode 100644
index 000000000000..4b8f71efc3c7
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.2.101-r2.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/08/08 12:28:37 blueness Exp $
+
+EAPI=4
+PYTHON_DEPEND="admin? 2"
+PYTHON_USE_WITH="threads"
+
+inherit eutils multilib pam python versionator
+
+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"
+
+	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}
+}
+
+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
+}