www-misc/profile-sync-daemon: Version bump, support to exclude browser profiles

svn path=/sunrise/; revision=12654

5 files changed, 50 insertions, 32 deletions

diff --git a/www-misc/profile-sync-daemon/ChangeLog b/www-misc/profile-sync-daemon/ChangeLog
index 107678e08..1f5690a5f 100644
--- a/www-misc/profile-sync-daemon/ChangeLog
+++ b/www-misc/profile-sync-daemon/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*profile-sync-daemon-3.0 (15 Jan 2012)
+
+  15 Jan 2012; hasufell <julian.ospald@googlemail.com>
+  -profile-sync-daemon-2.8.ebuild, +profile-sync-daemon-3.0.ebuild,
+  -files/psd-manreadme.patch, -files/psd-pid.patch:
+  Version bump, support to exclude browser profiles
+
 *profile-sync-daemon-2.8 (14 Jan 2012)
 
   14 Jan 2012; hasufell <julian.ospald@googlemail.com>
diff --git a/www-misc/profile-sync-daemon/Manifest b/www-misc/profile-sync-daemon/Manifest
index d5f46e0b4..2df9b5e88 100644
--- a/www-misc/profile-sync-daemon/Manifest
+++ b/www-misc/profile-sync-daemon/Manifest
@@ -1,8 +1,8 @@
 AUX cronjob 44 RMD160 56fe960fc97cd7af4a02d550c8039535da9fb1c6 SHA1 f7974834da21ece11425b530fc8ffb1179464b7d SHA256 9e970ba5901963a4de2467d0a8d4fab1f69bfead2ba20312bf5d233a6adae5d2
 AUX daemon 1203 RMD160 c245f300efc8eb0133948d44d06a47843f676132 SHA1 0f89858891b29a31eb2f1b9bcb9867938f9fb637 SHA256 978dafe3318ab1f697596e17c83dc0083e160006a9f325f7dbc73eb8a3aab18d
-AUX psd-manreadme.patch 5649 RMD160 6f89a45ce19ad0038416b3f25c9859de99d17f97 SHA1 ea6108a63b3e5431d405f4ef9f1d8927aee922b7 SHA256 9faad56a9fec35a4714c5fcb2687130d81f5120505196b1285173ba65b16acc9
-AUX psd-pid.patch 923 RMD160 ba33c22ca7291a52b78d1dce46197de55360e6ce SHA1 7ee9e40a004c79aaa6d8d3181df4afa5a13ec2cc SHA256 0d318fb937782363a6b88952e7cba9315f621aeedaf5e3a29734a153a3fb1f9d
-DIST profile-sync-daemon-2.8.tar.xz 15084 RMD160 5cba1c48f901330806aad58247a7f736ab17ea29 SHA1 3936e8e7c70470670349ef2a4c8f1c79f32a2c52 SHA256 33c2e671be6b6c2263a6c39ed71788e7d4ceb04c12715860345b3427811e085f
-EBUILD profile-sync-daemon-2.8.ebuild 1140 RMD160 028dbf80b2e3f8ea35040eaf8bb9b406f56dd37f SHA1 5362dc8b958b73bd1f2b7b190e314aac8e9ed75c SHA256 97fabf9c56dd52617f52c143c0fca9c658e812ebd939d929feb851ceaf3a33a6
-MISC ChangeLog 653 RMD160 4f2aec5d2f689ce119594223c40f92e3a69c7e83 SHA1 1bc1a36f1b423b593a2c103eaf3280a917019a07 SHA256 d2c107cc410227043ef0929a5bfcd7f87767db30141aaa03a916b06fbb139a16
+AUX psd-manreadme.patch 7305 RMD160 f79f1456bdb93bb527ea6c22cbcc39504784a588 SHA1 82bf4ec47ca62da36504972feb477371d3891bc0 SHA256 39dd07a2dae35adc5954cc0c4f36d6ff32524e35d08baa633a2b3daac9e0697a
+AUX psd-pid.patch 988 RMD160 0657f6c6a8f2980b32faa2643326487151e3bb42 SHA1 204cc48d5c21af4e3a4c9f9288757d451732f667 SHA256 7cc477a4d40496a45648facfcc67d1afb4a1f1efb997dc7e82b9d34262728bfd
+DIST profile-sync-daemon-3.0.tar.xz 15572 RMD160 c1cb2b394031b8f1316ae256b8c6c2c58449da26 SHA1 c390183a62f1ba1c9c319870729bec10a6a4e3e7 SHA256 b58588c818dd9ed9a440e536fd8aaa587e1dd9bdfd2619bc85aa9ef6e3e61dfe
+EBUILD profile-sync-daemon-3.0.ebuild 1140 RMD160 028dbf80b2e3f8ea35040eaf8bb9b406f56dd37f SHA1 5362dc8b958b73bd1f2b7b190e314aac8e9ed75c SHA256 97fabf9c56dd52617f52c143c0fca9c658e812ebd939d929feb851ceaf3a33a6
+MISC ChangeLog 921 RMD160 9b46c7251428da6730eacb9df21a0e45f7dcb598 SHA1 9e31f681b394f7a5fc871efa303921c7f200aca2 SHA256 98c1596f026d6f77486c84fffbd5cb7415c53c7183b9a014ccaacc3292e3f598
 MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/www-misc/profile-sync-daemon/files/psd-manreadme.patch b/www-misc/profile-sync-daemon/files/psd-manreadme.patch
index 482f6a073..eeed0e94d 100644
--- a/www-misc/profile-sync-daemon/files/psd-manreadme.patch
+++ b/www-misc/profile-sync-daemon/files/psd-manreadme.patch
@@ -1,26 +1,32 @@
---- psd.manpage.old	2012-01-09 22:25:17.000000000 +0100
-+++ psd.manpage	2012-01-10 21:01:35.000000000 +0100
+--- psd.manpage.old	2012-01-15 03:34:53.000000000 +0100
++++ psd.manpage	2012-01-15 18:19:53.000000000 +0100
 @@ -6,7 +6,7 @@
  .SH SYNOPSIS
  .nf
  .fam C
 -      rc.d [\fIoptions\fP] \fIpsd\fP
-+      rc -s \fIpsd\fP [\fIoptions\fP]
++      rc -s \fIpsd\fP [\fIoptions\fP] 
  
  .fam T
  .fi
-@@ -27,7 +27,7 @@
+@@ -25,9 +25,9 @@
+ .SH SUPPORTED BROWSERS AND CAVEATS
+ Currently, the following browsers are auto-detected and managed: Chromium, Firefox, Google-chrome, Midori, and Opera.
  .PP
- Note that Chromium actually keeps its cache directory separately from its browser profile directory. It is not within the scope of profile-sync-daemon to modify this behavior; users are encouraged to refer to the following url for several work-arounds: https://wiki.archlinux.org/index.php/Chromium_Tips_and_Tweaks#Cache_in_tmpfs
+-Note that some browsers such as Chromium, Google-chrome, and Midori, actually keeps their cache directories separately from their browser profile directory. It is not within the scope of profile-sync-daemon to modify this behavior; users are encouraged to modify this behavir. For example, refer to the following url for several work-arounds for the Chrome-based browsers: https://wiki.archlinux.org/index.php/Chromium_Tips_and_Tweaks#Cache_in_tmpfs
++Note that some browsers such as Chromium, Google-chrome, and Midori, actually keeps their cache directories separately from their browser profile directory. It is not within the scope of profile-sync-daemon to modify this behavior; users are encouraged to modify this behavior. For example, refer to the following url for several work-arounds for the Chrome-based browsers: https://wiki.archlinux.org/index.php/Chromium_Tips_and_Tweaks#Cache_in_tmpfs
  .SH OPTIONS
 -Users should not call /usr/bin/profile-sync-daemon directly. Instead use the distro provided /usr/bin/rc.d to interact with \fIpsd\fP via the daemon script.
 +Users should not call '/usr/bin/profile-sync-daemon' directly. Instead use the distro provided '/sbin/rc' to interact with \fIpsd\fP via the daemon script.
  .TP
  .B
  start
-@@ -41,16 +41,14 @@
+@@ -40,19 +40,15 @@
+ .B
  sync
  Sync data between locations. The \fBprofile\fP(s) in tmpfs are sync'ed back to the disc and the symlinks are left in place.
+-.PP
+-Note that as of version 2.9, a template for systemd is provided for profile-sync-daemon.
  .SH SETUP AND USAGE
 -Edit the included /etc/psd.conf defining which \fBuser\fP(s) will have their profiles managed by \fIpsd\fP and note that at least one user must be defined.
 +Edit the included '/etc/psd.conf' defining which \fBuser\fP(s) will have their profiles managed by \fIpsd\fP and note that at least one user must be defined.
@@ -29,37 +35,43 @@
  USERS="bar foo"
  .PP
 -The initial synchronization will occur when the daemon starts. Additionally, cron (if running on your system) will call it to sync or update once per hour. Finally, \fIpsd\fP will sync back a final time when it is called to stop. Users can call the daemon to start, stop, or sync like any standard Arch daemon.
+-.PP
+-It is highly recommended to start/stop the daemon at boot/shutdown. This is accomplished by adding \fIpsd\fP to the DAEMONS array in /etc/rc.conf like so: 
 +The initial synchronization will occur when the daemon starts. Additionally, you can set up a cronjob with the provided file in '/usr/share/profile-sync-daemon'. Finally, \fIpsd\fP will sync back a final time when it is called to stop. Users can call the daemon to start, stop, or sync like any standard Gentoo daemon.
  .PP
--It is highly recommended to start/stop the daemon at boot/shutdown. This is accomplished by adding \fIpsd\fP to the DAEMONS array in /etc/rc.conf like so: 
--.PP
 -\fBDAEMONS=\fP(\.\.\. @\fIpsd\fP \.\.\.)
 +It is highly recommended to start/stop the daemon at boot/shutdown. This is accomplished by adding \fIpsd\fP to the default runlevel by issuing 'rc-update add psd default'.
  .PP
  For more, see: https://wiki.archlinux.org/index.php/Modprobed_db
  .SH BUGS
---- README-for_other_distros.old	2012-01-09 22:24:29.000000000 +0100
-+++ README-for_other_distros	2012-01-10 21:07:38.000000000 +0100
+--- README-for_other_distros.old	2012-01-15 03:33:58.000000000 +0100
++++ README-for_other_distros	2012-01-15 18:19:43.000000000 +0100
 @@ -2,7 +2,7 @@
  	profile-sync-daemon - Symlinks and syncs browser profile dirs to RAM thus reducing HDD/SDD calls and speeding-up browsers.
  
  SYNOPSIS
 -	rc.d [options] psd
-+	rc -s psd [options]
++	rc -s psd [options]	
  
  DESCRIPTION
  	Profile-sync-daemon (psd) is a tiny shell script designed to manage your browser's profile in tmpfs and to periodically sync it back to your physical disc (HDD/SSD). This is accomplished via a symlinking step and an innovative use of rsync to maintain back-up and synchronization between the two. One of the major design goals of psd is completely transparent user experience.
-@@ -19,23 +19,21 @@
- 	Note that Chromium actually keeps its cache directory separately from its browser profile directory. It is not within the scope of profile-sync-daemon to modify this behavior; users are encouraged to refer to the following url for several work-arounds: https://wiki.archlinux.org/index.php/Chromium_Tips_and_Tweaks#Cache_in_tmpfs
+@@ -16,28 +16,24 @@
+ SUPPORTED BROWSERS AND CAVEATS
+ 	Currently, the following browsers are auto-detected and managed: Chromium, Firefox, Google-chrome, Midori, and Opera.
+ 
+-	Note that some browsers such as Chromium, Google-chrome, and Midori, actually keeps their cache directories separately from their browser profile directory. It is not within the scope of profile-sync-daemon to modify this behavior; users are encouraged to modify this behavir. For example, refer to the following url for several work-arounds for the Chrome-based browsers: https://wiki.archlinux.org/index.php/Chromium_Tips_and_Tweaks#Cache_in_tmpfs
++	Note that some browsers such as Chromium, Google-chrome, and Midori, actually keeps their cache directories separately from their browser profile directory. It is not within the scope of profile-sync-daemon to modify this behavior; users are encouraged to modify this behavior. For example, refer to the following url for several work-arounds for the Chrome-based browsers: https://wiki.archlinux.org/index.php/Chromium_Tips_and_Tweaks#Cache_in_tmpfs
  
  OPTIONS
 -	Users should not call /usr/bin/profile-sync-daemon directly. Instead use the distro provided /usr/bin/rc.d to interact with psd via the daemon script.
-+	Users should not call '/usr/bin/profile-sync-daemon' directly. Instead use the distro provided '/sbin/rc' to interact with psd via the daemon script.
++	Users should not call '/usr/bin/profile-sync-daemon' directly. Instead use the distro provided '/sbin/rc' to interact with psd via the daemon script.	
  
  	start		Turn on psd. Make symlinks and sync the profile(s) from disc to tmpfs.
  	stop		Turn off psd. Sync the profiles(s) from tmpfs back to disc and remove the symlinks.
  	sync		Sync data between locations. The profile(s) in tmpfs are sync'ed back to the disc and the symlinks are left in place.
- 	
+ 
+-	Note that as of version 2.9, a template for systemd is provided for profile-sync-daemon.
+-	
  SETUP AND USAGE
 -	Edit the included /etc/psd.conf defining which user(s) will have their profiles managed by psd and note that at least one user must be defined.
 +	Edit the included '/etc/psd.conf' defining which user(s) will have their profiles managed by psd and note that at least one user must be defined.
@@ -68,12 +80,12 @@
  	USERS="bar foo"
  
 -	The initial synchronization will occur when the daemon starts. Additionally, cron (if running on your system) will call it to sync or update once per hour. Finally, psd will sync back a final time when it is called to stop. Users can call the daemon to start, stop, or sync like any standard Arch daemon.
-+	The initial synchronization will occur when the daemon starts. Additionally, you can set up a cronjob with the provided file in '/usr/share/profile-sync-daemon'. Finally, psd will sync back a final time when it is called to stop. Users can call the daemon to start, stop, or sync like any standard Gentoo daemon.
- 	
--	It is highly recommended to start/stop the daemon at boot/shutdown. This is accomplished by adding psd to the DAEMONS array in /etc/rc.conf like so: 
 -	
+-	It is highly recommended to start/stop the daemon at boot/shutdown. This is accomplished by adding psd to the DAEMONS array in /etc/rc.conf like so: 
++	The initial synchronization will occur when the daemon starts. Additionally, you can set up a cronjob with the provided file in '/usr/share/profile-sync-daemon'. Finally, psd will sync back a final time when it is called to stop. Users can call the daemon to start, stop, or sync like any standard Gentoo daemon.	
+ 	
 -	DAEMONS=(... @psd ...)
-+	It is highly recommended to start/stop the daemon at boot/shutdown. This is accomplished by adding psd to the default runlevel by issuing 'rc-update add psd default'. 
++	It is highly recommended to start/stop the daemon at boot/shutdown. This is accomplished by adding psd to the default runlevel by issuing 'rc-update add psd default'.
  
- 	For more, see: https://wiki.archlinux.org/index.php/Modprobed_db
+ 	For more, see: https://wiki.archlinux.org/index.php/Profile-sync-daemon
  
diff --git a/www-misc/profile-sync-daemon/files/psd-pid.patch b/www-misc/profile-sync-daemon/files/psd-pid.patch
index 9c39d2d63..efb86e740 100644
--- a/www-misc/profile-sync-daemon/files/psd-pid.patch
+++ b/www-misc/profile-sync-daemon/files/psd-pid.patch
@@ -1,20 +1,19 @@
---- profile-sync-daemon.old	2012-01-12 23:54:42.000000000 +0100
-+++ profile-sync-daemon	2012-01-14 00:24:14.000000000 +0100
-@@ -4,6 +4,8 @@
+--- profile-sync-daemon.old	2012-01-15 03:34:37.000000000 +0100
++++ profile-sync-daemon	2012-01-15 17:48:36.000000000 +0100
+@@ -4,6 +4,7 @@
  # By graysky <graysky AT archlinux DOT us>
  # Inspired by some code originally  written by Colin Verot
  
 +PIDFILE=/var/run/psd.pid
-+
+ BROWSERS="chromium google-chrome midori mozilla opera" # all supported browsers
  . /etc/psd.conf
  
- set_which() {
-@@ -101,17 +103,17 @@
+@@ -105,17 +106,17 @@
  		;;
  	check)
  		# do not run if the daemon is running
 -		[[ ! -f /run/daemons/psd ]] && check
-+		[[ ! -f $PIDFILE ]] && check
++		[[ ! -f $PIDFILE ]] && check	
  		;;
  	sync)
  		sync
diff --git a/www-misc/profile-sync-daemon/profile-sync-daemon-2.8.ebuild b/www-misc/profile-sync-daemon/profile-sync-daemon-3.0.ebuild
index 32afe00f3..32afe00f3 100644
--- a/www-misc/profile-sync-daemon/profile-sync-daemon-2.8.ebuild
+++ b/www-misc/profile-sync-daemon/profile-sync-daemon-3.0.ebuild