Add keepdir for site-lisp dir again, bug 93329.

Package-Manager: portage-2.1.4.4

5 files changed, 21 insertions, 15 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 5dba5d4640b8..758f5f425857 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.233 2008/03/26 14:36:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.234 2008/03/28 06:29:03 ulm Exp $
+
+  28 Mar 2008; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r4.ebuild,
+  emacs-22.1-r3.ebuild, emacs-22.2.ebuild:
+  Add keepdir for site-lisp dir again, bug 93329; no idea why it was removed.
+  Remove redundant dodir command.
 
 *emacs-22.2 (26 Mar 2008)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7813f33b11ad..bc0836a03d1a 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -16,16 +16,16 @@ DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a
 DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0
 DIST emacs-22.2.tar.gz 38694318 RMD160 ec2da7cd7065cbd76773e544da1d1495f33d6ea1 SHA1 7a371332cb8400d44e8eb31f19e432bbc93523a0 SHA256 216839e1fb38ca4f2ed0a07689fb47ee80d90845f34e0a56fe781d6aa462e367
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r4.ebuild 2509 RMD160 b503dc589880e0491c1959650146d977fc49f376 SHA1 fa57551797dbe663b776e1d7a63a35e72f3e8b07 SHA256 aa8b397fe71e105cfdcd74a698d2a8b46ee3df357ebb4d4ffbcc774d3edf1e6b
+EBUILD emacs-18.59-r4.ebuild 2488 RMD160 4b94a804303d69c33b4057c8c955ab63280d4dff SHA1 e2caaf2c192bfe86e69af494162e380646842099 SHA256 96135bbdc3aee3aef8d36cedcabff5efac0391fc471044d189f2982913bc85a4
 EBUILD emacs-21.4-r14.ebuild 5623 RMD160 b02817c3ff91ceb620e8ec5f4ba4469b4a23c560 SHA1 fa57863e6925145dc184e80a60cffaea4f0cb0b5 SHA256 9459ddc0527722373dceaafad137fd0d6a69d6eed0992d7b29ccc879961a99ce
-EBUILD emacs-22.1-r3.ebuild 8075 RMD160 25895a9f231fb413711035e87dc4d90c210061ed SHA1 1ee710fe7d692813e13c9d7c3ff18659bb3564ab SHA256 7562419ba8aa72f3d89ec45b5f20e8f9f376817beb2a63d1d7509d52216105c0
-EBUILD emacs-22.2.ebuild 7873 RMD160 cce123d87c985234aebb6ff3d1c5aa7f99ed4144 SHA1 30c915799945cf570a48da0d4b741fcea2775811 SHA256 3fad45ce7bf4ff6b3c45b12a4a2a9fe7c70edb28c8e5bb2f2066322f4bf0ab70
-MISC ChangeLog 34252 RMD160 f5bf32ea266c777a4ef791581146cb0a19b0de46 SHA1 297e495c7ce48afe61b5fb7517043d86de7c9890 SHA256 7a67815ed67051c8739c8eff07e6aa1b86f6458e0581916acc181a67c4c32489
+EBUILD emacs-22.1-r3.ebuild 8110 RMD160 dabca65382af25e03fc4574aaf2d3de431501dea SHA1 83706fd62b52373826079ac80ddf21a1c00db8b0 SHA256 6100e67d854c7df188f056c1dc30f6f6f27a9c913cb9d5f3230d24a60c038530
+EBUILD emacs-22.2.ebuild 7908 RMD160 6af86009998c245291f2366130cea12e795f8d23 SHA1 124187f702ec649212800f0c8f1a2ce9610bc742 SHA256 8f2ce5cac1d9b4acdabdd020fdcf9e19b2c622d779c953ba4e328e413f8ec75c
+MISC ChangeLog 34478 RMD160 a4496aeb09f382c96b8f29789a0a9d888119726d SHA1 babc799f3407c05eb3edcd1ee93af099b73d5fd7 SHA256 2d55b62f67f16f99ae2ee10de19f65be85243c23370d08a69741254b8cabd6dc
 MISC metadata.xml 1213 RMD160 7df0bb43f41ecf811a37b60ee3cbefc7f798e840 SHA1 e545b177be5578569de6410bfea01cffe6003611 SHA256 1e71985b81478302fb03a9af91293f7dfad07aa7b31c4cc226170b45d573ce13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.8 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkfqX2sACgkQOeoy/oIi7uxykACgifqiap/dzEGCkufbxxAt3wBg
-7BwAn1x7b6kBV+xxUhqC1XfpGOs/epDu
-=l1f/
+iEYEARECAAYFAkfskAYACgkQOeoy/oIi7uzamQCguyOCh7VRVjeXfdiEnAmo2tL2
+TLIAoJxOy0MfFAlVO1ypvfsvKNUgp5GV
+=PSWv
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r4.ebuild b/app-editors/emacs/emacs-18.59-r4.ebuild
index 0da2d898a635..62124d943ccb 100644
--- a/app-editors/emacs/emacs-18.59-r4.ebuild
+++ b/app-editors/emacs/emacs-18.59-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v 1.8 2008/02/02 21:08:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v 1.9 2008/03/28 06:29:03 ulm Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -71,7 +71,6 @@ src_install() {
 
 	dodir ${MY_LOCKDIR%/*}
 	diropts -m0777
-	dodir ${MY_LOCKDIR}
 	keepdir ${MY_LOCKDIR}
 
 	for i in emacsclient etags ctags; do
diff --git a/app-editors/emacs/emacs-22.1-r3.ebuild b/app-editors/emacs/emacs-22.1-r3.ebuild
index bfc4fd9c13ef..2f79bfdb1a37 100644
--- a/app-editors/emacs/emacs-22.1-r3.ebuild
+++ b/app-editors/emacs/emacs-22.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.19 2008/02/02 21:08:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.20 2008/03/28 06:29:03 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -182,7 +182,8 @@ src_install () {
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
 	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs/
+	keepdir /usr/share/emacs/site-lisp
+	keepdir /var/lib/games/emacs
 
 	if use source; then
 		insinto /usr/share/emacs/${FULL_VERSION}/src
diff --git a/app-editors/emacs/emacs-22.2.ebuild b/app-editors/emacs/emacs-22.2.ebuild
index a12c8cb8d6ef..5016511ad574 100644
--- a/app-editors/emacs/emacs-22.2.ebuild
+++ b/app-editors/emacs/emacs-22.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.2.ebuild,v 1.1 2008/03/26 14:36:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.2.ebuild,v 1.2 2008/03/28 06:29:03 ulm Exp $
 
 inherit autotools elisp-common eutils flag-o-matic
 
@@ -174,7 +174,8 @@ src_install () {
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
 	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs/
+	keepdir /usr/share/emacs/site-lisp
+	keepdir /var/lib/games/emacs
 
 	if use source; then
 		insinto /usr/share/emacs/${FULL_VERSION}/src