Merge branch 'markdown-via-upstream'

This topic branch removes our package definition of the 'markdown'
package because MSys2 already has one, before we could contribute ours.

The branch also contains the changes to pacman-mirror that were
necessary to actually remove the package from our Pacman repository.

This concludes the fix for

	git-for-windows/git#279

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

markdown/PKGBUILD

@@ -11,6 +11,8 @@
 #
 # - 'add' to add packages to the local mirror
 #
+# - 'remove' to make the next 'push' skip the given package(s)
+#
 # - 'push' to synchronize local changes (after calling `repo-add`) to the
 #   remote Pacman repository
 
@@ -25,12 +27,12 @@ export CURL_CA_BUNDLE
 
 mode=
 case "$1" in
-fetch|add|push)
+fetch|add|remove|push)
 	mode="$1"
 	shift
 	;;
 *)
-	die "Usage: $0 ( fetch | push | add <package>... )"
+	die "Usage: $0 ( fetch | push | ( add | remove ) <package>... )"
 	;;
 esac
 
@@ -174,13 +176,27 @@ add () { # <file>
 	done
 }
 
+remove () { # <package>...
+	test $# -gt 0 ||
+	die "What packages do you want to add?"
+
+	for package
+	do
+		for arch in $architectures
+		do
+			(cd "$(arch_dir $arch)" &&
+			 rm $package-*.pkg.tar.xz &&
+			 repo-remove git-for-windows.db.tar.xz $package)
+		done
+	done
+}
+
+
 update_local_package_databases () {
 	for arch in $architectures
 	do
 		(cd "$(arch_dir $arch)" &&
-		 repo-add --new git-for-windows.db.tar.xz \
-			*.pkg.tar.xz
-		)
+		 repo-add --new git-for-windows.db.tar.xz *.pkg.tar.xz)
 	done
 }
 
@@ -215,53 +231,55 @@ push () {
 	to_upload="$(printf "%s\n%s\n%s\n" "$old_list" "$old_list" "$new_list" |
 		sort | uniq -u)"
 
-	test -n "$to_upload" || {
+	test -n "$to_upload" || test "x$old_list" != "x$new_list" || {
 		echo "Nothing to be done" >&2
 		return
 	}
 
-	to_upload_basenames="$(echo "$to_upload" |
-		sed 's/-[0-9].*//' |
-		sort | uniq)"
-
 	db_version="$(db_version)"
 	next_db_version="$(next_db_version "$db_version")"
 
-	# Verify that the packages exist already
-	for basename in $to_upload_basenames
-	do
-		case " $(echo "$old_list" | tr '\n' ' ')" in
-		*" $basename"-[0-9]*)
-			;;
-		*)
-			package_exists $basename ||
-			die "The package $basename does not yet exist... Add it at https://bintray.com/git-for-windows/pacman/new/package?pkgPath="
-			;;
-		esac
-	done
+	test -z "$to_upload" || {
+		to_upload_basenames="$(echo "$to_upload" |
+			sed 's/-[0-9].*//' |
+			sort | uniq)"
 
-	for name in $to_upload
-	do
-		basename=${name%%-[0-9]*}
-		version=${name#$basename-}
-		for arch in $architectures
+		# Verify that the packages exist already
+		for basename in $to_upload_basenames
 		do
-			case "$name" in
-			mingw-w64-*)
-				filename=$name-any.pkg.tar.xz
+			case " $(echo "$old_list" | tr '\n' ' ')" in
+			*" $basename"-[0-9]*)
 				;;
 			*)
-				filename=$name-$arch.pkg.tar.xz
+				package_exists $basename ||
+				die "The package $basename does not yet exist... Add it at https://bintray.com/git-for-windows/pacman/new/package?pkgPath="
 				;;
 			esac
-			(cd "$(arch_dir $arch)" &&
-			 if test -f $filename
-			 then
-				upload $basename $version $arch $filename
-			 fi) || exit
 		done
-		publish $basename $version
-	done
+
+		for name in $to_upload
+		do
+			basename=${name%%-[0-9]*}
+			version=${name#$basename-}
+			for arch in $architectures
+			do
+				case "$name" in
+				mingw-w64-*)
+					filename=$name-any.pkg.tar.xz
+					;;
+				*)
+					filename=$name-$arch.pkg.tar.xz
+					;;
+				esac
+				(cd "$(arch_dir $arch)" &&
+				 if test -f $filename
+				 then
+					upload $basename $version $arch $filename
+				 fi) || exit
+			done
+			publish $basename $version
+		done
+	}
 
 	delete_version package-database "$db_version"