Fix logrotate file, bug #400759 by Alan Swanson.

(Portage version: 2.1.10.51/cvs/Linux x86_64)

4 files changed, 31 insertions, 28 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/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
+}