summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml/merlin')
-rw-r--r--dev-ml/merlin/files/50merlin-gentoo.el2
-rw-r--r--dev-ml/merlin/merlin-3.4.2-r2.ebuild (renamed from dev-ml/merlin/merlin-3.4.2-r1.ebuild)2
-rw-r--r--dev-ml/merlin/merlin-4.2-r1.ebuild (renamed from dev-ml/merlin/merlin-4.2.ebuild)2
-rw-r--r--dev-ml/merlin/merlin-4.3.1-r1.ebuild (renamed from dev-ml/merlin/merlin-4.3.1.ebuild)2
-rw-r--r--dev-ml/merlin/merlin-4.4-r1.ebuild (renamed from dev-ml/merlin/merlin-4.4.ebuild)0
-rw-r--r--dev-ml/merlin/merlin-4.5-r1.ebuild (renamed from dev-ml/merlin/merlin-4.5.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
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
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
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
index 2975d266d475..2975d266d475 100644
--- a/dev-ml/merlin/merlin-4.4.ebuild
+++ b/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
index 52caa02ed44d..52caa02ed44d 100644
--- a/dev-ml/merlin/merlin-4.5.ebuild
+++ b/dev-ml/merlin/merlin-4.5-r1.ebuild