* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/bzip2/
@ 2022-12-01 19:38 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-01 19:38 UTC (permalink / raw
To: gentoo-commits
commit: 2dcc92ce6b5c947ea31350c635dcdce43fee527b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 16:12:33 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 19:38:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcc92ce
app-alternatives/bzip2: Simplify by chaining manpage references
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28494
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/bzip2/{bzip2-0.ebuild => bzip2-1.ebuild} | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/app-alternatives/bzip2/bzip2-0.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
similarity index 82%
rename from app-alternatives/bzip2/bzip2-0.ebuild
rename to app-alternatives/bzip2/bzip2-1.ebuild
index 50e36d3cc7b2..6e61b5e2135d 100644
--- a/app-alternatives/bzip2/bzip2-0.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -30,22 +30,19 @@ src_install() {
if use lbzip2; then
dosym "${usr_prefix}lbzip2" /bin/bzip2
newman - bzip2.1 <<<".so lbzip2.1"
- newman - bunzip2.1 <<<".so lbzip2.1"
- newman - bzcat.1 <<<".so lbzip2.1"
elif use pbzip2; then
dosym "${usr_prefix}pbzip2" /bin/bzip2
newman - bzip2.1 <<<".so pbzip2.1"
- newman - bunzip2.1 <<<".so pbzip2.1"
- newman - bzcat.1 <<<".so pbzip2.1"
elif use reference; then
dosym bzip2-reference /bin/bzip2
newman - bzip2.1 <<<".so bzip2-reference.1"
- newman - bunzip2.1 <<<".so bzip2-reference.1"
- newman - bzcat.1 <<<".so bzip2-reference.1"
else
die "Invalid USE flag combination (broken REQUIRED_USE?)"
fi
dosym bzip2 /bin/bunzip2
dosym bzip2 /bin/bzcat
+
+ newman - bunzip2.1 <<<".so bzip2.1"
+ newman - bzcat.1 <<<".so bzip2.1"
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/bzip2/
@ 2022-12-05 19:13 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2022-12-05 19:13 UTC (permalink / raw
To: gentoo-commits
commit: 98badc6ae4d121506a32be863250ec96dea8aaf2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 2 19:11:10 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 5 19:13:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98badc6a
app-alternatives/bzip2: Use app-alternatives.eclass
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-alternatives/bzip2/bzip2-1.ebuild | 43 ++++++++++++++++-------------------
1 file changed, 20 insertions(+), 23 deletions(-)
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index 6e61b5e2135d..6b0b5ef620d1 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -3,46 +3,43 @@
EAPI=8
-DESCRIPTION="bzip2 symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+ "reference:>=app-arch/bzip2-1.0.8-r4"
+ "lbzip2:app-arch/lbzip2[-symlink(-)]"
+ "pbzip2:app-arch/pbzip2[-symlink(-)]"
+)
+
+inherit app-alternatives
-LICENSE="CC0-1.0"
-SLOT="0"
+DESCRIPTION="bzip2 symlink"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="lbzip2 pbzip2 +reference split-usr"
-REQUIRED_USE="^^ ( lbzip2 pbzip2 reference )"
+IUSE="split-usr"
RDEPEND="
- lbzip2? ( app-arch/lbzip2[-symlink(-)] )
- pbzip2? ( app-arch/pbzip2[-symlink(-)] )
- reference? ( >=app-arch/bzip2-1.0.8-r4 )
!<app-arch/bzip2-1.0.8-r4
!app-arch/lbzip2[symlink(-)]
!app-arch/pbzip2[symlink(-)]
"
src_install() {
+ local alt=$(get_alternative)
local usr_prefix=
use split-usr && usr_prefix=../usr/bin/
- if use lbzip2; then
- dosym "${usr_prefix}lbzip2" /bin/bzip2
- newman - bzip2.1 <<<".so lbzip2.1"
- elif use pbzip2; then
- dosym "${usr_prefix}pbzip2" /bin/bzip2
- newman - bzip2.1 <<<".so pbzip2.1"
- elif use reference; then
- dosym bzip2-reference /bin/bzip2
- newman - bzip2.1 <<<".so bzip2-reference.1"
- else
- die "Invalid USE flag combination (broken REQUIRED_USE?)"
- fi
+ case ${alt} in
+ reference)
+ dosym bzip2-reference /bin/bzip2
+ alt=bzip2-reference
+ ;;
+ *)
+ dosym "${usr_prefix}${alt}" /bin/bzip2
+ ;;
+ esac
dosym bzip2 /bin/bunzip2
dosym bzip2 /bin/bzcat
+ newman - bzip2.1 <<<".so ${alt}.1"
newman - bunzip2.1 <<<".so bzip2.1"
newman - bzcat.1 <<<".so bzip2.1"
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/bzip2/
@ 2022-12-27 11:31 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-27 11:31 UTC (permalink / raw
To: gentoo-commits
commit: 44e3ca98b6e767c67d9e5e1b44c1114071e9cd94
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 11:30:59 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 11:30:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e3ca98
app-alternatives/bzip2: Stabilize 1 amd64, #886017
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/bzip2/bzip2-1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index 6b0b5ef620d1..fc821ae57754 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
inherit app-alternatives
DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="split-usr"
RDEPEND="
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/bzip2/
@ 2022-12-27 13:40 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-27 13:40 UTC (permalink / raw
To: gentoo-commits
commit: ffe39a73f898f8a25f1269ec3edba05e2d6f9f5e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 13:39:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 13:39:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe39a73
app-alternatives/bzip2: Stabilize 1 arm64, #886017
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/bzip2/bzip2-1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index 346393a6fa70..e7436a4d3fa8 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
inherit app-alternatives
DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="split-usr"
RDEPEND="
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/bzip2/
@ 2022-12-27 19:45 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-27 19:45 UTC (permalink / raw
To: gentoo-commits
commit: c31a93c9fd2bceb35574c949dd70d6f13bbbd85d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 19:36:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:45:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31a93c9
app-alternatives/bzip2: Stabilize 1 hppa, #886017
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/bzip2/bzip2-1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index de1829ad9f82..d1676d5d24b4 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
inherit app-alternatives
DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
IUSE="split-usr"
RDEPEND="
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/bzip2/
@ 2022-12-27 19:53 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-27 19:53 UTC (permalink / raw
To: gentoo-commits
commit: fad3f94582da4db96f29f5740d69a2aa9dd16e1b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 19:47:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:53:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad3f945
app-alternatives/bzip2: Stabilize 1 ppc64, #886017
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/bzip2/bzip2-1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index 0778a3985e94..01751e93d3f2 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
inherit app-alternatives
DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="split-usr"
RDEPEND="
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/bzip2/
@ 2022-12-31 14:30 Fabian Groffen
0 siblings, 0 replies; 7+ messages in thread
From: Fabian Groffen @ 2022-12-31 14:30 UTC (permalink / raw
To: gentoo-commits
commit: ca66920b8d97794aeea2fe783c17b55328821e17
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 14:30:18 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 14:30:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca66920b
app-alternatives/bzip2-1: add prefix Prefix keywords
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-alternatives/bzip2/bzip2-1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index 01751e93d3f2..57852459ae49 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
inherit app-alternatives
DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="split-usr"
RDEPEND="
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-12-31 14:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-01 19:38 [gentoo-commits] repo/gentoo:master commit in: app-alternatives/bzip2/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-05 19:13 Michał Górny
2022-12-27 11:31 Sam James
2022-12-27 13:40 Sam James
2022-12-27 19:45 Sam James
2022-12-27 19:53 Sam James
2022-12-31 14:30 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox