public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/cpio/
@ 2022-11-28 14:31 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2022-11-28 14:31 UTC (permalink / raw
  To: gentoo-commits

commit:     46383ee643312058585dab843b2dd501a3c69a2c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 20:05:23 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 14:31:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46383ee6

app-alternatives/cpio: Add an ebuild for /bin/cpio symlink

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-alternatives/cpio/cpio-0.ebuild | 36 ++++++++++++++++++++++++++++++++++++
 app-alternatives/cpio/metadata.xml  | 20 ++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/app-alternatives/cpio/cpio-0.ebuild b/app-alternatives/cpio/cpio-0.ebuild
new file mode 100644
index 000000000000..20af68ac0123
--- /dev/null
+++ b/app-alternatives/cpio/cpio-0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="CPIO symlink"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
+SRC_URI=""
+S=${WORKDIR}
+
+LICENSE="CC0-1.0"
+SLOT="0"
+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="+gnu libarchive split-usr"
+REQUIRED_USE="^^ ( gnu libarchive )"
+
+RDEPEND="
+	gnu? ( >=app-arch/cpio-2.13-r4 )
+	libarchive? ( app-arch/libarchive )
+	!<app-arch/cpio-2.13-r4
+"
+
+src_install() {
+	local usr_prefix=
+	use split-usr && usr_prefix=../usr/bin/
+
+	if use gnu; then
+		dosym gcpio /bin/cpio
+		newman - cpio.1 <<<".so gcpio.1"
+	elif use libarchive; then
+		dosym "${usr_prefix}bsdcpio" /bin/cpio
+		newman - cpio.1 <<<".so bsdcpio.1"
+	else
+		die "Invalid USE flag combination (broken REQUIRED_USE?)"
+	fi
+}

diff --git a/app-alternatives/cpio/metadata.xml b/app-alternatives/cpio/metadata.xml
new file mode 100644
index 000000000000..77435f8882ae
--- /dev/null
+++ b/app-alternatives/cpio/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="gnu">
+			Symlink to GNU cpio (<pkg>app-arch/cpio</pkg>)
+		</flag>
+		<flag name="libarchive">
+			Symlink to bsdcpio from <pkg>app-arch/libarchive</pkg>
+		</flag>
+	</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/cpio/
@ 2022-12-06 14:47 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2022-12-06 14:47 UTC (permalink / raw
  To: gentoo-commits

commit:     85f17696807506edf725b68893471b23a4c78f51
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 19:27:37 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 14:46:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f17696

app-alternatives/cpio: Use app-alternatives.eclass

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-alternatives/cpio/cpio-0.ebuild | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/app-alternatives/cpio/cpio-0.ebuild b/app-alternatives/cpio/cpio-0.ebuild
index 20af68ac0123..0bdeb6da6b2f 100644
--- a/app-alternatives/cpio/cpio-0.ebuild
+++ b/app-alternatives/cpio/cpio-0.ebuild
@@ -3,20 +3,18 @@
 
 EAPI=8
 
-DESCRIPTION="CPIO symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+	"gnu:>=app-arch/cpio-2.13-r4"
+	libarchive:app-arch/libarchive
+)
+
+inherit app-alternatives
 
-LICENSE="CC0-1.0"
-SLOT="0"
+DESCRIPTION="CPIO symlink"
 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="+gnu libarchive split-usr"
-REQUIRED_USE="^^ ( gnu libarchive )"
+IUSE="split-usr"
 
 RDEPEND="
-	gnu? ( >=app-arch/cpio-2.13-r4 )
-	libarchive? ( app-arch/libarchive )
 	!<app-arch/cpio-2.13-r4
 "
 
@@ -24,13 +22,14 @@ src_install() {
 	local usr_prefix=
 	use split-usr && usr_prefix=../usr/bin/
 
-	if use gnu; then
-		dosym gcpio /bin/cpio
-		newman - cpio.1 <<<".so gcpio.1"
-	elif use libarchive; then
-		dosym "${usr_prefix}bsdcpio" /bin/cpio
-		newman - cpio.1 <<<".so bsdcpio.1"
-	else
-		die "Invalid USE flag combination (broken REQUIRED_USE?)"
-	fi
+	case $(get_alternative) in
+		gnu)
+			dosym gcpio /bin/cpio
+			newman - cpio.1 <<<".so gcpio.1"
+			;;
+		libarchive)
+			dosym "${usr_prefix}bsdcpio" /bin/cpio
+			newman - cpio.1 <<<".so bsdcpio.1"
+			;;
+	esac
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/cpio/
@ 2022-12-27 11:31 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-27 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     ae89ffdc02c0a182b1a3d60005ffe9cad928d321
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 11:31:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 11:31:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae89ffdc

app-alternatives/cpio: Stabilize 0 amd64, #886017

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/cpio/cpio-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-alternatives/cpio/cpio-0.ebuild b/app-alternatives/cpio/cpio-0.ebuild
index 0bdeb6da6b2f..3708bebc2c01 100644
--- a/app-alternatives/cpio/cpio-0.ebuild
+++ b/app-alternatives/cpio/cpio-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="CPIO symlink"
-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"
+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] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/cpio/
@ 2022-12-27 13:40 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-27 13:40 UTC (permalink / raw
  To: gentoo-commits

commit:     5d8b06c83266eddfcdb5fbdb06b92cbafdd5b74f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 13:39:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 13:39:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8b06c8

app-alternatives/cpio: Stabilize 0 arm64, #886017

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/cpio/cpio-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-alternatives/cpio/cpio-0.ebuild b/app-alternatives/cpio/cpio-0.ebuild
index 5c87cef47f83..34e2c56b3dfe 100644
--- a/app-alternatives/cpio/cpio-0.ebuild
+++ b/app-alternatives/cpio/cpio-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="CPIO symlink"
-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"
+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] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/cpio/
@ 2022-12-27 19:45 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-27 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     9fded0e3c2f8716b511643df091a7d300a074698
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 19:36:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:45:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fded0e3

app-alternatives/cpio: Stabilize 0 hppa, #886017

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/cpio/cpio-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-alternatives/cpio/cpio-0.ebuild b/app-alternatives/cpio/cpio-0.ebuild
index beddbd990771..08bf65faba70 100644
--- a/app-alternatives/cpio/cpio-0.ebuild
+++ b/app-alternatives/cpio/cpio-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="CPIO symlink"
-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"
+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] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/cpio/
@ 2022-12-27 19:53 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-27 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     1b81b16c37298cabcfdcbb367941d9e0ea51aac2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 19:47:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:53:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b81b16c

app-alternatives/cpio: Stabilize 0 ppc64, #886017

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/cpio/cpio-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-alternatives/cpio/cpio-0.ebuild b/app-alternatives/cpio/cpio-0.ebuild
index a0cc6e4b2c84..a7b0273d1d09 100644
--- a/app-alternatives/cpio/cpio-0.ebuild
+++ b/app-alternatives/cpio/cpio-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="CPIO symlink"
-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"
+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] 6+ messages in thread

end of thread, other threads:[~2022-12-27 19:53 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-06 14:47 [gentoo-commits] repo/gentoo:master commit in: app-alternatives/cpio/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2022-12-27 19:53 Sam James
2022-12-27 19:45 Sam James
2022-12-27 13:40 Sam James
2022-12-27 11:31 Sam James
2022-11-28 14:31 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox