Moved sitefile from files/3.x/ to files/. Updated SRC_URI.

Package-Manager: portage-2.1.2.7

7 files changed, 51 insertions, 71 deletions

diff --git a/app-emacs/mew/ChangeLog b/app-emacs/mew/ChangeLog
index b2b8a1e758e2..0f4692087e9f 100644
--- a/app-emacs/mew/ChangeLog
+++ b/app-emacs/mew/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/mew
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/ChangeLog,v 1.41 2007/03/08 07:25:37 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/ChangeLog,v 1.42 2007/05/10 09:50:57 ulm Exp $
+
+  10 May 2007; Ulrich Mueller <ulm@gentoo.org> -files/3.x/50mew-gentoo.el,
+  files/50mew-gentoo.el, mew-4.1.ebuild, mew-4.2.ebuild, mew-5.1.ebuild:
+  Removed unused old sitefile; moved new sitefile from files/3.x/ to files/.
+  Add load path correctly in the new sitefile, too, finally fixing bug #169588.
+  Updated SRC_URI.
 
   08 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   files/50mew-gentoo.el:
diff --git a/app-emacs/mew/Manifest b/app-emacs/mew/Manifest
index 72413d76ec43..6b7633f5882b 100644
--- a/app-emacs/mew/Manifest
+++ b/app-emacs/mew/Manifest
@@ -1,33 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 3.x/50mew-gentoo.el 246 RMD160 aa69890cf2ecaa62b797f098e18e27d40d85a543 SHA1 f2a2135096affab7574746ad0a4d4e7a6b1e663c SHA256 ba82debf2abc1d4991bcf57088018243fef45b79e8ac68f4ff3410e6aecaee9e
-MD5 dde1c4f5ab658fe3d1ea86164db3cc11 files/3.x/50mew-gentoo.el 246
-RMD160 aa69890cf2ecaa62b797f098e18e27d40d85a543 files/3.x/50mew-gentoo.el 246
-SHA256 ba82debf2abc1d4991bcf57088018243fef45b79e8ac68f4ff3410e6aecaee9e files/3.x/50mew-gentoo.el 246
-AUX 50mew-gentoo.el 177 RMD160 53a04c5a56a280d04ea9ac54cf271a4868c355bd SHA1 fa1cc79910661a7a7f9e41cc42d8750cac26f51e SHA256 c625903958b80b52de86975ce0f08cf52c9e4334d409136545adae9b5d63fc37
-MD5 76a6fb0bfdc6751712dfd1b057fcfa0e files/50mew-gentoo.el 177
-RMD160 53a04c5a56a280d04ea9ac54cf271a4868c355bd files/50mew-gentoo.el 177
-SHA256 c625903958b80b52de86975ce0f08cf52c9e4334d409136545adae9b5d63fc37 files/50mew-gentoo.el 177
+AUX 50mew-gentoo.el 234 RMD160 a6ab622a67c7d08b2127ade1c3903d2f8e4292fd SHA1 0151a4e9fbe9dc44549ee14d0d2f1a2abb5eec31 SHA256 8c2bdddd4631d1897c8b51e5976263a99dc8414095b24b3f4b9f18f9f4b79bd2
+MD5 58675969f76e417ac4d23ccaad0de5f0 files/50mew-gentoo.el 234
+RMD160 a6ab622a67c7d08b2127ade1c3903d2f8e4292fd files/50mew-gentoo.el 234
+SHA256 8c2bdddd4631d1897c8b51e5976263a99dc8414095b24b3f4b9f18f9f4b79bd2 files/50mew-gentoo.el 234
 DIST mew-4.1.tar.gz 899279 RMD160 70d049339bc103bd0b49da9604fd687ca65e3145 SHA1 4a89e7d32acd5bfae10aae40b4c5728262f2c750 SHA256 2b81b20c415fd719832cd497b39d0f930eade57f608f76bb984995027407a338
 DIST mew-4.2.tar.gz 925037 RMD160 fd7ff4620b6d27eff6baf31ccba98cc10dfcb88d SHA1 5c425000122ff00a0f02460b46ed4915808d107a SHA256 0e316e703f0d1754cf4cc1331f72292d454af11f8a13a43edceae418bda127da
 DIST mew-5.1.tar.gz 948533 RMD160 6f578b74fce677115e37bc27bf6756e59eabaf23 SHA1 144b90ddac4ce7295c7f710f9f53d15dcb032301 SHA256 bedaabe37ddd52894f7129fd1240939b836f205a6f4d7c5a5072809f6dc1f336
-EBUILD mew-4.1.ebuild 999 RMD160 1ce1fb9dada041fe1be3c9a8b972ec2323446cb0 SHA1 8a53122710614ac01c1681e0233e21c617004ba7 SHA256 cbe605303d3dc8af6fea81b6157381a1d94e964a9f35afc19c5128b47ea075fa
-MD5 37cb679537f19c585e4ff72c2771a82b mew-4.1.ebuild 999
-RMD160 1ce1fb9dada041fe1be3c9a8b972ec2323446cb0 mew-4.1.ebuild 999
-SHA256 cbe605303d3dc8af6fea81b6157381a1d94e964a9f35afc19c5128b47ea075fa mew-4.1.ebuild 999
-EBUILD mew-4.2.ebuild 1018 RMD160 59b53f24123b59b0c9b32f3c841b795c82b42506 SHA1 3205d1b8cfd7ea254d6983ada4f0e71122695df3 SHA256 95f40920a6c7b15386ad18041ade502629195b355296e068675e0ce556fe361b
-MD5 7c1409ecedcac87adba72e8cbcc333d8 mew-4.2.ebuild 1018
-RMD160 59b53f24123b59b0c9b32f3c841b795c82b42506 mew-4.2.ebuild 1018
-SHA256 95f40920a6c7b15386ad18041ade502629195b355296e068675e0ce556fe361b mew-4.2.ebuild 1018
-EBUILD mew-5.1.ebuild 1011 RMD160 5310f084668661f18aa13f2cdac60dcd4e4b3b4a SHA1 d4f072641213b2c57fb105e3fb36af1e5dcc8ced SHA256 1b14054562f9818f4e70d106282b553ffffea0d13d25165bc0d6f590cb202fa7
-MD5 b3a5a00db653bb5d9d39454f8a968c23 mew-5.1.ebuild 1011
-RMD160 5310f084668661f18aa13f2cdac60dcd4e4b3b4a mew-5.1.ebuild 1011
-SHA256 1b14054562f9818f4e70d106282b553ffffea0d13d25165bc0d6f590cb202fa7 mew-5.1.ebuild 1011
-MISC ChangeLog 5693 RMD160 8d1d85143c84bda8c3b52cf98af60744c0c9c819 SHA1 a45ddbc683510aed77c97f4079381f15c68977dd SHA256 ae02a5a9103e89adf8db5b654d796545f8f459b08ce89ce71322741cb8359386
-MD5 2946396825a4f6306699ddb680cb62ac ChangeLog 5693
-RMD160 8d1d85143c84bda8c3b52cf98af60744c0c9c819 ChangeLog 5693
-SHA256 ae02a5a9103e89adf8db5b654d796545f8f459b08ce89ce71322741cb8359386 ChangeLog 5693
+EBUILD mew-4.1.ebuild 963 RMD160 ae95185e17d65285c8818faab12543d68416c1cc SHA1 5ec1d9411863882d1d66ed8451f1418e303ea8ab SHA256 65f62b9c3f6382e33565c6c0fe2b1016d18f1595601e4b650b90fd6ce26a9685
+MD5 42c5433fbfba07aa8d50ddc94b8dabc3 mew-4.1.ebuild 963
+RMD160 ae95185e17d65285c8818faab12543d68416c1cc mew-4.1.ebuild 963
+SHA256 65f62b9c3f6382e33565c6c0fe2b1016d18f1595601e4b650b90fd6ce26a9685 mew-4.1.ebuild 963
+EBUILD mew-4.2.ebuild 981 RMD160 cd26a11306050793099b1a781f1634788e0bbb18 SHA1 0784f1cbd511ee55dda087dc7bc5b41c5652c2cd SHA256 feab052142cd1a622b1d8458ec49247cabcc30b2052b1d014d45bf998aec1066
+MD5 5a43916052e97de6d978f08545f3dfaf mew-4.2.ebuild 981
+RMD160 cd26a11306050793099b1a781f1634788e0bbb18 mew-4.2.ebuild 981
+SHA256 feab052142cd1a622b1d8458ec49247cabcc30b2052b1d014d45bf998aec1066 mew-4.2.ebuild 981
+EBUILD mew-5.1.ebuild 981 RMD160 a0040953574814ba396087e38c81156d26a32fe9 SHA1 ac92900255a5cdedb2cfc6aad53bac3d691d73ad SHA256 9bbf0208b7882242b0ef254b041a1462dc67943c380a4ffc60f0c30abf90a746
+MD5 304fe7b66fff3d6e9b35725d4afb86b0 mew-5.1.ebuild 981
+RMD160 a0040953574814ba396087e38c81156d26a32fe9 mew-5.1.ebuild 981
+SHA256 9bbf0208b7882242b0ef254b041a1462dc67943c380a4ffc60f0c30abf90a746 mew-5.1.ebuild 981
+MISC ChangeLog 6016 RMD160 b6070c4cbc769d92ed1ab743c497897dfe32ce4c SHA1 21425f8944959e3f5dc3e4a06f49bdd631288535 SHA256 15a8506672846e50e46b9f28ec1818c642a9d678fd8f4254f0f0caf100e19f75
+MD5 bff675976df0b20c53f64ae445cd781f ChangeLog 6016
+RMD160 b6070c4cbc769d92ed1ab743c497897dfe32ce4c ChangeLog 6016
+SHA256 15a8506672846e50e46b9f28ec1818c642a9d678fd8f4254f0f0caf100e19f75 ChangeLog 6016
 MISC metadata.xml 424 RMD160 e052dfa6794183ce087e81d6462c12e4d6fb91a7 SHA1 35011c424b1e4bdd5e2b1615b5cc730c72bb601f SHA256 4be2d2a37a254f6bab19864ed2d0f5c685a0a828aa98f82a942fd343d8caa0fa
 MD5 b8a5a05dc587cbca65b831dedcd4488c metadata.xml 424
 RMD160 e052dfa6794183ce087e81d6462c12e4d6fb91a7 metadata.xml 424
@@ -42,9 +38,9 @@ MD5 85134cd4fed90f8a526d7692d1b5034c files/digest-mew-5.1 223
 RMD160 db4bd53d474df5a0554fa92fcfd5823a978e00f8 files/digest-mew-5.1 223
 SHA256 a58b2f71f57379e22eafc25926c0c671e0a152698822864f7667c222c778ba0a files/digest-mew-5.1 223
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF77ouNQqtfCuFneMRAiX6AJwO06O6uOvdUeJKSGa9AK2T8W9rKQCeKT3V
-ex4bBlwU6xFGyyBYhZ3XSnc=
-=KRRx
+iD8DBQFGQuuEOeoy/oIi7uwRAi+wAKCXLzlV9YAsdjtbPbQnS0KblyOPSQCg0Is+
+F4qUXLb12gg8EOxTX95wXqE=
+=Ylpr
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/mew/files/3.x/50mew-gentoo.el b/app-emacs/mew/files/3.x/50mew-gentoo.el
deleted file mode 100644
index e3f21b24e10c..000000000000
--- a/app-emacs/mew/files/3.x/50mew-gentoo.el
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; mew site-lisp configuration
-
-(setq load-path (cons "@SITELISP@" load-path))
-
-(setq mew-icon-directory "/usr/share/mew")
-
-(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/50mew-gentoo.el b/app-emacs/mew/files/50mew-gentoo.el
index 819f9f1fec8b..af06cbb6ddf6 100644
--- a/app-emacs/mew/files/50mew-gentoo.el
+++ b/app-emacs/mew/files/50mew-gentoo.el
@@ -3,6 +3,8 @@
 (add-to-list 'load-path "@SITELISP@")
 
 (setq mew-icon-directory "/usr/share/mew")
+(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/mew-4.1.ebuild b/app-emacs/mew/mew-4.1.ebuild
index f805b64d0a50..db5a3fe62a56 100644
--- a/app-emacs/mew/mew-4.1.ebuild
+++ b/app-emacs/mew/mew-4.1.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-4.1.ebuild,v 1.10 2007/01/28 04:24:58 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-4.1.ebuild,v 1.11 2007/05/10 09:50:57 ulm Exp $
 
 inherit elisp
 
-IUSE="ssl"
-
-DESCRIPTION="great MIME mail reader for Emacs/XEmacs"
+DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
 HOMEPAGE="http://www.mew.org/"
-SRC_URI="ftp://ftp.mew.org/pub/Mew/release/${P/_/}.tar.gz"
+SRC_URI="http://www.mew.org/Release/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 alpha amd64 ppc ~ppc-macos sparc"
+IUSE="ssl"
 
 RDEPEND="ssl? ( net-misc/stunnel )"
 
-SITEFILE=50mew-gentoo.el
-
-S=${WORKDIR}/${P/_/}
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
 	emake || die
@@ -31,7 +28,7 @@ src_install() {
 		etcdir=${D}/usr/share/${PN} \
 		mandir=${D}/usr/share/man/man1 || die
 
-	elisp-site-file-install ${FILESDIR}/3.x/${SITEFILE}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 
 	dodoc 00* mew.dot.*
 }
diff --git a/app-emacs/mew/mew-4.2.ebuild b/app-emacs/mew/mew-4.2.ebuild
index 972c3fe1aa94..87abb0e4f307 100644
--- a/app-emacs/mew/mew-4.2.ebuild
+++ b/app-emacs/mew/mew-4.2.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-4.2.ebuild,v 1.4 2007/01/28 04:24:58 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-4.2.ebuild,v 1.5 2007/05/10 09:50:57 ulm Exp $
 
 inherit elisp
 
-IUSE="ssl"
-
-DESCRIPTION="great MIME mail reader for Emacs/XEmacs"
+DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
 HOMEPAGE="http://www.mew.org/"
-SRC_URI="ftp://ftp.mew.org/pub/Mew/release/${P/_/}.tar.gz"
+SRC_URI="http://www.mew.org/Release/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~alpha ~amd64 ~ppc-macos ~sparc ~ppc"
+IUSE="ssl"
 
 RDEPEND="ssl? ( net-misc/stunnel )"
 
-SITEFILE=50mew-gentoo.el
-
-S=${WORKDIR}/${P/_/}
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
 	econf || die
@@ -32,7 +29,7 @@ src_install() {
 		etcdir=${D}/usr/share/${PN} \
 		mandir=${D}/usr/share/man/man1 || die
 
-	elisp-site-file-install ${FILESDIR}/3.x/${SITEFILE}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 
 	dodoc 00* mew.dot.*
 }
@@ -47,4 +44,3 @@ pkg_postinst() {
 pkg_postrm() {
 	elisp-site-regen
 }
-
diff --git a/app-emacs/mew/mew-5.1.ebuild b/app-emacs/mew/mew-5.1.ebuild
index 0cb88029b258..4c1cd0c30f93 100644
--- a/app-emacs/mew/mew-5.1.ebuild
+++ b/app-emacs/mew/mew-5.1.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-5.1.ebuild,v 1.2 2007/01/28 04:24:58 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mew/mew-5.1.ebuild,v 1.3 2007/05/10 09:50:57 ulm Exp $
 
 inherit elisp
 
-IUSE="ssl"
-
-DESCRIPTION="great MIME mail reader for Emacs/XEmacs"
+DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
 HOMEPAGE="http://www.mew.org/"
-SRC_URI="http://www.mew.org/Release/${P/_/}.tar.gz"
+SRC_URI="http://www.mew.org/Release/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~alpha ~amd64 ~ppc-macos ~sparc ~ppc"
+IUSE="ssl"
 
 RDEPEND="ssl? ( net-misc/stunnel )"
 
-SITEFILE=50mew-gentoo.el
-
-S=${WORKDIR}/${P/_/}
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
 	econf || die
@@ -32,7 +29,7 @@ src_install() {
 		etcdir=${D}/usr/share/${PN} \
 		mandir=${D}/usr/share/man/man1 || die
 
-	elisp-site-file-install ${FILESDIR}/3.x/${SITEFILE}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 
 	dodoc 00* mew.dot.*
 }
@@ -47,4 +44,3 @@ pkg_postinst() {
 pkg_postrm() {
 	elisp-site-regen
 }
-