Don't install .SEQ file when it's already installed (bug #386625)

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

5 files changed, 42 insertions, 22 deletions

diff --git a/sys-process/at/ChangeLog b/sys-process/at/ChangeLog
index 9119f1f5b035..2b3f9813380d 100644
--- a/sys-process/at/ChangeLog
+++ b/sys-process/at/ChangeLog
@@ -1,6 +1,11 @@
 # 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.28 2011/09/23 12:13:04 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.29 2011/10/10 10:42:43 polynomial-c Exp $
+
+  10 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: Don't install .SEQ file when it's already installed.
+  Thanks to Christian Kauhaus who reported this in bug #386625.
 
   23 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> at-3.1.13.ebuild:
   non-maintainer commit: Bumped EAPI to version 4. Added autoconf-2.64 to
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index afef80a8c394..050cfdc76b4e 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 1986 RMD160 136c8273d32067124acad9d858d067ab9f9f8258 SHA1 2370b4161163eaeafbe54ded0f3a87ae658cb4ea SHA256 14c1429bacfb0b480a0b85e98828c25d313db7c9143a799d8757b174fc718ea0
-EBUILD at-3.1.10.2-r2.ebuild 2032 RMD160 b9e9c5878d70a1ee60453e8583c7d20ba17f71b5 SHA1 4cdb4b99ce073c787a856ebb9c5ddea7ae254cfb SHA256 7ea4e5ab53b7b90fdbd7a0ad7fd8975a877ac8cdb3bfe166917250194da54d98
-EBUILD at-3.1.13.ebuild 1839 RMD160 1ea5677d0bf6f3215b9b229bbd704543facee567 SHA1 a4f570193e9373118ca9d75e07755c729abe0bed SHA256 7b781022b847f30df07572d57f38277f3b71fd1ddc04f7d090e8a7870a1c1160
-MISC ChangeLog 7694 RMD160 9bd27782521525a6a13ce8127305d379ac15a2cd SHA1 5251c1bd5594b24ff30915213dbfd490a8d3e11a SHA256 f1741677d45f834dcce79e80c64a9054bcb069bfbc5f4b102b499f4771830fb1
+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 1996 RMD160 a830135a1d44210ad6624c19770116768e016bde SHA1 6002f83a09dc3a817808f852bc59fabd6211c8ec SHA256 6e685116cf54afb002669245b0b0091a68a67230488c133e318c0f6bda09c09d
+MISC ChangeLog 7957 RMD160 d83f7f203fcec25e220313d34832155dd97e81f4 SHA1 0d585020e2bb57335926d5bef28cfa2a8e0de02a SHA256 2d1f97fe017ba8a07ece503e085105ea5bd8cf0764659e0755563f6459faa31d
 MISC metadata.xml 158 RMD160 298878d8b5da225547b337739a1a48192546d7b8 SHA1 5a9f7a1c9f0f56d1b0e72ee9b67b5cc5771f6d7d SHA256 a262a73b2049a89ab6a4bdf51df27bea44c7f0aa0ee33176c59a9c63eb45e764
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOfHfVAAoJEPiazRVxLXTFLSgQAIQPEA6+ojLlz5uQ04CKTnTg
-dLWchIBL5/fKV5YbaVkv9U6PZaNZLdngE8bWkA3QnO6Oki3w0kQfXvMjUmuzp94+
-nILg7whfKSDYY5FElrRjS8SJjIDNw+DErFS0RFyPmi/gy3xdHxZykMnNn+ldwlPG
-dw93psjCb8K/TkiYqJmrXBHRlTpmrXHuTVoACtuZ1CwP05b+4bxkON1T1E9aHqjf
-pqDY+RGlVjQ4nqHcfXrPJWcm6yLLUna2IWrvn5eHtUenrFjGHhveMFoknkDNmIaO
-cRoI/tSRQ/4dWMDC5s35tC79pBlBPLclDj2u9PA+KgXBJnaKXZAI0hwCARN8uSs3
-XUzVxlgTtetb2GMv+rYsloVzgl+Ge0J/XzxG5LNYeQOxKtqGCpiXJEHmLzvNW3Qs
-N8tHEd83QWho0a/yFo0LTV9dwPj4aOa9ljoRRNupp3Q9w23EmdjDP7SBZ31ZUKqV
-QOcFaJqtp8ySQIZH630N2kSUupE/pc+lMzwSTKCEIjp9Fy8OCW8JSwRnpJIzQJN+
-5XF8fSEU3jh0nTIrkABfi5gyoTEoT3nNSdjUoNj0EpBTHn/LbLJF/bTyz2xyPNao
-6xTOeiKWqM3kq1gwGLbqpJ+33aI6COqGyXuYUun9l5YkVj+gpcmCAmfq6GTt8qA4
-50wEC0W+klK5MEZJHkwh
-=nTlT
+iQIcBAEBCgAGBQJOkswqAAoJEPiazRVxLXTF/ZoP/16Lul9Cd4ZXyhkRtrUkE9dh
+aWDeusW/l0VF1NteNabtpPyQA9Rub0qBHbqtWx8Gux7no7Yxeoneo4GXerxUNsG4
+lFOwKnbwtjEdPuxUw2l2subXEf9GrZPOv069fbPlHdtBCqUaXWVJbX6gJISpg1GU
+feAVLLkM7rspbzjeJ3442TLir3s3DM/PGIIvmkZEKwh86laXPYgR5s28kZluL9VO
+RKR71ufUVV0aUABrKivoNSOYh7lj2ErVpzC822VO8zhTj5clneKeo88cCfx9AcWX
+voUJ3aD9rBcVHsnCd3ToGCxbykwsmuUAPgMMcNQO7dseyNtcwQDSa7o83q2Z+b+G
+9d6kvg8EE8I8GsRUzMiUDqlssZX3VzXStSFJd1M/Mh1QDHkRyHyCOK3RPtONyE5/
+LXr1cmY4n6LeQzF8KHIHdckFC34CT5o4nKh+lN2TTks54Y6J4OiAsAl89Z0eGrhn
+lKwBDJ0VibqDM8bHIO6pcSa0WX/dLL36nbkNV1B8wN13sth0zACSc/D3dU5S5Smj
+Shl3Azqm0Y8hW8ry1frzeZDUkWpddIeLXsHLrKxpz7ecvfCB+SIU6WHj6Au/6FHi
+I8p6mWUa9tFRLwQTRo6HJlg1msKoGOQUil3MFSRfkNLs6ld51XTe+5GswP6+gyNh
+8XaQ4YWEa1/ftRMka/lz
+=/3oD
 -----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 1cbaa386cb91..720c98163a90 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-2010 Gentoo Foundation
+# 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.8 2010/09/20 01:06:40 xmw Exp $
+# $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 $
 
 inherit eutils flag-o-matic autotools pam
 
@@ -58,6 +58,11 @@ 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
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 11c634b7f7d1..c805f2cf7cf1 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.1 2011/04/17 22:46:41 jer Exp $
+# $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 $
 
 inherit eutils flag-o-matic autotools pam
 
@@ -58,6 +58,11 @@ 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
diff --git a/sys-process/at/at-3.1.13.ebuild b/sys-process/at/at-3.1.13.ebuild
index 91f68b90a70e..b0bc726b1797 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.2 2011/09/23 12:13:04 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.13.ebuild,v 1.3 2011/10/10 10:42:43 polynomial-c Exp $
 
 EAPI=4
 
@@ -52,6 +52,11 @@ src_configure() {
 src_install() {
 	make install IROOT="${D}" || die
 
+	# Don't install .SEQ file when it's already installed
+	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