Clean up old site-init file.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

6 files changed, 22 insertions, 33 deletions

diff --git a/app-emacs/mew/ChangeLog b/app-emacs/mew/ChangeLog
index 1989baf8ccb6..bf9cffcd32b0 100644
--- a/app-emacs/mew/ChangeLog
+++ b/app-emacs/mew/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/mew
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/ChangeLog,v 1.71 2009/04/03 22:04:17 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/ChangeLog,v 1.72 2010/01/12 17:56:26 ulm Exp $
+
+  12 Jan 2010; Ulrich Mueller <ulm@gentoo.org> files/50mew-gentoo.el,
+  mew-6.2.ebuild, -files/51mew-gentoo.el:
+  Clean up old site-init file.
 
   03 Apr 2009; Christian Faulhammer <fauli@gentoo.org> -mew-6.1.ebuild:
   clean up
diff --git a/app-emacs/mew/Manifest b/app-emacs/mew/Manifest
index 4bb51e977502..5277edb1a877 100644
--- a/app-emacs/mew/Manifest
+++ b/app-emacs/mew/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50mew-gentoo.el 235 RMD160 25ce557253eb5459c7a739a9dd19d7a2a5ac2cc9 SHA1 59dff8b76187a20c86986671d346066f5d48967c SHA256 e71448c36c66b8068f300ab6d6c344a248ea1443afb7643bfed46367874ef17d
-AUX 51mew-gentoo.el 229 RMD160 8fc49750b28643f671af8cdbaf1bba8d374ef509 SHA1 43393dc31ed6a5838cce5eeb803ad00007401924 SHA256 2282811455c195a72cdb98ba2c396d3ed972476c50d8465951cc4e03cb015c7c
+AUX 50mew-gentoo.el 195 RMD160 01af8c774dbad9ccb56fd6fca749544eb2f6027a SHA1 228143e1cc17934cc835adee1b58302a53ca2df3 SHA256 7213a77b0452c9804e0580534730fdbd1c2e93d182d946c4ecf6f1a8360eb3c3
 DIST mew-6.2.tar.gz 972731 RMD160 fbda38606c228e2c7cb873a348821d2ec10138b9 SHA1 8380cf0072e0615f27b39144481eb9b410c57e45 SHA256 9838a1c2556d75f6dae954cd9869fe6cf81998f89108c9318c638dffc36d8f78
-EBUILD mew-6.2.ebuild 1177 RMD160 19016a86659c01b2e5176afecab33637d4b0a4fd SHA1 72a666650d858b77e09bdf4690dba0b18295a78c SHA256 979ec019e0e070e489c5f68c9370935f44c5422cce7eb8c44e2c1711e374d3b8
-MISC ChangeLog 9494 RMD160 cd6a796cbb9c759851cb5f18fedef4a339e8de15 SHA1 5482ed63313e01df7f0074ea671f58cf09c8ff79 SHA256 0049fda231153637281bc0a1a54dbecf9a8802fa97da25c39c0dd4952b7008ea
-MISC metadata.xml 159 RMD160 f997186a466cc3629429a6adbb6d6c609c621a7a SHA1 da32fed3458e2338a09e325da366caca249ea44e SHA256 1a2c240d1d46720c2d261c95e014a19171e6147da6651e92557a51df3f2feb37
+EBUILD mew-6.2.ebuild 1151 RMD160 09504e81aa04f995cd80f9182500de34faa0b72f SHA1 a852479ed163b8f13eabfff2b8210a6a2b045209 SHA256 6c7c989eeb5fdcf880e481035d326233efb8f242a053c0c905d8609d02fe8602
+MISC ChangeLog 9636 RMD160 84a47bac3fd1de6c745b44f973a8b418e31c514c SHA1 ee01d803dcd7dac7a5fc0640b76677c9c65cf13b SHA256 8c1d88e34334fec75287e560d0b731e543f0d00957a92670e68112cce3e5d068
+MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAknWiAgACgkQNQqtfCuFnePeSwCdE2obhf3397dlkp47HpVYmKp+
-5EAAoJkMSARcpBxlISc2vBFImeA+iH8o
-=a8Q7
+iEYEARECAAYFAktMuIEACgkQOeoy/oIi7uxyYACgx7npZs5djoIqDuxgKrXJOsdE
+1rgAoMmGbxpJFMYUKFqo+A3HFauc2Ep7
+=wWMh
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/mew/files/50mew-gentoo.el b/app-emacs/mew/files/50mew-gentoo.el
index cdb5a00b37e0..1f36f8e08d93 100644
--- a/app-emacs/mew/files/50mew-gentoo.el
+++ b/app-emacs/mew/files/50mew-gentoo.el
@@ -1,11 +1,7 @@
-
-;;; mew site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
+(autoload 'mew "mew" nil t)
+(autoload 'mew-send "mew" nil t)
 
-(setq mew-icon-directory "/usr/share/mew")
+(setq mew-icon-directory "@SITEETC@")
 (setq mew-pop-port "pop-3")
 (setq mew-imap-port "imap2")
-
-(autoload 'mew "mew" nil t)
-(autoload 'mew-send "mew" nil t)
diff --git a/app-emacs/mew/files/51mew-gentoo.el b/app-emacs/mew/files/51mew-gentoo.el
deleted file mode 100644
index 5bb85f48cf2b..000000000000
--- a/app-emacs/mew/files/51mew-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-
-;;; mew site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'mew "mew" nil t)
-(autoload 'mew-send "mew" nil t)
-
-(setq mew-icon-directory "@SITEETC@")
-(setq mew-pop-port "pop-3")
-(setq mew-imap-port "imap2")
diff --git a/app-emacs/mew/metadata.xml b/app-emacs/mew/metadata.xml
index 52882dd49b45..bc306fe58224 100644
--- a/app-emacs/mew/metadata.xml
+++ b/app-emacs/mew/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
+<herd>emacs</herd>
 </pkgmetadata>
diff --git a/app-emacs/mew/mew-6.2.ebuild b/app-emacs/mew/mew-6.2.ebuild
index 858d0a73f22d..41610912228f 100644
--- a/app-emacs/mew/mew-6.2.ebuild
+++ b/app-emacs/mew/mew-6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-6.2.ebuild,v 1.4 2009/04/03 16:52:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-6.2.ebuild,v 1.5 2010/01/12 17:56:26 ulm Exp $
 
 inherit elisp
 
@@ -16,12 +16,12 @@ RESTRICT="test"
 
 RDEPEND="ssl? ( net-misc/stunnel )"
 
-SITEFILE="51${PN}-gentoo.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
 	econf \
 		--with-elispdir=${SITELISP}/${PN} \
-		--with-etcdir=${SITEETC}/${PN} || die "econf failed"
+		--with-etcdir=${SITEETC}/${PN}
 	emake || die "emake failed"
 
 	if use linguas_ja; then