Version bump. Remove old.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 35 insertions, 34 deletions

diff --git a/app-emacs/python-mode/ChangeLog b/app-emacs/python-mode/ChangeLog
index 5020d37af9f5..2baad726c03a 100644
--- a/app-emacs/python-mode/ChangeLog
+++ b/app-emacs/python-mode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/python-mode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/ChangeLog,v 1.58 2012/03/02 20:48:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/ChangeLog,v 1.59 2012/03/03 00:03:41 ulm Exp $
+
+*python-mode-6.0.4 (02 Mar 2012)
+
+  02 Mar 2012; Ulrich Müller <ulm@gentoo.org> -python-mode-5.1.0.ebuild,
+  -files/60python-mode-gentoo-5.1.el, +python-mode-6.0.4.ebuild:
+  Version bump. Remove old.
 
   02 Mar 2012; Brent Baude <ranger@gentoo.org> python-mode-5.2.0.ebuild:
   Marking python-mode-5.2.0 ppc64 for bug 391725
diff --git a/app-emacs/python-mode/files/60python-mode-gentoo-5.1.el b/app-emacs/python-mode/files/60python-mode-gentoo-5.1.el
deleted file mode 100644
index 0b3aeae41681..000000000000
--- a/app-emacs/python-mode/files/60python-mode-gentoo-5.1.el
+++ /dev/null
@@ -1,10 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'python-mode "python-mode" "Python editing mode." t)
-(autoload 'jython-mode "python-mode" "Python editing mode." t)
-(autoload 'py-shell "python-mode" "Start an interactive Python interpreter in another window." t)
-
-(add-to-list 'auto-mode-alist '("\\.py$" . python-mode))
-
-(add-to-list 'interpreter-mode-alist '("python" . python-mode))
-(add-to-list 'interpreter-mode-alist '("jython" . jython-mode))
diff --git a/app-emacs/python-mode/python-mode-5.1.0.ebuild b/app-emacs/python-mode/python-mode-5.1.0.ebuild
deleted file mode 100644
index 4eadd5b3c0f3..000000000000
--- a/app-emacs/python-mode/python-mode-5.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-5.1.0.ebuild,v 1.11 2011/02/20 13:48:06 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="An Emacs major mode for editing Python source"
-HOMEPAGE="https://launchpad.net/python-mode"
-# taken from http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}.el"
-SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-S=${WORKDIR}
-SITEFILE=60${PN}-gentoo-5.1.el
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Note that doctest support is now split out to app-emacs/doctest-mode."
-}
diff --git a/app-emacs/python-mode/python-mode-6.0.4.ebuild b/app-emacs/python-mode/python-mode-6.0.4.ebuild
new file mode 100644
index 000000000000..c7268291f045
--- /dev/null
+++ b/app-emacs/python-mode/python-mode-6.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-6.0.4.ebuild,v 1.1 2012/03/03 00:03:41 ulm Exp $
+
+EAPI=4
+
+inherit elisp
+
+MY_P="${PN}.el-${PV}"
+DESCRIPTION="An Emacs major mode for editing Python source"
+HOMEPAGE="https://launchpad.net/python-mode"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+# remove XEmacs specific file
+ELISP_REMOVE="highlight-indentation.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="NEWS"
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "Note that doctest support is split out to app-emacs/doctest-mode."
+}