From ad816482ab577cdf66c6a7bdc19d07ffa58142b6 Mon Sep 17 00:00:00 2001
From: Hans de Graaff <graaff@gentoo.org>
Date: Sat, 15 Jul 2017 09:20:41 +0200
Subject: app-emacs/puppet-mode: rename puppet-mode.el sitelisp file

Version the name of the puppet-mode sitelisp so that this package
does not have a file collision with app-admin/puppet. This means
that we can remove the blockers and provide a much easier upgrade
path.

Package-Manager: Portage-2.3.6, Repoman-2.3.2
---
 .../puppet-mode/files/50puppet-mode-1-gentoo.el    |  6 +++++
 .../puppet-mode/files/50puppet-mode-gentoo.el      |  6 -----
 app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild    | 26 ++++++++++++++++++++++
 app-emacs/puppet-mode/puppet-mode-0.3.ebuild       | 26 ----------------------
 4 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el
 delete mode 100644 app-emacs/puppet-mode/files/50puppet-mode-gentoo.el
 create mode 100644 app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
 delete mode 100644 app-emacs/puppet-mode/puppet-mode-0.3.ebuild

(limited to 'app-emacs')

diff --git a/app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el b/app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el
new file mode 100644
index 000000000000..64c38ae5a31d
--- /dev/null
+++ b/app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; puppet-mode site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
+(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
diff --git a/app-emacs/puppet-mode/files/50puppet-mode-gentoo.el b/app-emacs/puppet-mode/files/50puppet-mode-gentoo.el
deleted file mode 100644
index 64c38ae5a31d..000000000000
--- a/app-emacs/puppet-mode/files/50puppet-mode-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; puppet-mode site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
-(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
new file mode 100644
index 000000000000..91c7ef8d744c
--- /dev/null
+++ b/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Puppet manifests"
+HOMEPAGE="https://github.com/voxpupuli/puppet-mode"
+SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+
+DOCS="CHANGES.rst README.rst"
+SITEFILE="50${PN}-1-gentoo.el"
+ELISP_PATCHES=( "${FILESDIR}/${PN}-0.3-version.patch" )
+
+RDEPEND="!!<app-admin/puppet-5[emacs]"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -i -e 's/@VERSION@/'${PV}'/' puppet-mode.el || die
+}
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3.ebuild
deleted file mode 100644
index 29d1fe64b9e1..000000000000
--- a/app-emacs/puppet-mode/puppet-mode-0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing Puppet manifests"
-HOMEPAGE="https://github.com/voxpupuli/puppet-mode"
-SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-
-DOCS="CHANGES.rst README.rst"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_PATCHES=( "${FILESDIR}/${PN}-0.3-version.patch" )
-
-RDEPEND="!!<app-admin/puppet-5[emacs]"
-
-src_prepare() {
-	elisp_src_prepare
-
-	sed -i -e 's/@VERSION@/'${PV}'/' puppet-mode.el || die
-}
-- 
cgit v1.2.3-65-gdbad