Non-maintainer commit: Version bump

Package-Manager: portage-2.2.0_alpha35/cvs/Linux x86_64

3 files changed, 180 insertions, 6 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index dcf08a9eb360..5f45b35f239d 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.83 2011/04/04 12:06:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.84 2011/05/24 07:03:20 polynomial-c Exp $
+
+*cherokee-1.2.2 (24 May 2011)
+
+  24 May 2011; Lars Wendler <polynomial-c@gentoo.org> +cherokee-1.2.2.ebuild:
+  Non-maintainer commit: Version bump.
 
   04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cherokee-1.0.12.ebuild,
   cherokee-1.2.0.ebuild, cherokee-1.2.1.ebuild:
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index e3de70de36b4..939958e6deac 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,20 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX cherokee-initd-0.99.23 542 RMD160 e0ee20b7bb781797c3a53d0e2804e8b0fe985beb SHA1 4a8b43509aa4b9bf1079e0e74ca9d61428672522 SHA256 9e58ed7b3050a17fed08cc682e30dfa14e09eb804084b6cc9b213ccd0843300f
 AUX cherokee-initd-1.2.0 717 RMD160 79d5e72dabc0183ae7e8d6453d83b1e549cac736 SHA1 04efcc25ab326a695944b45e12a1057a3574181e SHA256 c6cd9b7ab782aa5f3242bbdfcefabf4fff05ea253e7af1175df5eb2da7e6255d
 DIST cherokee-1.0.12.tar.gz 5710898 RMD160 21022ac54c32324d3d738e7afb104aa76c96374f SHA1 6a514ea6816252400c777cca4d91658575f49091 SHA256 37fbece8df5af26773710100f85008a9d65e3f363885ce7228f32e882b21fc75
 DIST cherokee-1.2.0.tar.gz 5898536 RMD160 e0b9f7af51cf21c94130b3ad3b106821cd35c3b9 SHA1 af8e4ee0e3dce59db86855a59aa0724ca0cfb331 SHA256 835df63bc97324d9a27d9bf3980de25cddae3edc55a2c72b01dc721ac604076a
 DIST cherokee-1.2.1.tar.gz 6041090 RMD160 d6285e8dd157b689eb1b2cd2369daf2bf812ba59 SHA1 982bc99e966218661abd562d604aea32923bfde9 SHA256 8ce6f35f521b8b0a45b5c95587b3653a137f9d8eed5ee7ffd3e8fa6cb922a668
+DIST cherokee-1.2.2.tar.gz 6108853 RMD160 1fa6cd0daae90bcf79b1d4cc7e63b318fbe0ed5e SHA1 6fe2df38308cd05d1531f5d4db5198b8438b5134 SHA256 1dc3afbdb510030d5a1801e01936bc863d0b5811b512b288b46d8143a6cfc475
 EBUILD cherokee-1.0.12.ebuild 4157 RMD160 200c962991c6c947e234b9fa4546f1dd3d827d7d SHA1 0d4832f2361d8e83bba07b42002a7de0a9697db1 SHA256 a5c85e604e4a02ab4a20c88ebf6c7b70f01f46491fe1a4a6179f79151867a07a
 EBUILD cherokee-1.2.0.ebuild 4152 RMD160 c2beb0bf529e26ebfc729d0f536a0a5e4c7282c7 SHA1 fd04a0bf5e8d00cd52a0b9d3e6554164236c1036 SHA256 965f7ee1e40fde54b1f8c3a4f3da95dfae4500559a9bbab3382ab543d0b3954c
 EBUILD cherokee-1.2.1.ebuild 4152 RMD160 7ceeda0703cd4a3bac513ba7bdb636d11034dcc7 SHA1 51206f2a53d226fbd877e8eee03e159a80cd90b9 SHA256 923c7cbea1560abca1aedae25cd450d9d0c800a60731a29c9aed64257c4d7a37
-MISC ChangeLog 19596 RMD160 0f8a1e0d24f86e61064e99f61ff0348a4dd47ba7 SHA1 ca28ac15b302d22e0f7034415a46bf5c2d08bbfa SHA256 2d66417f96dad8b506d7c5bd2743ab91554657f5e78c3fdf9152edc56f2ed5fc
+EBUILD cherokee-1.2.2.ebuild 4155 RMD160 fc1b4231c75ca4a2026a42c37844a74d24f8bfdd SHA1 749f5eb584e5da1b586c470b2bd23331c27f5f44 SHA256 506142d95260e31854d5313c654b6eaa27612fadc05e6b7ee38704d57c776115
+MISC ChangeLog 19748 RMD160 cf073e3c94d6e03a7ccce5d60bdb55b0b68273e7 SHA1 b47f1a02ae54d442dbbf520929d28b67d683942d SHA256 d60a4187a7d71e6f2a16c4313a48965580bff2bc714d7b4a0f03649f32369051
 MISC metadata.xml 488 RMD160 6689708f9508ed17b4f67284e8fef3512161b432 SHA1 c7a8168a8e6b119bee60b536552f378cf670130b SHA256 4ee7f5937c157209c4d78429188bcfc36b9c063252760215ce2e70da1ff95496
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2ZsvcACgkQHB6c3gNBRYeVXQCgyCqM3rcFzv6LqxsBBy66aFwE
-+34AoJytk4DibPmcYDTm49TqzgUDxXc5
-=uk+K
+iQIcBAEBCgAGBQJN21g+AAoJEPiazRVxLXTFejEP/iP5Fxm01IRQjZ6G5/kBJPp3
+Y02TPkdRsdmySAjlLLPzpVw9BDsoGsrbam+fciFkn1FRSWy1uWLavWS8sJuw+lbw
+ClBt2S7FY8Olv0kE5/o/2O1Pkm8TivrrWP8g5zQ+IxqPDfc3X2MY2IZpSQeprWrV
+5plIM49mp5ZN/Du3/J4Hj+JlmJ8SGN4fsSW/3qeo8Jjd7i6gK/SggJXlElYbbPDs
+7ZFQ+AjuUzkyLtMSL7x4LPCjLbojbTB3l+IrkhTkj6J+UkzLHTEoOa6VKT1OUdvl
+41yQSOnpwmt4qxakNpZoDocvo3lNi8fY6S1YTfj7+rpUnSIAe8axcHv9x5kO6I+u
+ouKwtH/r5jhZxjGZDhvGWFB957SPYxsmj/PtagcCqUj5qpIOO4/W/Bkj4opfC+sA
+y8RwXS7vadb/5GQ6/WBGWOCQL9M9t/HVzrrsIphqZMj5Q9KBMyEW7B+tMg5K+IxR
+TPFU3kgUks3MDoXrrLDW1JJmo6/k+PapZu1UMAJonmcIU5RGPxF1eCqMx37BQhWg
++hhyMiPa3vIzh1Ien7Yh0qzE9CkNatIUQlo7zQSwy8tPcbmDhzUcvqrH/doKAiIS
+JpLMutSpzzR1QgqG647GqD9VcdODdGFpFX7VNjQXMappi1mGZmcOcxk1v8iI/erf
+qJB73r3V+V4oJA+W22xi
+=po/S
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.2.2.ebuild b/www-servers/cherokee/cherokee-1.2.2.ebuild
new file mode 100644
index 000000000000..982f235c4caa
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.2.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.2.ebuild,v 1.1 2011/05/24 07:03:20 polynomial-c Exp $
+
+EAPI=2
+PYTHON_DEPEND="admin? 2"
+
+inherit python eutils pam versionator libtool
+
+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 ~x86"
+IUSE="ipv6 nls ssl static pam coverpage kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi rrdtool"
+
+RDEPEND="
+	>=sys-libs/zlib-1.1.4-r1
+	rrdtool? ( net-analyzer/rrdtool )
+	nls? ( sys-devel/gettext )
+	ssl? ( dev-libs/openssl )
+	pam? ( virtual/pam )
+	geoip? ( dev-libs/geoip )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	fastcgi? ( www-servers/spawn-fcgi )
+	ffmpeg? ( virtual/ffmpeg )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
+src_configure() {
+	local myconf
+
+	if use static ; then
+		myconf="${myconf} --enable-static --enable-static-module=all"
+	else
+		myconf="${myconf} --disable-static"
+	fi
+
+	if use debug ; then
+		myconf="${myconf} --enable-trace"
+	fi
+
+	local os="Unknown"
+	case "${CHOST}" in
+		*-freebsd*)
+			os="FreeBSD" ;;
+		*-netbsd*)
+			os="NetBSD" ;;
+		*-openbsd*)
+			os="OpenBSD" ;;
+		*)
+			os="Linux" ;;
+	esac
+
+	# No options to enable or disable ssl since Cherokee 0.11
+
+	# This make cherokee 1.2 sad
+	#	$(use_enable threads pthread) \
+	econf \
+		${myconf} \
+		$(use_enable pam) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable kernel_linux epoll) \
+		$(use_with geoip) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with ffmpeg) \
+		--disable-dependency-tracking \
+		--enable-os-string="Gentoo ${os}" \
+		--with-wwwroot=/var/www/localhost/htdocs \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog
+
+	use pam && pamd_mimic system-auth cherokee auth account session
+	newinitd "${FILESDIR}/${PN}-initd-1.2.0" ${PN} || die "newinitd failed"
+
+	dodir /usr/share/doc/${PF}/contrib
+	insinto /usr/share/${PF}/contrib
+	doins contrib/07to08.py
+	doins contrib/08to09.py
+	doins contrib/09to010.py
+	doins contrib/011to098.py
+	doins contrib/098to099.py
+	doins contrib/0999to09910.py
+	doins contrib/make-cert.sh
+
+	keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs
+
+	use coverpage || rm -rf "${D}"/var/www/localhost/htdocs/{index.html,images}
+	if use admin ; then
+		exeinto /usr/share/cherokee/admin
+		doexe admin/server.py
+	else
+		rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin
+	fi
+
+	# Puts logs in /var/log/cherokee/
+	dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf
+
+}
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+pkg_postinst() {
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www/localhost cherokee
+	install -o cherokee -g cherokee -m0775 -d "${ROOT}"var/log/cherokee
+
+	# check if user/group was defined if not add it
+	gr="/bin/grep -q"
+	ec="/bin/echo"
+	$gr server\!user /etc/cherokee/cherokee.conf ; rtu=$?
+	$gr server\!group /etc/cherokee/cherokee.conf ; rtg=$?
+
+	[[ "x$rtu" == "x1" ]] && $ec server\!user = cherokee >> /etc/cherokee/cherokee.conf
+	[[ "x$rtg" == "x1" ]] && $ec server\!group = cherokee >> /etc/cherokee/cherokee.conf
+
+	if use admin ; then
+		echo  ""
+		elog "Just run 'cherokee-admin' and go to: http://localhost:9090"
+		echo  ""
+	else
+		echo  ""
+		elog "Try USE=admin if you want an easy way to configure cherokee."
+		echo  ""
+	fi
+
+	echo ""
+	elog "Config format can change in different versions. Check converter script in:"
+	elog "	  /usr/share/${PF}/contrib/"
+	elog "for example:"
+	elog "	  PYTHONPATH="/usr/share/cherokee/admin/" python \\"
+	elog "	  /usr/share/${PF}/contrib/0999to09910.py \\"
+	elog "	  /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15"
+
+}