Address RT#85406

Specifying 'meta-spec' in META_ADD or META_MERGE would remove all
given prereqs.

Changes

@@ -1,3 +1,8 @@
+6.67_04
+    Bug fixes
+    * Address RT#85406, where specifying 'meta-spec' in
+      META_[ADD|MERGE] would remove all prereqs (bingos)
+
 6.67_03 Wed Jun  5 22:03:28 BST 2013
     Doc Fixes
     * Document how to specify meta-spec in META_MERGE (bingos)

lib/ExtUtils/MM_Any.pm

@@ -1005,7 +1005,13 @@ sub metafile_data {
         };
     }
 
-    %meta = $self->_add_requirements_to_meta_v1_4( %meta );
+    {
+      my $vers = _metaspec_version( $meta_add, $meta_merge );
+      my $method = $vers =~ m!^2!
+               ? '_add_requirements_to_meta_v2'
+               : '_add_requirements_to_meta_v1_4';
+      %meta = $self->$method( %meta );
+    }
 
     while( my($key, $val) = each %$meta_add ) {
         $meta{$key} = $val;
@@ -1023,6 +1029,17 @@ sub metafile_data {
 
 =cut
 
+sub _metaspec_version {
+  my ( $meta_add, $meta_merge ) = @_;
+  return $meta_add->{'meta-spec'}->{version}
+    if defined $meta_add->{'meta-spec'}
+       and defined $meta_add->{'meta-spec'}->{version};
+  return $meta_merge->{'meta-spec'}->{version}
+    if defined $meta_merge->{'meta-spec'}
+       and  defined $meta_merge->{'meta-spec'}->{version};
+  return '1.4';
+}
+
 sub _add_requirements_to_meta_v1_4 {
     my ( $self, %meta ) = @_;