Use autoload mechanism. Don't enable initsplit as site default.

Package-Manager: portage-2.1.3.12

5 files changed, 71 insertions, 9 deletions

diff --git a/app-emacs/initsplit/ChangeLog b/app-emacs/initsplit/ChangeLog
index 2b5db7c8d104..724538c07b8c 100644
--- a/app-emacs/initsplit/ChangeLog
+++ b/app-emacs/initsplit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/initsplit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/initsplit/ChangeLog,v 1.6 2007/02/06 13:34:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/initsplit/ChangeLog,v 1.7 2007/10/14 09:41:19 ulm Exp $
+
+*initsplit-1.6-r1 (14 Oct 2007)
+
+  14 Oct 2007; Ulrich Mueller <ulm@gentoo.org> +files/51initsplit-gentoo.el,
+  +initsplit-1.6-r1.ebuild:
+  Use autoload mechanism. Don't enable initsplit as site default.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/app-emacs/initsplit/Manifest b/app-emacs/initsplit/Manifest
index c6d2df7b6a41..5e7ae79ea558 100644
--- a/app-emacs/initsplit/Manifest
+++ b/app-emacs/initsplit/Manifest
@@ -5,15 +5,23 @@ AUX 50initsplit-gentoo.el 433 RMD160 b6f53f90fa07bfdca57c9e79652a4c0a656dd100 SH
 MD5 0916dbd04c7da0cbb2764cca1a67ce9b files/50initsplit-gentoo.el 433
 RMD160 b6f53f90fa07bfdca57c9e79652a4c0a656dd100 files/50initsplit-gentoo.el 433
 SHA256 689fef8727b0c906eba5ad194480f7f5ad1dacb1146835d20ceb3445b3c894dd files/50initsplit-gentoo.el 433
+AUX 51initsplit-gentoo.el 521 RMD160 0ccf75f073c3b08ea8e25eb7b7c30ab846fc6e4f SHA1 c96712c40a894363dcd61fbca84f5fc6529870fc SHA256 6e66a35f5b0d525880d7d93152b23908514d1ba9f426b1c69c2c006f9ec45a13
+MD5 5c3f632299717ec538ff7b42566f9514 files/51initsplit-gentoo.el 521
+RMD160 0ccf75f073c3b08ea8e25eb7b7c30ab846fc6e4f files/51initsplit-gentoo.el 521
+SHA256 6e66a35f5b0d525880d7d93152b23908514d1ba9f426b1c69c2c006f9ec45a13 files/51initsplit-gentoo.el 521
 DIST initsplit-1.6.tar.gz 2454 RMD160 5b6d70e0ea5dc8ffdcf719b648e7bdaa89317b57 SHA1 63f20cfacd3d62e4edf903d6b9293e8249eaba21 SHA256 64612a8bdc43875b2889549e1182cae39041676dac92151f53bca0473cbc4e4c
+EBUILD initsplit-1.6-r1.ebuild 897 RMD160 fe65dd0cb28a7ea8b0b00f7cc98e80a8ce0c5031 SHA1 0d746ea352242638bfe3c211e3e70039ba52a051 SHA256 5a11d05478ad5ec2631244395379a99576d18fae57892a01dd004f54dbf1179b
+MD5 521fee65394fe19b70d59394440dfd14 initsplit-1.6-r1.ebuild 897
+RMD160 fe65dd0cb28a7ea8b0b00f7cc98e80a8ce0c5031 initsplit-1.6-r1.ebuild 897
+SHA256 5a11d05478ad5ec2631244395379a99576d18fae57892a01dd004f54dbf1179b initsplit-1.6-r1.ebuild 897
 EBUILD initsplit-1.6.ebuild 483 RMD160 5fd28005f57eea83775e5119f5df46eb84ad012e SHA1 1fba75852c572876eef10d76e043a12f420e1c16 SHA256 08086f048ed8c0cce611386bb6f7691dfbfa05e8e17c41564d0ef736c3fac451
 MD5 a8654ec3276231b36d8d023cdae358be initsplit-1.6.ebuild 483
 RMD160 5fd28005f57eea83775e5119f5df46eb84ad012e initsplit-1.6.ebuild 483
 SHA256 08086f048ed8c0cce611386bb6f7691dfbfa05e8e17c41564d0ef736c3fac451 initsplit-1.6.ebuild 483
-MISC ChangeLog 941 RMD160 57c4a7e4ade62a8b8f2b30b7d0f4ab6468e0cbc5 SHA1 c5bd5ab4e68382e65e137610fc09597bca7ace27 SHA256 930c82cf99488472f99e99f77f02f05fe263e82acaab274f9349db7f8a76743e
-MD5 e8521c823bf2d3d6b9d6c1deeeb1d166 ChangeLog 941
-RMD160 57c4a7e4ade62a8b8f2b30b7d0f4ab6468e0cbc5 ChangeLog 941
-SHA256 930c82cf99488472f99e99f77f02f05fe263e82acaab274f9349db7f8a76743e ChangeLog 941
+MISC ChangeLog 1140 RMD160 12727b55fb139bd75f8edf30ed0b26c813f3d48c SHA1 c7e81f63f2818a83ec29d67885a6e12daee261d4 SHA256 664588e7b94d2f3f8e9ade84f8e84426dcc9e6fc7a07cd24220048c6a885fb29
+MD5 bcff77aaa09637fc8f425705cd06b7c2 ChangeLog 1140
+RMD160 12727b55fb139bd75f8edf30ed0b26c813f3d48c ChangeLog 1140
+SHA256 664588e7b94d2f3f8e9ade84f8e84426dcc9e6fc7a07cd24220048c6a885fb29 ChangeLog 1140
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -21,10 +29,13 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 f1ad576d919aabd3bf768eb13049f29d files/digest-initsplit-1.6 235
 RMD160 b1cbdca7fa1f8cc7a5625c8ef4b1e46741d21398 files/digest-initsplit-1.6 235
 SHA256 858e510d69ef19b21843ada995966a665d7e553aff87e4151ab560713a8717a7 files/digest-initsplit-1.6 235
+MD5 f1ad576d919aabd3bf768eb13049f29d files/digest-initsplit-1.6-r1 235
+RMD160 b1cbdca7fa1f8cc7a5625c8ef4b1e46741d21398 files/digest-initsplit-1.6-r1 235
+SHA256 858e510d69ef19b21843ada995966a665d7e553aff87e4151ab560713a8717a7 files/digest-initsplit-1.6-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFFyIPkAiZjviIA2XgRApjNAJ4ktT3aU3C2IBZoo/9FXrTaPc3T2wCcD/9J
-beX2s5RX1VX6i+bPmZ/lkz0=
-=0RCC
+iD8DBQFHEeRQOeoy/oIi7uwRAprnAJ9ucoeDJoS5rvrc76BKuoMa9aT6rgCgx2mh
+4X0u29TEz5CWmsvTYcaKsaA=
+=pUgA
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/initsplit/files/51initsplit-gentoo.el b/app-emacs/initsplit/files/51initsplit-gentoo.el
new file mode 100644
index 000000000000..5d60b496458c
--- /dev/null
+++ b/app-emacs/initsplit/files/51initsplit-gentoo.el
@@ -0,0 +1,16 @@
+
+;;; initsplit site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'initsplit-split-user-init-file "initsplit")
+(autoload 'initsplit-byte-compile-files "initsplit")
+
+;; Avoid clobbering the kill ring
+;; (see http://www.emacswiki.org/cgi-bin/wiki?InitSplit)
+
+(defadvice initsplit-split-customizations (around do-the-initsplit act)
+  "Don't clobber the `kill-ring' when writing customizations."
+  (let ((orig-kill-ring kill-ring))
+    (unwind-protect
+	ad-do-it
+      (setq kill-ring orig-kill-ring))))
diff --git a/app-emacs/initsplit/files/digest-initsplit-1.6-r1 b/app-emacs/initsplit/files/digest-initsplit-1.6-r1
new file mode 100644
index 000000000000..b8b643912d17
--- /dev/null
+++ b/app-emacs/initsplit/files/digest-initsplit-1.6-r1
@@ -0,0 +1,3 @@
+MD5 a2d2a2600630367c65f8bd69c18fb0c1 initsplit-1.6.tar.gz 2454
+RMD160 5b6d70e0ea5dc8ffdcf719b648e7bdaa89317b57 initsplit-1.6.tar.gz 2454
+SHA256 64612a8bdc43875b2889549e1182cae39041676dac92151f53bca0473cbc4e4c initsplit-1.6.tar.gz 2454
diff --git a/app-emacs/initsplit/initsplit-1.6-r1.ebuild b/app-emacs/initsplit/initsplit-1.6-r1.ebuild
new file mode 100644
index 000000000000..e2e3d9d2b3ce
--- /dev/null
+++ b/app-emacs/initsplit/initsplit-1.6-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/initsplit/initsplit-1.6-r1.ebuild,v 1.1 2007/10/14 09:41:19 ulm Exp $
+
+inherit elisp
+
+DESCRIPTION="Split customizations into different files"
+HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki?InitSplit"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+SITEFILE=51${PN}-gentoo.el
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "Initsplit is no longer enabled as a site default. Add the following"
+	elog "line to your ~/.emacs file to enable configuration file splitting:"
+	elog "  (add-hook 'write-file-hooks 'initsplit-split-user-init-file t)"
+	elog ""
+	elog "If you want configuration files byte-compiled, also add this line:"
+	elog "  (add-hook 'after-save-hook 'initsplit-byte-compile-files t)"
+}