[nongnu] scratch/evil f4d3e47f13 2/4: evil-pkg.el: Remove file

[Stefan Monnier]

branch: scratch/evil
commit f4d3e47f131df40c5b355615e44f145034253553
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    evil-pkg.el: Remove file
    
    This file is auto-generated from headers in `evil.el` anyway.
    
    * evil.el: Synchronize metadata with what was in `evil-pkg.el`.
    * .gitignore: Add `evil-pkg.el`.
    * Makefile (VERSION): Fetch the info from `evil.el`.
    (elpa-pkg.el): New rule to (re)generate the file.
    (elpa): Use it (not sure if EASK needs it, tho).
---
 .gitignore  |  3 ++-
 Makefile    | 10 ++++++++--
 evil-pkg.el |  9 ---------
 evil.el     |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index beb3809244..c5b19d741a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,8 @@
 *.pg
 *.tp
 .depend
-evil-autoloads.el
+/evil-autoloads.el
+/evil-pkg.el
 test-results.txt
 typescript
 
diff --git a/Makefile b/Makefile
index c5621ac89b..59a2736aa8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SHELL = /bin/sh
 EMACS ?= emacs
 SED ?= sed
 FILES = $(filter-out evil-test-helpers.el evil-tests.el evil-pkg.el,$(wildcard 
evil*.el))
-VERSION := $(shell $(SED) -ne '/define-package/,$$p' evil-pkg.el | $(SED) -ne 
'/^\s*"[[:digit:]]\+\(\.[[:digit:]]\+\)*"\s*$$/ s/^.*"\(.*\)".*$$/\1/p')
+VERSION := $(shell $(SED) -ne 's/;; Version: *\(.*\)/\1/p' evil.el)
 PROFILER =
 DOC = doc
 TAG =
@@ -66,8 +66,14 @@ profiler:
 indent: clean
        $(EASK) run command indent
 
+evil-pkg.el: evil.el
+       $(EMACS) --batch -l package evil.el                \
+               --eval "(package-generate-description-file \
+                        (package-buffer-info)             \
+                        \"$@\")"
+
 # Create an ELPA package.
-elpa:
+elpa: evil-pkg.el
        $(EASK) package
 
 # Change the version using make VERSION=x.y.z
diff --git a/evil-pkg.el b/evil-pkg.el
deleted file mode 100644
index 8a170ae872..0000000000
--- a/evil-pkg.el
+++ /dev/null
@@ -1,9 +0,0 @@
-(define-package
-  "evil"
-  "1.15.0"
-  "Extensible vi layer"
-  '((emacs "24.1")
-    (goto-chg "1.6")
-    (cl-lib "0.5"))
-  :url "https://github.com/emacs-evil/evil";
-  :keywords '("emulations"))
diff --git a/evil.el b/evil.el
index e5d7e45991..009b25f9eb 100644
--- a/evil.el
+++ b/evil.el
@@ -1,4 +1,4 @@
-;;; evil.el --- Extensible vi layer  -*- lexical-binding: t; -*-
+;;; evil.el --- Extensible Vi layer for Emacs  -*- lexical-binding: t; -*-
 
 ;; The following list of authors was kept up to date until the beginning of
 ;; 2017, when evil moved under new maintainers. For authors since then, please