Merge remote-tracking branch 'upstream/master' into track-upstream

* upstream/master:
  Add `kubed` recipe (dimitri#2958)
  Move some packages from `git` to `github` type (dimitri#2957)
  Update howm.rcp (dimitri#2956)
  Add recipes for ellama and its dependencies: llm and plz (dimitri#2955)
  Update recipe for magit: generate only info docs (dimitri#2954)
  Switch location for `adoc-mode` (dimitri#2953)
  Update location for `scratch` recipe (dimitri#2952)
  Change URL for profile-dotemacs recipe (dimitri#2951)
  Fixed Mastodon recipe (dimitri#2950)
  Add a recipe for helm-sx (dimitri#2949)

recipes/ac-R.rcp

@@ -1,4 +1,6 @@
 (:name ac-R
        :description "Auto-completion-mode support for R"
-       :type git
-       :url "https://github.com/mlf176f2/ac-R")
+       :type github
+       :pkgname "mlf176f2/ac-R"
+       :depends (ess)
+       )

recipes/adoc-mode.rcp

@@ -1,6 +1,6 @@
 (:name adoc-mode
-       :website "https://github.com/sensorflo/adoc-mode/wiki"
+       :website "https://github.com/bbatsov/adoc-mode/wiki"
        :description "A major-mode for editing AsciiDoc files in Emacs."
        :type github
-       :pkgname "sensorflo/adoc-mode"
+       :pkgname "bbatsov/adoc-mode"
        :depends markup-faces)

recipes/durendal.rcp

@@ -1,4 +1,6 @@
 (:name durendal
        :website "https://github.com/technomancy/durendal"
        :description "A bucket of Emacs tricks for Clojure."
-       :type git :url "https://github.com/technomancy/durendal.git")
+       :type github
+       :pkgname "technomancy/durendal"
+       )

recipes/ellama.rcp

@@ -0,0 +1,6 @@
+(:name ellama
+       :description "Tool for interacting with LLMs"
+       :minimum-emacs-version "28.1"
+       :type github
+       :pkgname "s-kostyaev/ellama"
+       :depends (llm spinner compat))

recipes/flymake-html-validator.rcp

@@ -1,6 +1,6 @@
 (:name "flymake-html-validator"
        :description "Make flymake work with Validator.nu."
-       :type git
-       :url "https://github.com/dwdreisigmeyer/flymake-html-validator"
+       :type github
+       :pkgname "dwdreisigmeyer/flymake-html-validator"
        :features "flymake-html-validator"
        :prepare (setq validator-script (concat el-get-dir "flymake-html-validator")))

recipes/helm-sx.rcp

@@ -0,0 +1,5 @@
+(:name helm-sx
+       :description "Helm interface for sx.el - Stack Exchange client"
+       :type github
+       :pkgname "813gan/helm-sx.el"
+       :depends (sx helm))

recipes/highlight-indentation-guides.rcp

@@ -1,4 +1,5 @@
 (:name highlight-indentation-guides
        :description "This minor mode highlights indentation levels via font-lock"
-       :type git
-       :url "https://github.com/DarthFennec/highlight-indent-guides.git")
+       :type github
+       :pkgname "DarthFennec/highlight-indent-guides"
+       )

recipes/highlight-indentation.rcp

@@ -1,4 +1,5 @@
 (:name highlight-indentation
        :description "Function for highlighting indentation"
-       :type git
-       :url "https://github.com/antonj/Highlight-Indentation-for-Emacs")
+       :type github
+       :pkgname "antonj/Highlight-Indentation-for-Emacs"
+       )

recipes/hl-tags-mode.rcp

@@ -1,6 +1,6 @@
 (:name hl-tags-mode
        :website "http://www.reddit.com/r/emacs/comments/ha7l9/html_matching_tag_highlighting/"
        :description "if the cursor is inside of a '<div ....>' tag, it will highlight it and the corresponding '</div>' tag"
-       :type git
-       :url "https://github.com/deactivated/hl-tags-mode"
+       :type github
+       :pkgname "deactivated/hl-tags-mode"
        :features hl-tags-mode)

recipes/howm.rcp

@@ -1,7 +1,6 @@
 (:name howm
-       :website "http://howm.sourceforge.jp/"
+       :website "https://kaorahi.github.io/howm/"
        :description "Write fragmentarily and read collectively."
-       :type http-tar
-       :options ("xzf")
-       :url "http://howm.sourceforge.jp/a/howm-1.4.4.tar.gz"
+       :type github
+       :pkgname "kaorahi/howm"
        :build `(("./configure" ,(concat "--with-emacs=" el-get-emacs)) ("make")))

recipes/ioccur.rcp

@@ -1,5 +1,5 @@
 (:name ioccur
        :description "Incremental occur."
-       :type git
-       :url "https://github.com/thierryvolpiatto/ioccur"
+       :type github
+       :pkgname "thierryvolpiatto/ioccur"
        :features ioccur)

recipes/kubed.rcp

@@ -0,0 +1,7 @@
+(:name kubed
+       :description "A python refactoring library"
+       :type github
+       :pkgname "eshelyaron/kubed"
+       :minimum-emacs-version "29.1"
+       :website "https://eshelyaron.com/kubed.html"
+       )

recipes/llm.rcp

@@ -0,0 +1,6 @@
+(:name llm
+       :description "Interface to pluggable llm backends"
+       :minimum-emacs-version "28.1"
+       :type github
+       :pkgname "ahyatt/llm"
+       :depends (plz))

recipes/magit.rcp

@@ -15,7 +15,7 @@
        ;; handle compilation and autoloads on its own.  Create an
        ;; empty autoloads file because magit.el explicitly checks for
        ;; a file of that name.
-       :build `(("make" ,(format "EMACSBIN=%s" el-get-emacs) "docs")
+       :build `(("make" ,(format "EMACSBIN=%s" el-get-emacs) "info")
                 ("touch" "lisp/magit-autoloads.el"))
        :build/berkeley-unix `(("gmake" ,(format "EMACSBIN=%s" el-get-emacs) "docs")
                               ("touch" "lisp/magit-autoloads.el"))

recipes/mastodon.rcp

@@ -1,6 +1,6 @@
 (:name mastodon
-       :website "https://github.com/jdenen/mastodon.el"
+       :website "https://codeberg.org/martianh/mastodon.el"
        :description "Emacs client for Mastodon"
-       :type github
-       :pkgname "jdenen/mastodon.el"
+       :type git
+       :url "https://codeberg.org/martianh/mastodon.el.git"
        :load-path ("./lisp"))

recipes/mew.rcp

@@ -1,7 +1,7 @@
 (:name mew
        :description "Mew is a mail reader for Emacs"
-       :type git
-       :url "https://github.com/kazu-yamamoto/Mew.git"
+       :type github
+       :pkgname "kazu-yamamoto/Mew"
        ;;; To use Mew S/MIME support, manual configuration of
        ;;; pinentry-program entry on ~/.gnupg/gpg-agent.conf is required.
        ;;; pinentry-program for mew is (concat el-get-dir "mew/bin/mew-pinentry")

recipes/plz.rcp

@@ -0,0 +1,6 @@
+(:name plz
+       :description "An HTTP library that uses curl as a backend"
+       :minimum-emacs-version "27.1"
+       :type github
+       :pkgname "alphapapa/plz.el"
+       :depends ())

recipes/pony-mode.rcp

@@ -1,6 +1,7 @@
 (:name pony-mode
        :website "https://github.com/davidmiller/pony-mode"
        :description "A Django mode for Emacs."
-       :type git
+       :type github
+       :pkgname "davidmiller/pony-mode"
        :load-path "src"
-       :url "https://github.com/davidmiller/pony-mode")
+       )

recipes/profile-dotemacs.rcp

@@ -1,4 +1,4 @@
 (:name profile-dotemacs
-       :type http
-       :url "http://www.randomsample.de/profile-dotemacs.el"
+       :type github
+       :pkgname "raxod502/profile-dotemacs"
        :description "profiles your .emacs")

recipes/rope.rcp

@@ -3,5 +3,6 @@
        :post-init
        ;; Add to PYTHONPATH directly as it is used in ropemacs and traad
        (el-get-envpath-prepend "PYTHONPATH" default-directory)
-       :type git
-       :url "https://github.com/python-rope/rope.git")
+       :type github
+       :pkgname "python-rope/rope"
+       )

recipes/ropemacs.rcp

@@ -5,5 +5,6 @@
          (unless (boundp 'pymacs-load-path) (setq pymacs-load-path nil))
          (add-to-list 'pymacs-load-path default-directory))
        :depends (rope ropemode pymacs)
-       :type git
-       :url "https://github.com/python-rope/ropemacs")
+       :type github
+       :pkgname "python-rope/ropemacs"
+       )

recipes/ropemode.rcp

@@ -4,5 +4,6 @@
        (progn
          (unless (boundp 'pymacs-load-path) (setq pymacs-load-path nil))
          (add-to-list 'pymacs-load-path default-directory))
-       :type git
-       :url "https://github.com/python-rope/ropemode")
+       :type github
+       :pkgname "python-rope/ropemode"
+       )

recipes/scpaste.rcp

@@ -1,5 +1,6 @@
 (:name scpaste
        :website "http://www.emacswiki.org/cgi-bin/wiki/SCPaste"
        :description "Paste to the web via scp."
-       :type git
-       :url "https://github.com/technomancy/scpaste.git")
+       :type github
+       :pkgname "technomancy/scpaste"
+       )

recipes/scratch.rcp

@@ -1,7 +1,7 @@
 (:name scratch
        :description "Mode-specific scratch buffers"
-       :type github
-       :pkgname "cbbrowne/scratch-el"
+       :type git
+       :url "https://codeberg.org/emacs-weirdware/scratch"
        :info "."
        :build (("make"))
        :load-path ".")

recipes/shadow.rcp

@@ -1,6 +1,7 @@
 (:name shadow
        :description "That's not the file. That's shadow."
-       :type git :url "https://github.com/mooz/shadow.el.git"
+       :type github
+       :pkgname "mooz/shadow.el"
        :features shadow
        :post-init (progn
                     (add-hook 'find-file-hooks 'shadow-on-find-file)