Revert "build: auto-generate CONFLICTS for package variants sharing PROVIDES"

This reverts commit 6d5c71f.

Since we have recovered the previous state regarding package variants
sharing PROVIDES and how package manager(apk) handle packages conflict
in general, we no longer need to auto-generate CONFLICTS for them.

VARIANTs that share PROVIDES can be installed together as long as they
do not share files, which is the expected behavior.

Defining explicit CONFLICTS to avoid simultaneous selection on menuconfig
should be the preferred way to allow packagers decide whether packages
must conflict or not.

Now, apk package manager will apply the same conflicts as
kconfig/menuconfig based on the CONFLICTS field if defined, not because
of some PROVIDES field definition pattern.
(apk internally uses provides field for conflicts at package level
but we abtract that using our specific CONFLICTS field for that purpose)

Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com>

Author: map-b

scripts/package-metadata.pl

@@ -255,52 +255,6 @@ sub mconf_conflicts {
 	return $res;
 }
 
-sub add_implicit_provides_conflicts {
-	foreach my $provide (keys %vpackage) {
-		next if $provide =~ /-any$/;
-
-		my $providers = $vpackage{$provide};
-		next unless $providers && @$providers > 1;
-
-		my $default_pkg;
-		my @non_defaults;
-
-		foreach my $pkg (@$providers) {
-			next if $pkg->{buildonly};
-			if ($pkg->{variant_default}) {
-				$default_pkg = $pkg;
-			} else {
-				push @non_defaults, $pkg;
-			}
-		}
-
-		next unless $default_pkg && @non_defaults;
-
-		my %existing_conflicts;
-		if ($default_pkg->{conflicts}) {
-			%existing_conflicts = map { $_ => 1 } @{$default_pkg->{conflicts}};
-		}
-
-		foreach my $non_default (@non_defaults) {
-			next if $existing_conflicts{$non_default->{name}};
-
-			my $already_conflicts = 0;
-			if ($non_default->{conflicts}) {
-				foreach my $c (@{$non_default->{conflicts}}) {
-					if ($c eq $default_pkg->{name}) {
-						$already_conflicts = 1;
-						last;
-					}
-				}
-			}
-			next if $already_conflicts;
-
-			$default_pkg->{conflicts} ||= [];
-			push @{$default_pkg->{conflicts}}, $non_default->{name};
-		}
-	}
-}
-
 sub print_package_config_category($) {
 	my $cat = shift;
 	my %menus;
@@ -396,7 +350,6 @@ ()
 
 sub gen_package_config() {
 	parse_package_metadata($ARGV[0]) or exit 1;
-	add_implicit_provides_conflicts();
 	print "menuconfig IMAGEOPT\n\tbool \"Image configuration\"\n\tdefault n\n";
 	print "source \"package/*/image-config.in\"\n";
 	if (scalar glob "package/feeds/*/*/image-config.in") {