public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emacs/puppet-mode/, app-emacs/puppet-mode/files/
@ 2017-06-30 13:07 Hans de Graaff
  0 siblings, 0 replies; 2+ messages in thread
From: Hans de Graaff @ 2017-06-30 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     5c6de1a295268373b125e6c99952a9e78dcc7c5d
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 13:04:49 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 13:05:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6de1a2

app-emacs/puppet-mode: Initial import of 0.3

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-emacs/puppet-mode/Manifest                     |  1 +
 .../puppet-mode/files/50puppet-mode-gentoo.el      |  6 +++++
 .../files/puppet-mode-0.3-version.patch            | 20 +++++++++++++++++
 app-emacs/puppet-mode/metadata.xml                 |  8 +++++++
 app-emacs/puppet-mode/puppet-mode-0.3.ebuild       | 26 ++++++++++++++++++++++
 5 files changed, 61 insertions(+)

diff --git a/app-emacs/puppet-mode/Manifest b/app-emacs/puppet-mode/Manifest
new file mode 100644
index 00000000000..dd9c034ea33
--- /dev/null
+++ b/app-emacs/puppet-mode/Manifest
@@ -0,0 +1 @@
+DIST puppet-mode-0.3.tar.gz 25617 SHA256 71ebcb4bf518f9aca404260186b97556fb52060bc56edb77ab1881d64543174d SHA512 16ba5f71a1ec6c40b1eddf2acf5c1aa1968526b959279e1cac0cfac947f82f404fc35978ce12f5851309f293e2c92f054a718ade97d156528d505dcda58434e8 WHIRLPOOL cb48404309236b6778e6a81b17cc4ad0870438eb87c4c66b208ddceae2c88370af7702565cfa2f2ddf15308cdef61bba69c9c2cf86b43847227cdc334197a19f

diff --git a/app-emacs/puppet-mode/files/50puppet-mode-gentoo.el b/app-emacs/puppet-mode/files/50puppet-mode-gentoo.el
new file mode 100644
index 00000000000..64c38ae5a31
--- /dev/null
+++ b/app-emacs/puppet-mode/files/50puppet-mode-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/puppet-mode-0.3-version.patch b/app-emacs/puppet-mode/files/puppet-mode-0.3-version.patch
new file mode 100644
index 00000000000..513329dec1a
--- /dev/null
+++ b/app-emacs/puppet-mode/files/puppet-mode-0.3-version.patch
@@ -0,0 +1,20 @@
+--- a/puppet-mode.el.~1~	2014-03-13 16:30:50.000000000 +0100
++++ b/puppet-mode.el	2017-06-30 14:38:22.749240233 +0200
+@@ -72,8 +72,6 @@
+ 
+ \f
+ ;;;; Requirements
+-(require 'pkg-info)
+-
+ (require 'cl-lib)
+ (require 'rx)
+ (require 'align)
+@@ -165,7 +163,7 @@
+ if called interactively, or if SHOW-VERSION is non-nil, otherwise
+ just return nil."
+   (interactive (list t))
+-  (let ((version (pkg-info-version-info 'puppet-mode)))
++  (let ((version "@VERSION@"))
+     (when show-version
+       (message "Puppet Mode version: %s" version))
+     version))

diff --git a/app-emacs/puppet-mode/metadata.xml b/app-emacs/puppet-mode/metadata.xml
new file mode 100644
index 00000000000..c438baf3b32
--- /dev/null
+++ b/app-emacs/puppet-mode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+</pkgmetadata>

diff --git a/app-emacs/puppet-mode/puppet-mode-0.3.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3.ebuild
new file mode 100644
index 00000000000..29d1fe64b9e
--- /dev/null
+++ b/app-emacs/puppet-mode/puppet-mode-0.3.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}-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
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emacs/puppet-mode/, app-emacs/puppet-mode/files/
@ 2017-07-15  7:26 Hans de Graaff
  0 siblings, 0 replies; 2+ messages in thread
From: Hans de Graaff @ 2017-07-15  7:26 UTC (permalink / raw
  To: gentoo-commits

commit:     ad816482ab577cdf66c6a7bdc19d07ffa58142b6
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 07:20:41 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 07:20:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad816482

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

 .../files/{50puppet-mode-gentoo.el => 50puppet-mode-1-gentoo.el}        | 0
 .../puppet-mode/{puppet-mode-0.3.ebuild => puppet-mode-0.3-r1.ebuild}   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emacs/puppet-mode/files/50puppet-mode-gentoo.el b/app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el
similarity index 100%
rename from app-emacs/puppet-mode/files/50puppet-mode-gentoo.el
rename to app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el

diff --git a/app-emacs/puppet-mode/puppet-mode-0.3.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
similarity index 95%
rename from app-emacs/puppet-mode/puppet-mode-0.3.ebuild
rename to app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
index 29d1fe64b9e..91c7ef8d744 100644
--- a/app-emacs/puppet-mode/puppet-mode-0.3.ebuild
+++ b/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 
 DOCS="CHANGES.rst README.rst"
-SITEFILE="50${PN}-gentoo.el"
+SITEFILE="50${PN}-1-gentoo.el"
 ELISP_PATCHES=( "${FILESDIR}/${PN}-0.3-version.patch" )
 
 RDEPEND="!!<app-admin/puppet-5[emacs]"


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-07-15  7:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-30 13:07 [gentoo-commits] repo/gentoo:master commit in: app-emacs/puppet-mode/, app-emacs/puppet-mode/files/ Hans de Graaff
  -- strict thread matches above, loose matches on Subject: below --
2017-07-15  7:26 Hans de Graaff

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox