Documentation: maintainers: Switch from repoman to pkgdev for scripts in use

At least those I still use.

Also replacing app-portage/mgorny-dev-scripts with dev-util/pkgdev.

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 13 insertions, 16 deletions

diff --git a/Documentation/maintainers/bump-from-set.sh b/Documentation/maintainers/bump-from-set.sh
index f92fa99306d..a1af16541c6 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -3,7 +3,7 @@
 # Requires:
 # app-portage/portage-utils
 # app-portage/gentoolkit-dev
-# app-portage/repoman
+# dev-util/pkgdev
 # Optional:
 # dev-vcs/git
 # app-portage/mgorny-dev-scripts
@@ -80,7 +80,7 @@ for cp in ${packages} ; do
 		ekeyword ~all ${destination} > /dev/null
 	fi
 
-	repoman manifest
+	pkgdev manifest
 
 	popd > /dev/null
 done
diff --git a/Documentation/maintainers/new/copy-to-main-tree.sh b/Documentation/maintainers/new/copy-to-main-tree.sh
index 828cdb33492..2c942e50795 100755
--- a/Documentation/maintainers/new/copy-to-main-tree.sh
+++ b/Documentation/maintainers/new/copy-to-main-tree.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
 # Requires:
-# app-portage/repoman
+# dev-util/pkgdev
 # Optional:
 # dev-vcs/git
-# app-portage/mgorny-dev-scripts
 # dev-util/pkgcheck
 
 . $(dirname "$0")/lib.sh
@@ -57,18 +56,18 @@ for cp in ${packages} ; do
 	ebuild="${pn}-${TARGETVERSION}.ebuild"
 
 	cp "${SOURCE_REPO}/${cp}/${ebuild}" .
-	repoman manifest
+	pkgdev manifest
 
 	popd > /dev/null
 
 done
 
-if [[ -d "${TARGET_REPO}/.git" ]] && hash git 2>/dev/null && hash pkgcommit 2>/dev/null; then
+if [[ -d "${TARGET_REPO}/.git" ]] && hash git 2>/dev/null && hash pkgdev 2>/dev/null; then
 	for cp in ${packages} ; do
 		pushd "${TARGET_REPO}/${cp}" > /dev/null
 
 		git add .
-		pkgcommit -sS . -m "${TARGETVERSION} version bump"
+		pkgdev commit . -m "${TARGETVERSION} version bump"
 
 		popd > /dev/null
 	done
diff --git a/Documentation/maintainers/new/lib.sh b/Documentation/maintainers/new/lib.sh
index 4250626f2f7..3fb03a0f560 100755
--- a/Documentation/maintainers/new/lib.sh
+++ b/Documentation/maintainers/new/lib.sh
@@ -3,9 +3,8 @@
 # Requires:
 # app-portage/portage-utils
 # app-portage/gentoolkit-dev
-# app-portage/mgorny-dev-scripts
-# app-portage/repoman
 # dev-util/pkgcheck
+# dev-util/pkgdev
 # sys-apps/coreutils
 # Optional:
 # dev-vcs/git
@@ -46,7 +45,7 @@ bump_packages_from_set() {
 			sed -e "/^KFMIN/s/=.*/=${KFMIN}/" -i ${destination}
 		fi
 
-		repoman manifest
+		pkgdev manifest
 
 		popd > /dev/null
 	done
@@ -89,7 +88,7 @@ commit_packages() {
 		pushd "${TARGET_REPO}/${cp}" > /dev/null
 
 		git add .
-		pkgcommit -sS . -m "${commitmsg}"
+		pkgdev commit . -m "${commitmsg}"
 
 		popd > /dev/null
 	done
diff --git a/Documentation/maintainers/new/set-based-remove.sh b/Documentation/maintainers/new/set-based-remove.sh
index 2039a589ef2..4f0da7ed784 100755
--- a/Documentation/maintainers/new/set-based-remove.sh
+++ b/Documentation/maintainers/new/set-based-remove.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
 # Requires:
-# app-portage/repoman
+# dev-util/pkgdev
 # Optional:
 # dev-vcs/git
-# app-portage/mgorny-dev-scripts
 # dev-util/pkgcheck
 
 . $(dirname "$0")/lib.sh
@@ -50,16 +49,16 @@ for package in ${packages} ; do
 	rm -f ${pn}-${VERSION}.ebuild
 	rm -f ${pn}-${VERSION}-r*.ebuild
 
-	repoman manifest
+	pkgdev manifest
 	popd > /dev/null
 done
 
-if [[ -d "${TARGET_REPO}/.git" ]] && hash git 2>/dev/null && hash pkgcommit 2>/dev/null; then
+if [[ -d "${TARGET_REPO}/.git" ]] && hash git 2>/dev/null && hash pkgdev 2>/dev/null; then
 	for cp in ${packages} ; do
 		pushd "${TARGET_REPO}/${cp}" > /dev/null
 
 		git add .
-		pkgcommit -sS . -m "drop ${VERSION}*"
+		pkgdev commit .
 
 		popd > /dev/null
 	done