Fix logrotate file, bug #400759 by Alan Swanson.

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

5 files changed, 37 insertions, 34 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index b7c61294843a..6e2f078dbd6a 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,13 @@
 # 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.90 2012/03/21 11:28:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.91 2012/03/24 11:26:35 pacho Exp $
+
+*cherokee-1.2.101-r1 (24 Mar 2012)
+
+  24 Mar 2012; Pacho Ramos <pacho@gentoo.org> +cherokee-1.2.101-r1.ebuild,
+  +files/cherokee.logrotate-r1, -cherokee-1.2.101.ebuild,
+  -files/cherokee.logrotate:
+  Fix logrotate file, bug #400759 by Alan Swanson.
 
   21 Mar 2012; Pacho Ramos <pacho@gentoo.org> -cherokee-1.2.100.ebuild,
   -cherokee-1.2.99.ebuild, metadata.xml:
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index a29397f1c8ef..4189515a52a2 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -5,15 +5,15 @@ AUX cherokee-1.2.98-linux3.patch 1914 RMD160 aafe83b052218dc703c22f8d30b92e2027a
 AUX cherokee-1.2.99-gentoo.patch 1763 RMD160 d691687e383bb594e536ad87159a8f4aa6eb88ba SHA1 e0de18027a32fade9b871cef204587ff18f49131 SHA256 66b3e85370082feb20205ed484a858a79656e0adb793fea5be796632fc327201
 AUX cherokee-confd-1.2.98 144 RMD160 05e5dc30e647624c27d0ebb6015d0ca1d4278593 SHA1 e187c35650ef045f7a19b6b72b88081269774948 SHA256 48331d56dfa6743444e0b01ce4df2013b27dd30804c88365257d560cc6adcab0
 AUX cherokee-initd-1.2.99 1185 RMD160 d93399b6efe894248933ab45ccecb83738106d83 SHA1 e8d975c93682773e0f074261a54fbac773058e4d SHA256 f1cf6e6094948f0ab248a5533c0a19c08c8f6f5bcfa004072e3ecf1b2b2ace83
-AUX cherokee.logrotate 346 RMD160 4e6af617cd12f48eb6f2cb3925177c899451e223 SHA1 ec7c688287773bc366a9b854108d46894541ad38 SHA256 099d13bf37f469a565f0fb4837a2136abb2e6e94c5000fc03d88eca611b4f930
+AUX cherokee.logrotate-r1 377 RMD160 adbea6f4c12706e0e2652cd0790a88af4e33efee SHA1 f0bc7d04438f52d1f77f1b36a5cdc9e5002f01e0 SHA256 db1b0d69dc323500a37c167e6ff45e2a9cf7109835251d46a606b2a37938fed0
 DIST cherokee-1.2.101.tar.gz 6320209 RMD160 dd3dedc352ba17bdcefd8e200143b8ffa19ad035 SHA1 b27f149c7d7111207ac8c3cd8a4856c05490d136 SHA256 ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8
-EBUILD cherokee-1.2.101.ebuild 5148 RMD160 105b2ae720768986bb69d1066e5919e2ae8d1624 SHA1 46c09fc1fccbd147dfd5a6c758cd37d01ae52244 SHA256 5e381901f8eb677de80e8077f561047dfc0b13d3157a90666b0a6ed26075b72d
-MISC ChangeLog 21262 RMD160 a16139bf4d9b14942979a40c87fd358a477f9d67 SHA1 b56862cd87bf1a14cb133ce1dba811c663d6b047 SHA256 5975154944f360533614e503f84c2a701671d6085cc2a454a587fb5c22ed0fcb
+EBUILD cherokee-1.2.101-r1.ebuild 4964 RMD160 aeeba683bf115a52f084725a19a4584aeabea0c8 SHA1 f60bfd82e3202e54c70e031ba71193be3ed7fbbb SHA256 0dbf827cecf86427ef6d9286890c51f746e0b0983df84c2bc68da229a2eabb73
+MISC ChangeLog 21512 RMD160 2d3035c216c7848922f5d57d5b7de4025990f5d3 SHA1 676129473e5d68c7e76247d636b65e14fd3b94b2 SHA256 c00095ce6b48aed8999ac1b97baa705b0de57fde10d4d852ce48eabd81cfb37b
 MISC metadata.xml 417 RMD160 7d8a398fe5787ec1b90d2b9bce8f1604fc47edd5 SHA1 9ddec817caa4a2d5a691ea1655d1ddbb8a601603 SHA256 d5e83edfbdfa18e0939a53012da5bde8846679b00414451f0b147b4539e68e97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9pu38ACgkQCaWpQKGI+9ThuQCdHlt9HTYARlH8XG1A3ZIVlotg
-4i0An0i5ZxDoSUHPDRMi2QpNV5WQQAQb
-=zI+D
+iEYEARECAAYFAk9tr3EACgkQCaWpQKGI+9Q0/QCdG/8AFie3d7qHYsTYh/pWx3oT
+wdkAoIfSZuHBXH+xv0Dg4j0y6YhU1jXR
+=ozZo
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.2.101.ebuild b/www-servers/cherokee/cherokee-1.2.101-r1.ebuild
index d7ad69421ea2..d21d9743fd2d 100644
--- a/www-servers/cherokee/cherokee-1.2.101.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.101-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.ebuild,v 1.1 2011/10/20 17:10:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.101-r1.ebuild,v 1.1 2012/03/24 11:26:35 pacho Exp $
 
-EAPI="3"
+EAPI=4
 PYTHON_DEPEND="admin? 2"
 PYTHON_USE_WITH="threads"
 
@@ -108,15 +108,11 @@ src_configure() {
 		--with-cgiroot="${EPREFIX}/var/www/localhost/cgi-bin" \
 		--with-wwwuser=cherokee \
 		--with-wwwgroup=cherokee \
-		${myconf} || die "configure failed"
-}
-
-src_test() {
-	emake test || die
+		${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
 	if ! use static-libs ; then
 		find "${ED}" -name '*.la' -delete || die
@@ -124,14 +120,14 @@ src_install() {
 		find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die
 	fi
 
-	dodoc AUTHORS ChangeLog README || die
+	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} || die "newinitd ${PN} failed"
-	newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN} || die "newconfd ${PN} failed"
+	newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN}
+	newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN}
 
 	if ! use admin ; then
 		rm -r \
@@ -142,20 +138,20 @@ src_install() {
 	fi
 
 	exeinto /usr/share/doc/${PF}/contrib
-	doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py} || die
+	doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py}
 
 	keepdir \
 		/var/www/localhost/htdocs \
 		/var/log/cherokee \
-		/var/lib/cherokee/graphs/images || die
+		/var/lib/cherokee/graphs/images
 	fowners cherokee:cherokee \
 		/var/log/cherokee \
 		/var/lib/cherokee/graphs \
-		/var/lib/cherokee/graphs/images || die
+		/var/lib/cherokee/graphs/images
 
 	# logrotate
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN} || die
+	newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN}
 
 	if ! use coverpage ; then
 		rm -r "${ED}"/var/www/localhost/htdocs/* || die
diff --git a/www-servers/cherokee/files/cherokee.logrotate b/www-servers/cherokee/files/cherokee.logrotate
deleted file mode 100644
index ca37a9033933..000000000000
--- a/www-servers/cherokee/files/cherokee.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/files/cherokee.logrotate,v 1.1 2011/09/16 11:57:03 matsuu Exp $
-# lighttpd logrotate script for Gentoo
-
-/var/log/cherokee/cherokee.* {
-  missingok
-  notifempty
-  sharedscripts
-  postrotate
-  [ -f /var/run/cherokee/cherokee.pid ] && /bin/kill -USR2 `cat /var/run/cherokee.pid`
-  endscript
-}
diff --git a/www-servers/cherokee/files/cherokee.logrotate-r1 b/www-servers/cherokee/files/cherokee.logrotate-r1
new file mode 100644
index 000000000000..43d9e74605a9
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee.logrotate-r1
@@ -0,0 +1,11 @@
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/files/cherokee.logrotate-r1,v 1.1 2012/03/24 11:26:35 pacho Exp $
+# lighttpd logrotate script for Gentoo
+
+/var/log/cherokee/cherokee.access /var/log/cherokee/cherokee.error {
+  missingok
+  notifempty
+  sharedscripts
+  postrotate
+  [ -f /var/run/cherokee.pid ] && /bin/kill -USR2 `cat /var/run/cherokee.pid`
+  endscript
+}