From e3e860ca94864eff9c9efe9d8b5aae9cb3474161 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 1 Jan 2024 01:41:07 -0700 Subject: [PATCH 1/7] autobuild4: new, 4.0.0 --- app-devel/autobuild4/autobuild/beyond.stage2 | 2 ++ app-devel/autobuild4/autobuild/defines | 9 +++++++++ app-devel/autobuild4/spec | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 app-devel/autobuild4/autobuild/beyond.stage2 create mode 100644 app-devel/autobuild4/autobuild/defines create mode 100644 app-devel/autobuild4/spec diff --git a/app-devel/autobuild4/autobuild/beyond.stage2 b/app-devel/autobuild4/autobuild/beyond.stage2 new file mode 100644 index 00000000000..870d55681bf --- /dev/null +++ b/app-devel/autobuild4/autobuild/beyond.stage2 @@ -0,0 +1,2 @@ +abinfo "Drop /etc/autobuild/ab3cfg.sh for stage2 ..." +rm -v "$PKGDIR"/etc/autobuild/ab3cfg.sh diff --git a/app-devel/autobuild4/autobuild/defines b/app-devel/autobuild4/autobuild/defines new file mode 100644 index 00000000000..91aa6e78e7a --- /dev/null +++ b/app-devel/autobuild4/autobuild/defines @@ -0,0 +1,9 @@ +PKGNAME=autobuild4 +PKGSEC=devel +PKGDES="Multi-backend and extensible packaging toolkit" +PKGDEP="autoconf autoconf-archive automake apt dpkg bash config coreutils \ + spdx-licenses" +BUILDDEP="nlohmann-json" +PKGRECOM="cargo-audit" + +VER_NONE=1 diff --git a/app-devel/autobuild4/spec b/app-devel/autobuild4/spec new file mode 100644 index 00000000000..8ebf7753eb7 --- /dev/null +++ b/app-devel/autobuild4/spec @@ -0,0 +1,4 @@ +VER=4.0.0 +SRCS="git::commit=tags/v$VER::https://github.com/AOSC-Dev/autobuild4" +CHKSUMS="SKIP" +CHKUPDATE="anitya::id=226987" From e9a3e39209c8b141e48b9bc203ffeb49e64f8eb0 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 1 Jan 2024 02:32:11 -0700 Subject: [PATCH 2/7] autobuild4: use alternatives --- app-devel/autobuild4/autobuild/alternatives | 1 + app-devel/autobuild4/autobuild/beyond | 2 ++ app-devel/autobuild4/autobuild/beyond.stage2 | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 app-devel/autobuild4/autobuild/alternatives create mode 100644 app-devel/autobuild4/autobuild/beyond delete mode 100644 app-devel/autobuild4/autobuild/beyond.stage2 diff --git a/app-devel/autobuild4/autobuild/alternatives b/app-devel/autobuild4/autobuild/alternatives new file mode 100644 index 00000000000..b48affaae6c --- /dev/null +++ b/app-devel/autobuild4/autobuild/alternatives @@ -0,0 +1 @@ +alternative /usr/bin/autobuild /usr/lib/autobuild4/autobuild 50 diff --git a/app-devel/autobuild4/autobuild/beyond b/app-devel/autobuild4/autobuild/beyond new file mode 100644 index 00000000000..12bc855c9b8 --- /dev/null +++ b/app-devel/autobuild4/autobuild/beyond @@ -0,0 +1,2 @@ +abinfo "Moving autobuild script to /usr/lib for alternatives processing ..." +mv -v "$PKGDIR"/usr/bin/autobuild "$PKGDIR"/usr/lib/autobuild4/autobuild diff --git a/app-devel/autobuild4/autobuild/beyond.stage2 b/app-devel/autobuild4/autobuild/beyond.stage2 deleted file mode 100644 index 870d55681bf..00000000000 --- a/app-devel/autobuild4/autobuild/beyond.stage2 +++ /dev/null @@ -1,2 +0,0 @@ -abinfo "Drop /etc/autobuild/ab3cfg.sh for stage2 ..." -rm -v "$PKGDIR"/etc/autobuild/ab3cfg.sh From 9cfb1a182aaee1b6d7255bbd7879cc17c87d5c49 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 1 Jan 2024 02:37:12 -0700 Subject: [PATCH 3/7] autobuild3: use alternatives --- app-devel/autobuild3/autobuild/alternatives | 1 + app-devel/autobuild3/autobuild/build | 2 -- app-devel/autobuild3/spec | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 app-devel/autobuild3/autobuild/alternatives diff --git a/app-devel/autobuild3/autobuild/alternatives b/app-devel/autobuild3/autobuild/alternatives new file mode 100644 index 00000000000..efde7559792 --- /dev/null +++ b/app-devel/autobuild3/autobuild/alternatives @@ -0,0 +1 @@ +alternative /usr/bin/autobuild /usr/lib/autobuild3/ab3.sh 50 diff --git a/app-devel/autobuild3/autobuild/build b/app-devel/autobuild3/autobuild/build index aef04556714..069dd77b20f 100644 --- a/app-devel/autobuild3/autobuild/build +++ b/app-devel/autobuild3/autobuild/build @@ -22,8 +22,6 @@ abinfo "Installing executable symlinks ..." mkdir -pv "$PKGDIR"/usr/bin ( cd "$PKGDIR"/usr/bin - ln -sv ../lib/autobuild3/ab3.sh \ - "$PKGDIR"/usr/bin/autobuild ln -sv ../lib/autobuild3/contrib/* \ "$PKGDIR"/usr/bin/ ) diff --git a/app-devel/autobuild3/spec b/app-devel/autobuild3/spec index a98c2917dba..9eb8128aca4 100644 --- a/app-devel/autobuild3/spec +++ b/app-devel/autobuild3/spec @@ -1,4 +1,5 @@ VER=1.8.6 +REL=1 SRCS="git::commit=tags/v$VER::https://github.com/AOSC-Dev/autobuild3" CHKSUMS="SKIP" CHKUPDATE="anitya::id=226987" From 7b83e490d89a7372be2a95850f1881a84d5b74d1 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 1 Jan 2024 03:18:07 -0700 Subject: [PATCH 4/7] autobuild4: set alternatives priority to 80 --- app-devel/autobuild4/autobuild/alternatives | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-devel/autobuild4/autobuild/alternatives b/app-devel/autobuild4/autobuild/alternatives index b48affaae6c..11b0e3bac6c 100644 --- a/app-devel/autobuild4/autobuild/alternatives +++ b/app-devel/autobuild4/autobuild/alternatives @@ -1 +1 @@ -alternative /usr/bin/autobuild /usr/lib/autobuild4/autobuild 50 +alternative /usr/bin/autobuild /usr/lib/autobuild4/autobuild 80 From 189e88670e099df2a3a0a1e757187c23174153d8 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 1 Jan 2024 15:49:22 -0700 Subject: [PATCH 5/7] autobuild4: add provides data ... ... to avoid breaking dependencies --- app-devel/autobuild4/autobuild/defines | 1 + 1 file changed, 1 insertion(+) diff --git a/app-devel/autobuild4/autobuild/defines b/app-devel/autobuild4/autobuild/defines index 91aa6e78e7a..c23f4667865 100644 --- a/app-devel/autobuild4/autobuild/defines +++ b/app-devel/autobuild4/autobuild/defines @@ -5,5 +5,6 @@ PKGDEP="autoconf autoconf-archive automake apt dpkg bash config coreutils \ spdx-licenses" BUILDDEP="nlohmann-json" PKGRECOM="cargo-audit" +PKGPROV="autobuild3 autobuild" VER_NONE=1 From 59ee46d56508c24af50c288aa9981b93cddfffbd Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 6 Jan 2024 22:40:00 -0700 Subject: [PATCH 6/7] autobuild4: update to 4.0.2 --- app-devel/autobuild4/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-devel/autobuild4/spec b/app-devel/autobuild4/spec index 8ebf7753eb7..aa8aefba91b 100644 --- a/app-devel/autobuild4/spec +++ b/app-devel/autobuild4/spec @@ -1,4 +1,4 @@ -VER=4.0.0 +VER=4.0.2 SRCS="git::commit=tags/v$VER::https://github.com/AOSC-Dev/autobuild4" CHKSUMS="SKIP" CHKUPDATE="anitya::id=226987" From ffbcccc47d005e8174d4e08a5afc4c0cffd2eed5 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 6 Jan 2024 23:35:25 -0700 Subject: [PATCH 7/7] autobuild4: add glibc and gcc-runtime to PKGDEP --- app-devel/autobuild4/autobuild/defines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-devel/autobuild4/autobuild/defines b/app-devel/autobuild4/autobuild/defines index c23f4667865..974fa1696dd 100644 --- a/app-devel/autobuild4/autobuild/defines +++ b/app-devel/autobuild4/autobuild/defines @@ -2,7 +2,7 @@ PKGNAME=autobuild4 PKGSEC=devel PKGDES="Multi-backend and extensible packaging toolkit" PKGDEP="autoconf autoconf-archive automake apt dpkg bash config coreutils \ - spdx-licenses" + spdx-licenses gcc-runtime glibc" BUILDDEP="nlohmann-json" PKGRECOM="cargo-audit" PKGPROV="autobuild3 autobuild"