6 files changed, 13 insertions, 15 deletions
diff --git a/app-emacs/mell/ChangeLog b/app-emacs/mell/ChangeLog
index 90eea50852da..6aac2afd3f59 100644
--- a/app-emacs/mell/ChangeLog
+++ b/app-emacs/mell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/mell
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mell/ChangeLog,v 1.17 2009/03/09 13:01:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mell/ChangeLog,v 1.18 2009/04/10 06:32:32 ulm Exp $
+
+  10 Apr 2009; Ulrich Mueller <ulm@gentoo.org> -files/51mell-gentoo.el,
+  +files/50mell-gentoo-1.0.0.el, files/50mell-gentoo.el, mell-1.0.0.ebuild,
+  mell-1.0.0-r1.ebuild:
+  Rename site-init file.
 
 *mell-1.0.0-r1 (09 Mar 2009)
 
diff --git a/app-emacs/mell/files/50mell-gentoo-1.0.0.el b/app-emacs/mell/files/50mell-gentoo-1.0.0.el
new file mode 100644
index 000000000000..f49ca386779a
--- /dev/null
+++ b/app-emacs/mell/files/50mell-gentoo-1.0.0.el
@@ -0,0 +1 @@
+(require 'init-mell)
diff --git a/app-emacs/mell/files/50mell-gentoo.el b/app-emacs/mell/files/50mell-gentoo.el
index 586e23c4591e..431f7e90ae73 100644
--- a/app-emacs/mell/files/50mell-gentoo.el
+++ b/app-emacs/mell/files/50mell-gentoo.el
@@ -1,5 +1 @@
-
-;;; mell site-lisp configuration
-
-(require 'init-mell)
-
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/mell/files/51mell-gentoo.el b/app-emacs/mell/files/51mell-gentoo.el
deleted file mode 100644
index 91e6a28443fa..000000000000
--- a/app-emacs/mell/files/51mell-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-
-;;; mell site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/mell/mell-1.0.0-r1.ebuild b/app-emacs/mell/mell-1.0.0-r1.ebuild
index f5c6dfc9119b..755a9276dc15 100644
--- a/app-emacs/mell/mell-1.0.0-r1.ebuild
+++ b/app-emacs/mell/mell-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mell/mell-1.0.0-r1.ebuild,v 1.1 2009/03/09 13:01:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mell/mell-1.0.0-r1.ebuild,v 1.2 2009/04/10 06:32:32 ulm Exp $
 
 inherit elisp
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE="linguas_ja"
 
-SITEFILE="51${PN}-gentoo.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
 	cd src
diff --git a/app-emacs/mell/mell-1.0.0.ebuild b/app-emacs/mell/mell-1.0.0.ebuild
index 29620d57b523..f7f6f4193bd9 100644
--- a/app-emacs/mell/mell-1.0.0.ebuild
+++ b/app-emacs/mell/mell-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mell/mell-1.0.0.ebuild,v 1.14 2007/12/02 15:14:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mell/mell-1.0.0.ebuild,v 1.15 2009/04/10 06:32:32 ulm Exp $
 
 inherit elisp
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="alpha ~amd64 ppc ppc64 x86"
 SLOT="0"
 IUSE=""
-SITEFILE=50${PN}-gentoo.el
+SITEFILE="50${PN}-gentoo-${PV}.el"
 
 src_compile() {