From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/, dev-ml/merlin/files/
Date: Fri, 22 Apr 2022 23:49:18 +0000 (UTC) [thread overview]
Message-ID: <1650671353.138d34ee4245f1ee331d641813cf856a6506001f.xgqt@gentoo> (raw)
commit: 138d34ee4245f1ee331d641813cf856a6506001f
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 23:47:57 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 23:49:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138d34ee
dev-ml/merlin: fix 50merlin-gentoo.el
SLITELISP -> SITELISP
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-ml/merlin/files/50merlin-gentoo.el | 2 +-
dev-ml/merlin/{merlin-3.4.2-r1.ebuild => merlin-3.4.2-r2.ebuild} | 2 +-
dev-ml/merlin/{merlin-4.2.ebuild => merlin-4.2-r1.ebuild} | 2 +-
dev-ml/merlin/{merlin-4.3.1.ebuild => merlin-4.3.1-r1.ebuild} | 2 +-
dev-ml/merlin/{merlin-4.4.ebuild => merlin-4.4-r1.ebuild} | 0
dev-ml/merlin/{merlin-4.5.ebuild => merlin-4.5-r1.ebuild} | 0
6 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-ml/merlin/files/50merlin-gentoo.el b/dev-ml/merlin/files/50merlin-gentoo.el
index fbbbf2019411..1da1f56402a5 100644
--- a/dev-ml/merlin/files/50merlin-gentoo.el
+++ b/dev-ml/merlin/files/50merlin-gentoo.el
@@ -1,4 +1,4 @@
-(push "@SLITELISP@" load-path) ; directory containing merlin.el
+(add-to-list 'load-path "@SITELISP@")
(autoload 'merlin-mode "merlin" "Merlin mode" t)
(add-hook 'tuareg-mode-hook 'merlin-mode)
(add-hook 'caml-mode-hook 'merlin-mode)
diff --git a/dev-ml/merlin/merlin-3.4.2-r1.ebuild b/dev-ml/merlin/merlin-3.4.2-r2.ebuild
similarity index 97%
rename from dev-ml/merlin/merlin-3.4.2-r1.ebuild
rename to dev-ml/merlin/merlin-3.4.2-r2.ebuild
index d14be4876eb1..bf15b8d8aaef 100644
--- a/dev-ml/merlin/merlin-3.4.2-r1.ebuild
+++ b/dev-ml/merlin/merlin-3.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-ml/merlin/merlin-4.2.ebuild b/dev-ml/merlin/merlin-4.2-r1.ebuild
similarity index 97%
rename from dev-ml/merlin/merlin-4.2.ebuild
rename to dev-ml/merlin/merlin-4.2-r1.ebuild
index ba04028ea42c..d6a09238ac2f 100644
--- a/dev-ml/merlin/merlin-4.2.ebuild
+++ b/dev-ml/merlin/merlin-4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-ml/merlin/merlin-4.3.1.ebuild b/dev-ml/merlin/merlin-4.3.1-r1.ebuild
similarity index 97%
rename from dev-ml/merlin/merlin-4.3.1.ebuild
rename to dev-ml/merlin/merlin-4.3.1-r1.ebuild
index d269247a3728..0ddc350e9d9b 100644
--- a/dev-ml/merlin/merlin-4.3.1.ebuild
+++ b/dev-ml/merlin/merlin-4.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-ml/merlin/merlin-4.4.ebuild b/dev-ml/merlin/merlin-4.4-r1.ebuild
similarity index 100%
rename from dev-ml/merlin/merlin-4.4.ebuild
rename to dev-ml/merlin/merlin-4.4-r1.ebuild
diff --git a/dev-ml/merlin/merlin-4.5.ebuild b/dev-ml/merlin/merlin-4.5-r1.ebuild
similarity index 100%
rename from dev-ml/merlin/merlin-4.5.ebuild
rename to dev-ml/merlin/merlin-4.5-r1.ebuild
next reply other threads:[~2022-04-22 23:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-22 23:49 Maciej Barć [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-14 20:31 [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/, dev-ml/merlin/files/ Alfredo Tupone
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=1650671353.138d34ee4245f1ee331d641813cf856a6506001f.xgqt@gentoo \
--to=xgqt@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