Better fix for bug #386625

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

5 files changed, 46 insertions, 36 deletions

diff --git a/sys-process/at/ChangeLog b/sys-process/at/ChangeLog
index 0a0c8219a4be..7f4b410eeea1 100644
--- a/sys-process/at/ChangeLog
+++ b/sys-process/at/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/at
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.30 2011/10/10 10:56:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.31 2011/10/31 01:17:19 polynomial-c Exp $
+
+  31 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> at-3.1.10.2-r1.ebuild,
+  at-3.1.10.2-r2.ebuild, at-3.1.13.ebuild:
+  non-maintainer commit: Better fix for bug #386625.
 
   10 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> at-3.1.13.ebuild:
   non-maintainer commit: Added bug ID to comment about .SEQ file.
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index 115ab649ab47..1cc094cde0cf 100644
--- a/sys-process/at/Manifest
+++ b/sys-process/at/Manifest
@@ -12,25 +12,25 @@ AUX atd.confd 315 RMD160 55c9e4b07c9b58c130bfc7f9bd6078293f6ac837 SHA1 edb6f7b65
 AUX atd.rc6 524 RMD160 1cefe64271837b857bf9f9d12d9a2dd3de90603d SHA1 9f16f63cebae8ed637558f5d186bb33a1972c719 SHA256 697d2007427c3e89a0fe087b5d1beb0388fc84ae260ed530b3e3f11554e8ada2
 DIST at_3.1.10.2.tar.gz 100137 RMD160 4d06f91a0e0d1284ec1a9b5a32fa9e7fab257cd3 SHA1 7834e319b8307983981f192aa221520b95624f67 SHA256 35c4ab4248ba5898ccaddc5efe8722a8f3639deeb07623fa2d41f740e337690f
 DIST at_3.1.13.orig.tar.gz 122544 RMD160 d0e77b60d8daf0a8cc411ca57803b6940a539b5c SHA1 9873e0c38403ef58364912d0b505fd20798fd400 SHA256 3a8b90868d615d21a92f4986ea9a823886329af8fae8dd7ab4eed9b273bca072
-EBUILD at-3.1.10.2-r1.ebuild 2166 RMD160 2d125c331f7c5cad04135a419a04795870575284 SHA1 f67f4bc2771d9b6f95bcde3ac3c7ad844ff8ae1f SHA256 1d89eec528a766ad9605f412eb9742cafa7b82cf3bfb9c135dde7bd61beecbf6
-EBUILD at-3.1.10.2-r2.ebuild 2212 RMD160 029d9b0f6c7245d8028cad3891f62bb73211ffae SHA1 40eeec93f182a190a6cb14e1b7b073d3250be3f4 SHA256 0186d3f6e450a4aa26ed2156b41607fb13c23c78f78f2e16cfb29bf0f8c7bc75
-EBUILD at-3.1.13.ebuild 2010 RMD160 8fd8769df8fc73eeb4ac29f56a04cd3235a17fbc SHA1 01dd05d39f16ccabada4c310498590bf3d3ff9e6 SHA256 14e2b999d608bde3ad7c8f05d6ef2d1099533590a97242650438bd005c328dc7
-MISC ChangeLog 8096 RMD160 180af19a5a622c890bf8e0d3de9a0f8790f4edb4 SHA1 a3b8a4751233b63a2712e538a21a43254f99cbf7 SHA256 6dc302f5b917b0fcc78c92555683274087d71bcd0793f82b0ae5dc574740481b
+EBUILD at-3.1.10.2-r1.ebuild 2241 RMD160 c522bdb3e8fbedb3236f8c81d39f2bc8b0499972 SHA1 f2b556639a24a42a32e9b68b7e44047d92b2d70c SHA256 cc85e4114fb89ac4712e28458d14b556c507cbddf8829575bcfdaa70643744eb
+EBUILD at-3.1.10.2-r2.ebuild 2286 RMD160 4e0d87b5bef2e4f59f8049959324bc26f97538d6 SHA1 d279d7c14d67a45f9a14ab83f9ee75522b723307 SHA256 0fb1b8c3d1cf4e16fe4f5304c5e333067a944259c2efdb1f99adc3009e8398bd
+EBUILD at-3.1.13.ebuild 2085 RMD160 3a6236fe2e72b613194dcdd4001aa772c9f3adfd SHA1 69ce30a47ed0c31baeeb610f4043bc4b8ae7b5c1 SHA256 700c4e69ac372f3dc381889ab4bf5dfe158416f6a37266343c57ee5bf1da62d8
+MISC ChangeLog 8270 RMD160 0755049111239b96245818486408fe728d584635 SHA1 fc29ad137db300376d53d8b4a600b693d513b291 SHA256 e2ba06ef4b6a91d9610509e21ae8e4e09e043b492b4dfe272ec4ec75ad190658
 MISC metadata.xml 158 RMD160 298878d8b5da225547b337739a1a48192546d7b8 SHA1 5a9f7a1c9f0f56d1b0e72ee9b67b5cc5771f6d7d SHA256 a262a73b2049a89ab6a4bdf51df27bea44c7f0aa0ee33176c59a9c63eb45e764
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOks9VAAoJEPiazRVxLXTFYksQAJgtSMwoWs0k+PQmYDq1gjYK
-BNuFIJIFtTcGY5n9+XLaQ3b3ckphNkKupY3Mbb7ky3yqr8AWkmkmAu0YaNlPGE9k
-sCsjWiadJxDIbTw8LtqZ75/Fz8/7IoFsSvddRxIN6nhVYy0QA1garQIm6cVLAdPw
-UA3jIjkaZQ28nOHNlA3zzpApSQWUxevTjE0a2GR+W1oleNx43PLRXNx+iNuq3MG8
-s27CYjPjSTB63qWALlWGJfVN+Xb3vQv53E7x/KXihyZEzeD9y+sLRn5KLeS256BH
-UMt4Vkh0ufcI2cVmCPKXMmqz00RWf1tce2jY8hPBDB4STXZKFMIVyNx5Sb6NOLBE
-Kd4LIXR75CKR4RdzZ0OVjHIhMggb6R22k7v+Vn6tTwW7GF+T8vX5ZhKGErSce15J
-RgS+mWnf4bR/lOW0hQoHwHuD/zl+qaOksWTM9R7D/bvJNVwUpQ7wuNTArozKnfGN
-JAQJ9YdoiZH1nLVXcx+j3kkZkvilQvoLkvzTbBlFK0j+G9uJxR11N1yW6JNURB0D
-H0I6sdEsyYrzP2EiK5fkPXdf4hE0MLQ477Dty7A2boppO+RXP+ZlTD7DUyQjo0QL
-ek9zT49i+zeR/W5TQg5U+YYw3VCImuuK1WNvjtfc2EfuOFOWtti3mNc21223xDBB
-mgmkfiBuL40s5LOIwDj6
-=IysX
+iQIcBAEBCgAGBQJOrfclAAoJEPiazRVxLXTFYP0P/jIkz/dDux0dNXgAeswnB4/S
+BFnw0Bi/uhdOtEg2Mgi/iv493CLHEWJkyFY15bj6fSLqo6m8kEqdlY0IWsUKk8Gp
+4+PmMya8mefN1HreLJ1ZmTdTYgxteZdMSWlRNrnxVMMETN6Hqvuz/rtm7WkyU0Fm
+TJAsqUj0wPojJE9CQedHSG+LyLZ46bp6aYxvt6B90OjK7y0Be9fY86+m+FhpFr/H
+z5Jryqn/C4webWUbgHzjdO7mTgpC+QWxcWXWIp9M2gdP6K2C2vwRnRLA8ZBeXog7
+cYyb/XdnxdKPxe+bBxTnAWWuxLNs6CT975Yl5mleFNi+n9DvSuVJqgZTC07xqyQV
+cMUFXjj54HAShCtOMV13eS+JtIehYlApu0FjXtL6edcf6LdzT3I+573TG0edBAAQ
+hOniZMyQKZiQ2ynr8hYmuN9WFd0l8M0A2Ecm1keQ3kZ8LLgYCds9fZgvB0SrGmDn
+13HW+1cp76LodKiI6sRdmN1xSmiXNaRIKXdD5N5Hpyh5DNGvJJc2M4NzGpLxsJbj
+htX2b12jCnRitkn4N+s2DH6TspfyJKF+I9jEgbabWZjdglGWSHkuAA17wHC3V0AJ
+lof9aAoeTc0gcLqQONi4msHeuX7G+Q+XQ3ym2hzJCLRc8n8k1eKsU3VA9zjOed7X
+1y0rQo6Th1sZbEldx/ry
+=j9T5
 -----END PGP SIGNATURE-----
diff --git a/sys-process/at/at-3.1.10.2-r1.ebuild b/sys-process/at/at-3.1.10.2-r1.ebuild
index 720c98163a90..a7755abb3803 100644
--- a/sys-process/at/at-3.1.10.2-r1.ebuild
+++ b/sys-process/at/at-3.1.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.10.2-r1.ebuild,v 1.9 2011/10/10 10:42:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.10.2-r1.ebuild,v 1.10 2011/10/31 01:17:19 polynomial-c Exp $
 
 inherit eutils flag-o-matic autotools pam
 
@@ -58,14 +58,16 @@ src_compile() {
 src_install() {
 	make install IROOT="${D}" || die
 
-	# Don't install .SEQ file when it's already installed (bug #386625)
-	if [ -e "${ROOT}/var/spool/at/atjobs/.SEQ" ] ; then
-		rm "${D}/var/spool/at/atjobs/.SEQ" || die
-	fi
-
 	newinitd "${FILESDIR}"/atd.rc6 atd
 	newpamd "${FILESDIR}"/at.pamd atd
 	prepalldocs
+
+	# Preserve existing .SEQ files (bug #386625)
+	local seq_file="${ROOT}/var/spool/at/atjobs/.SEQ"
+	if [ -f "${seq_file}" ] ; then
+		einfo"Preserving existing .SEQ file (bug #386625)."
+		cp -p "${seq_file}" "${D}"/var/spool/at/atjobs/ || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/sys-process/at/at-3.1.10.2-r2.ebuild b/sys-process/at/at-3.1.10.2-r2.ebuild
index c805f2cf7cf1..8e416dacdbf9 100644
--- a/sys-process/at/at-3.1.10.2-r2.ebuild
+++ b/sys-process/at/at-3.1.10.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.10.2-r2.ebuild,v 1.2 2011/10/10 10:42:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.10.2-r2.ebuild,v 1.3 2011/10/31 01:17:19 polynomial-c Exp $
 
 inherit eutils flag-o-matic autotools pam
 
@@ -58,15 +58,17 @@ src_compile() {
 src_install() {
 	make install IROOT="${D}" || die
 
-	# Don't install .SEQ file when it's already installed (bug #386625)
-	if [ -e "${ROOT}/var/spool/at/atjobs/.SEQ" ] ; then
-		rm "${D}/var/spool/at/atjobs/.SEQ" || die
-	fi
-
 	newinitd "${FILESDIR}"/atd.rc6 atd
 	newconfd "${FILESDIR}"/atd.confd atd
 	newpamd "${FILESDIR}"/at.pamd atd
 	prepalldocs
+
+	# Preserve existing .SEQ files (bug #386625)
+	local seq_file="${ROOT}/var/spool/at/atjobs/.SEQ"
+	if [ -f "${seq_file}" ] ; then
+		einfo"Preserving existing .SEQ file (bug #386625)."
+		cp -p "${seq_file}" "${D}"/var/spool/at/atjobs/ || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/sys-process/at/at-3.1.13.ebuild b/sys-process/at/at-3.1.13.ebuild
index de98ce08fc11..e3d4b4df9d3a 100644
--- a/sys-process/at/at-3.1.13.ebuild
+++ b/sys-process/at/at-3.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.13.ebuild,v 1.4 2011/10/10 10:56:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.13.ebuild,v 1.5 2011/10/31 01:17:19 polynomial-c Exp $
 
 EAPI=4
 
@@ -52,14 +52,16 @@ src_configure() {
 src_install() {
 	make install IROOT="${D}" || die
 
-	# Don't install .SEQ file when it's already installed (bug #386625)
-	if [ -e "${ROOT}/var/spool/at/atjobs/.SEQ" ] ; then
-		rm "${D}/var/spool/at/atjobs/.SEQ" || die
-	fi
-
 	newinitd "${FILESDIR}"/atd.rc6 atd
 	newconfd "${FILESDIR}"/atd.confd atd
 	newpamd "${FILESDIR}"/at.pamd atd
+
+	# Preserve existing .SEQ files (bug #386625)
+	local seq_file="${ROOT}/var/spool/at/atjobs/.SEQ"
+	if [ -f "${seq_file}" ] ; then
+		einfo "Preserving existing .SEQ file (bug #386625)."
+		cp -p "${seq_file}" "${D}"/var/spool/at/atjobs/ || die
+	fi
 }
 
 pkg_postinst() {