Removed conflicts= support

Conflicts support in an abuild seems to be uneccessary feature.

Signed-off-by: Łukasz Jendrysik <scadu@yandex.com>

abuild.in

@@ -824,9 +824,6 @@ EOF
 	for i in $deps; do
 		echo "depend = $i" >> "$pkginfo"
 	done
-	for i in $conflicts; do
-		echo "conflict = $i" >> "$pkginfo"
-	done
 	for i in $provides; do
 		echo "provides = $i" >> "$pkginfo"
 	done
@@ -1531,7 +1528,7 @@ deptrace() {
 
 # build and install dependencies
 builddeps() {
-	local pkg= i= missing= conflicts=
+	local pkg= i= missing=
 	local hostdeps= builddeps= installed_hostdeps= installed_builddeps=
 	[ -n "$nodeps" ] && return 0
 	msg "Analyzing dependencies..."
@@ -1562,26 +1559,19 @@ builddeps() {
 	# find which deps are missing
 	for i in $builddeps; do
 		if [ "${i#\!}" != "$i" ]; then
-			$APK info --quiet --installed "${i#\!}" \
-				&& conflicts="$conflicts ${i#\!}"
+			$APK info --quiet --installed "${i#\!}"
 		elif ! deplist_has $i $installed_builddeps || [ -n "$upgrade" ]; then
 			missing="$missing $i"
 		fi
 	done
 	for i in $hostdeps; do
 		if [ "${i#\!}" != "$i" ]; then
-			$APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}" \
-				&& conflicts="$conflicts ${i#\!}"
+			$APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"
 		elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then
 			missing="$missing $i"
 		fi
 	done
 
-	if [ -n "$conflicts" ]; then
-		error "Conflicting package(s) installed:$conflicts"
-		return 1
-	fi
-
 	if [ -z "$install_deps" ] && [ -z "$recursive" ]; then
 		# if we dont have any missing deps we are done now
 		[ -z "$missing" ] && return 0