* lisp/emacs-lisp/nadvice.el: Make it a package separate from emacs.

* lisp/finder.el (finder-compile-keywords): Grab version from
package--builtin-versions when available.

lisp/emacs-lisp/nadvice.el

@@ -4,7 +4,6 @@
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: extensions, lisp, tools
-;; Package: emacs
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

lisp/finder.el

@@ -240,7 +240,8 @@ from; the default is `load-path'."
 			       (lm-synopsis))
 		  version  (lm-header "version")))
 	  (when summary
-	    (setq version (ignore-errors (version-to-list version)))
+	    (setq version (or (ignore-errors (version-to-list version))
+                              (alist-get package package--builtin-versions)))
 	    (setq entry (assq package package--builtins))
 	    (cond ((null entry)
 		   (push (cons package