[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/, Documentation/maintainers/new/
commit: a718d41e6ee4e2c564cf74fe144da0171c86b767
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 19 13:58:04 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jul 19 14:05:02 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a718d41e
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 gentoo.org>
Documentation/maintainers/bump-from-set.sh | 4 ++--
Documentation/maintainers/new/copy-to-main-tree.sh | 9 -
Documentation/maintainers/new/lib.sh | 7 +++
Documentation/maintainers/new/set-based-remove.sh | 9 -
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/Documentation/maintainers/bump-from-set.sh
b/Documentation/maintainers/bump-from-set.sh
index f92fa99306..a1af16541c 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 828cdb3349..2c942e5079 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 4250626f2f..3fb03a0f56 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 2039a589ef..4f0da7ed78 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
[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/, Documentation/maintainers/new/
commit: b972d60d06ae72f9e946a1a0e7f3faa211b2df4c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 22 16:22:35 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 22 17:17:34 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b972d60d
Documentation: maintainers *.sh: Update dependencies
Signed-off-by: Andreas Sturmlechner gentoo.org>
Documentation/maintainers/bump-from-set.sh | 5 -
Documentation/maintainers/new/copy-to-main-tree.sh | 2 ++
Documentation/maintainers/new/lib.sh | 5 -
Documentation/maintainers/new/set-based-remove.sh | 2 ++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Documentation/maintainers/bump-from-set.sh
b/Documentation/maintainers/bump-from-set.sh
index f109233547..ecc3b3bdc3 100755
--- a/Documentation/maintainers/bump-from-set.sh
+++ b/Documentation/maintainers/bump-from-set.sh
@@ -1,6 +1,9 @@
#!/bin/sh
-# requires app-portage/portage-utils and app-portage/gentoolkit-dev
+# Requires:
+# app-portage/portage-utils
+# app-portage/gentoolkit-dev
+# app-portage/repoman
: ${PORTDIR:="$(pwd)"}
diff --git a/Documentation/maintainers/new/copy-to-main-tree.sh
b/Documentation/maintainers/new/copy-to-main-tree.sh
index 9b93379b5b..da57010723 100755
--- a/Documentation/maintainers/new/copy-to-main-tree.sh
+++ b/Documentation/maintainers/new/copy-to-main-tree.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+# Requires app-portage/repoman
+
. $(dirname "$0")/lib.sh
: ${SOURCE_REPO:="$(realpath $(dirname $0)/../../../)"}
diff --git a/Documentation/maintainers/new/lib.sh
b/Documentation/maintainers/new/lib.sh
index abafaf6c4b..9ecfed1cc8 100755
--- a/Documentation/maintainers/new/lib.sh
+++ b/Documentation/maintainers/new/lib.sh
@@ -1,6 +1,9 @@
#!/bin/bash
-# requires app-portage/portage-utils and app-portage/gentoolkit-dev
+# Requires:
+# app-portage/portage-utils
+# app-portage/gentoolkit-dev
+# app-portage/repoman
: ${SOURCE_REPO:="$(realpath $(dirname $0)/../../../)"}
diff --git a/Documentation/maintainers/new/set-based-remove.sh
b/Documentation/maintainers/new/set-based-remove.sh
index de485e1979..8922b7c3b8 100755
--- a/Documentation/maintainers/new/set-based-remove.sh
+++ b/Documentation/maintainers/new/set-based-remove.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+# Requires app-portage/repoman
+
. $(dirname "$0")/lib.sh
: ${TARGET_REPO:="$(pwd)"}
[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/, Documentation/maintainers/new/
commit: e23d7a9f14e2efb0007ce40d3b015a3fe97505d8
Author: Michael Palimaka gentoo org>
AuthorDate: Tue Oct 13 13:20:50 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Oct 13 13:21:46 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e23d7a9f
Documentation: start reorganising new maintainer scripts
Documentation/maintainers/new/copy-to-main-tree.sh | 56 ++
.../maintainers/new/diff-between-versions.sh | 48 +++
Documentation/maintainers/new/lib.sh | 21
.../{drop-from-set.sh => new/set-based-remove.sh} | 25 --
4 files changed, 133 insertions(+), 17 deletions(-)
diff --git a/Documentation/maintainers/new/copy-to-main-tree.sh
b/Documentation/maintainers/new/copy-to-main-tree.sh
new file mode 100755
index 000..9b93379
--- /dev/null
+++ b/Documentation/maintainers/new/copy-to-main-tree.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+. $(dirname "$0")/lib.sh
+
+: ${SOURCE_REPO:="$(realpath $(dirname $0)/../../../)"}
+: ${TARGET_REPO:="$(pwd)"}
+
+help() {
+ echo Simple set-based ebuild copier.
+ echo
+ echo Given a set in the source repository, copies all ebuilds with the
specified
+ echo version into the target repository.
+ echo
+ echo Reads TARGET_REPO from your enviroment, defaulting to the current
directory.
+ echo
+ echo Usage: copy-to-main-tree.sh SETNAME TARGETVERSION
+ echo Example: copy-to-main-tree.sh kde-frameworks-5.15 5.15.0
+ exit 0
+}
+
+
+SETNAME="$1"
+TARGETVERSION="$2"
+
+if [[ $1 == "--help" ]] ; then
+ help
+fi
+
+if [[ -z "${SETNAME}" || -z "${TARGETVERSION}" ]] ; then
+ echo ERROR: Not enough arguments
+ echo
+ help
+fi
+
+packages=$(get_package_list_from_set ${SETNAME})
+
+for cp in ${packages} ; do
+ trap "echo Exited without finishing!; exit;" SIGINT SIGTERM
+
+ target_dir="${TARGET_REPO}/${cp}"
+
+ if [[ ! -d "${target_dir}" ]] ; then
+ mkdir "${target_dir}"
+ fi
+
+ pushd "${target_dir}" > /dev/null
+
+ pn=$(basename $(pwd))
+ ebuild="${pn}-${TARGETVERSION}.ebuild"
+
+ cp "${SOURCE_REPO}/${cp}/${ebuild}" .
+ repoman manifest
+
+ popd > /dev/null
+
+done
diff --git a/Documentation/maintainers/new/diff-between-versions.sh
b/Documentation/maintainers/new/diff-between-versions.sh
new file mode 100755
index 000..00c4a4b
--- /dev/null
+++ b/Documentation/maintainers/new/diff-between-versions.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+. $(dirname "$0")/lib.sh
+
+: ${SOURCE_REPO:="$(realpath $(dirname $0)/../../../)"}
+: ${TARGET_REPO:="$(pwd)"}
+
+help() {
+ echo Simple set-based ebuild differ.
+ echo
+ echo Given a set in the source repository, prints the diff between two
versions
+ echo of ebuilds in the target repository.
+ echo
+ echo Reads TARGET_REPO from your enviroment, defaulting to the current
directory.
+ echo
+ echo Usage: diff-between-versions.sh SETNAME VERSION1 VERSION2
+ echo Example: diff-between-versions.sh kde-frameworks-5.15 5.14.0 5.15.0
+ exit 0
+}
+
+
+SETNAME="$1"
+VERSION1="$2"
+VERSION2="$3"
+
+if [[ $1 == "--help" ]] ; then
+ help
+fi
+
+if [[ -z "${SETNAME}" || -z "${VERSION1}" || -z "${VERSION2}" ]] ; then
+ echo ERROR: Not enough arguments
+ echo
+ help
+fi
+
+packages=$(get_package_list_from_set ${SETNAME})
+
+for cp in ${packages} ; do
+ trap "echo Exited without finishing!; exit;" SIGINT SIGTERM
+
+ target_dir="${TARGET_REPO}/${cp}"
+
+ pushd "${TARGET_REPO}/${cp}" > /dev/null
+ pn=$(basename $(pwd))
+ diff -u "${pn}-${VERSION1}.ebuild" "${pn}-${VERSION2}.ebuild"
+
+ popd > /dev/null
+done
diff --git a/Documentation/maintainers/new/lib.sh
b/Documentation/maintainers/new/lib.sh
new file mode 100755
index 000..b336399
--- /dev/null
+++ b/Documentation/maintainers/new/lib.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# requires app-portage/portage-utils and app-portage/gentoolkit-dev
+
+: ${SOURCE_REPO:="$(realpath $(dirname $0)/../../../)"}
+: ${TARGET_REPO:="$(pwd)"}
+
+get_package_list_from_set() {
+ local set="${1}"
+
+ for entry in $(grep -v ^[#@] "${SOURCE_REPO}/sets/${set}") ; do
+ echo $(qatom ${entry} | cut -d " " -f 1-2 | tr " " "/")
+ done
+}
+
+get_main_tree_keyword() {
+ local portdir="$(portageq get_repo_path / gentoo)"
+ local cp="${1}"
+
+ echo $(sed -ne 's/^KEYWORDS="\(.*\)"/\1/p' "$(ls
${portdir}/${cp}/*.ebuild | sort | tail -n 1)")
+}
diff --git a/Documentation/maintainers/drop-from-set.sh
b/Documentation/maintainers/new/set-based-remove.sh
similarity index 51%
rename from Documentation/maintainers/drop-from-set.sh
rename to Documentation/maintainers/new/set-based-remove.sh
index 3267811..de485e1 100755
--- a/Documentation/maintainers/drop-from-set.sh
+++
