public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/puppet-mode/, app-emacs/puppet-mode/files/
Date: Sat, 15 Jul 2017 07:26:35 +0000 (UTC)	[thread overview]
Message-ID: <1500103241.ad816482ab577cdf66c6a7bdc19d07ffa58142b6.graaff@gentoo> (raw)

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]"


             reply	other threads:[~2017-07-15  7:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-15  7:26 Hans de Graaff [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-06-30 13:07 [gentoo-commits] repo/gentoo:master commit in: app-emacs/puppet-mode/, app-emacs/puppet-mode/files/ Hans de Graaff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1500103241.ad816482ab577cdf66c6a7bdc19d07ffa58142b6.graaff@gentoo \
    --to=graaff@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox