Eli Zaretskii <eliz@gnu.org> writes:

>> From: Philip Kaludercic <philipk@posteo.net>
>> Cc: dmitry@gutov.dev,  monnier@iro.umontreal.ca,  emacs-devel@gnu.org
>> Date: Mon, 08 May 2023 13:34:26 +0000
>> 
>> >> At least nadvice, cl-lib and cl-generic seem to be the odd ones (the 
>> >> built-in versions are higher, and the ELPA packages are supposed to be 
>> >> used as shims or backward compatibility wrappers). That looks like a bug.
>> 
>> I think you are right, I can extend my previous patch by a version check.
>
> Good idea, IMO.

OK, then this is my proposal: