No longer keepdir /var/run/saku. #451418 ; Fix doc path.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key F8551514)

4 files changed, 23 insertions, 13 deletions

diff --git a/net-p2p/saku/ChangeLog b/net-p2p/saku/ChangeLog
index 656c52d75431..96f65e4151b7 100644
--- a/net-p2p/saku/ChangeLog
+++ b/net-p2p/saku/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/saku
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/saku/ChangeLog,v 1.4 2012/07/13 09:42:47 naota Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/saku/ChangeLog,v 1.5 2013/01/12 04:56:54 naota Exp $
+
+*saku-3.11.0-r1 (12 Jan 2013)
+*saku-3.10.1-r1 (12 Jan 2013)
+
+  12 Jan 2013;  <naota@gentoo.org> +saku-3.10.1-r1.ebuild,
+  +saku-3.11.0-r1.ebuild, -saku-3.10.1.ebuild, -saku-3.11.0.ebuild, files/saku:
+  No longer keepdir /var/run/saku. #451418 ; Fix doc path.
 
   13 Jul 2012; Naohiro Aota <naota@gentoo.org> saku-3.10.1.ebuild,
   saku-3.11.0.ebuild:
diff --git a/net-p2p/saku/files/saku b/net-p2p/saku/files/saku
index aeeea78e6709..303da131f495 100644
--- a/net-p2p/saku/files/saku
+++ b/net-p2p/saku/files/saku
@@ -1,7 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/saku/files/saku,v 1.1 2011/11/01 13:19:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/saku/files/saku,v 1.2 2013/01/12 04:56:54 naota Exp $
+
+PID_DIR=/var/run/saku
 
 depend() {
 	use dns
@@ -9,15 +11,16 @@ depend() {
 }
 
 start() {
-	rm -f /var/run/saku/pid.txt
+	mkdir -p $PID_DIR
+	rm -f ${PID_DIR}/pid.txt
 	ebegin "Starting p2p bbs: saku"
 	start-stop-daemon --start -u saku -g saku --quiet -b \
-	    -p /var/run/saku/pid.txt --exec /usr/bin/saku
+	    -p ${PID_DIR}/pid.txt --exec /usr/bin/saku
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping p2p bbs: saku"
-	start-stop-daemon --stop --quiet -p /var/run/saku/pid.txt
+	start-stop-daemon --stop --quiet -p ${PID_DIR}/pid.txt
 	eend $?
 }
diff --git a/net-p2p/saku/saku-3.10.1.ebuild b/net-p2p/saku/saku-3.10.1-r1.ebuild
index 1110098a6806..0153e82eccd7 100644
--- a/net-p2p/saku/saku-3.10.1.ebuild
+++ b/net-p2p/saku/saku-3.10.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/saku/saku-3.10.1.ebuild,v 1.2 2012/07/13 09:42:47 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/saku/saku-3.10.1-r1.ebuild,v 1.1 2013/01/12 04:56:54 naota Exp $
 
 EAPI=3
 
@@ -27,6 +27,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i -e "/^prefix/s:/usr:${EPREFIX}/usr:" file/saku.ini || die
+	sed -i -e "s:root/share/doc/saku/:root/share/doc/${PF}/:" setup.py || die
 }
 
 src_install() {
@@ -40,6 +41,5 @@ src_install() {
 
 	diropts -o saku -g saku
 	dodir /var/log/saku
-	dodir /var/run/saku
 	dodir /var/spool/saku
 }
diff --git a/net-p2p/saku/saku-3.11.0.ebuild b/net-p2p/saku/saku-3.11.0-r1.ebuild
index 795d96d9a636..161077873251 100644
--- a/net-p2p/saku/saku-3.11.0.ebuild
+++ b/net-p2p/saku/saku-3.11.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/saku/saku-3.11.0.ebuild,v 1.2 2012/07/13 09:42:47 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/saku/saku-3.11.0-r1.ebuild,v 1.1 2013/01/12 04:56:54 naota Exp $
 
 EAPI=3
 
@@ -27,6 +27,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i -e "/^prefix/s:/usr:${EPREFIX}/usr:" file/saku.ini || die
+	sed -i -e "s:root/share/doc/saku/:root/share/doc/${PF}/:" setup.py || die
 }
 
 src_install() {
@@ -40,6 +41,5 @@ src_install() {
 
 	diropts -o saku -g saku
 	dodir /var/log/saku
-	dodir /var/run/saku
 	dodir /var/spool/saku
 }