pkg{bump,pkgdiff-mg}: Set PKGBUMPING to PVR

Set PKGBUMPING to PVR, to avoid removing Manifest entries for other
ebuild versions than the one being bumped.  Thanks to Arsen
for the suggestion.

Signed-off-by: Michał Górny <[email protected]>

Author: mgorny

README.rst

@@ -79,7 +79,7 @@ plan on using it multiple times.
 
 pkgdiff-mg
 ----------
-Dependencies: portage
+Dependencies: portage, pkgcore
 
 Calls ``ebuild(1)`` to extract archives for two specified ebuilds,
 and then diffs the result.  Does not handle ebuilds unpacking multiple
@@ -98,7 +98,7 @@ only the build system files::
 
 pkgbump
 -------
-Dependencies: portage, gentoolkit (ekeyword), git
+Dependencies: portage, gentoolkit (ekeyword), git, pkgcore
 
 Copies ebuild for a version bump, dropping keywords, updating Manifest
 and running pkgdiff-mg_ to compare archives.  Typical usage::

pkgbump

@@ -1,5 +1,19 @@
 #!/usr/bin/env bash
 
+for arg; do
+	if [[ ${arg} != *.ebuild ]]; then
+		echo "Incorrect filename: ${arg}"
+		exit 1
+	fi
+
+	filename=${arg##*/}
+	version=$(patom -F '%{fullver}' "=category/${arg%.ebuild}")
+	if [[ -z ${version} ]]; then
+		echo "Incorrect filename: ${arg}"
+		exit 1
+	fi
+done
+
 set -e -x
 
 scriptdir=${BASH_SOURCE%/*}
@@ -10,7 +24,7 @@ if grep -q "^PYTHON_COMPAT" "${2}" && type -P gpy-impl &>/dev/null; then
 	gpy-impl "${2}" -python3_{8..9} || :
 fi
 # tell ebuilds we don't want everything
-export PKGBUMPING=1
+export PKGBUMPING=${version}
 GENTOO_MIRRORS= ebuild "${2}" manifest
 [[ ! -f Manifest ]] || git add Manifest
 git add "${2}"

pkgdiff-mg

@@ -31,16 +31,17 @@ cat1=$(get_category "${1}")
 cat2=$(get_category "${2}")
 fn1=${1##*/}
 fn2=${2##*/}
+ver1=$(patom -F '%{fullver}' "=${cat1}/${fn1%.ebuild}")
+ver2=$(patom -F '%{fullver}' "=${cat2}/${fn2%.ebuild}")
 
 export PORTAGE_TMPDIR="${TMPDIR:-/tmp}"/mgorny-dev-scripts
 export USE="${USE} test"
 # use noauto to skip pkg_setup
 export FEATURES="${FEATURES} noauto"
 # tell ebuilds we don't want everything
-export PKGBUMPING=1
 mkdir -p "${PORTAGE_TMPDIR}"
-ebuild "${1}" unpack
-ebuild "${2}" unpack
+PKGBUMPING=${ver1} ebuild "${1}" unpack
+PKGBUMPING=${ver2} ebuild "${2}" unpack
 s1=$(sed -nr 's/^declare -x S="(.*)"/\1/p' "${PORTAGE_TMPDIR}"/portage/${cat1}/${fn1%.ebuild}/temp/environment)
 s2=$(sed -nr 's/^declare -x S="(.*)"/\1/p' "${PORTAGE_TMPDIR}"/portage/${cat2}/${fn2%.ebuild}/temp/environment)