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

(Portage version: 2.1.2.7)

6 files changed, 27 insertions, 43 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/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
 }
-