Skip to content

Commit 1e4ef96

Browse files
krnowakkrnowak
authored
Merge pull request #1470 from flatcar/krnowak/app-automation
Add app-* packages under automation
2 parents fe28bd9 + 0398615 commit 1e4ef96

File tree

86 files changed

+1010
-889
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1010
-889
lines changed

‎.github/workflows/portage-stable-packages-list

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ acct-user/systemd-resolve
5959
acct-user/systemd-timesync
6060
acct-user/tss
6161

62+
app-admin/eselect
63+
app-admin/perl-cleaner
64+
6265
app-alternatives/awk
6366
app-alternatives/bc
6467
app-alternatives/bzip2
@@ -74,6 +77,8 @@ app-arch/cpio
7477
app-arch/gzip
7578
app-arch/lbzip2
7679
app-arch/libarchive
80+
app-arch/lz4
81+
app-arch/lzop
7782
app-arch/ncompress
7883
app-arch/pbzip2
7984
app-arch/pigz
@@ -94,11 +99,17 @@ app-containers/docker-proxy
9499
app-containers/runc
95100

96101
app-crypt/adcli
102+
app-crypt/argon2
103+
app-crypt/efitools
97104
app-crypt/libb2
98105
app-crypt/libmd
106+
app-crypt/mhash
99107
app-crypt/mit-krb5
100108
app-crypt/pinentry
101109
app-crypt/rhash
110+
app-crypt/shash
111+
112+
app-doc/eclass-manpages
102113

103114
app-editors/nano
104115
app-editors/vim
@@ -108,18 +119,26 @@ app-emulation/qemu
108119
app-emulation/qemu-guest-agent
109120

110121
app-eselect/eselect-iptables
122+
app-eselect/eselect-lib-bin-symlink
123+
app-eselect/eselect-pinentry
124+
app-eselect/eselect-python
125+
app-eselect/eselect-rust
126+
app-eselect/eselect-vi
111127

112128
app-misc/c_rehash
113129
app-misc/editor-wrapper
130+
app-misc/jq
114131
app-misc/mime-types
115132
app-misc/pax-utils
133+
app-misc/zisofs-tools
116134

117135
app-portage/elt-patches
118136
app-portage/gentoolkit
119137
app-portage/portage-utils
120138

121139
app-shells/bash
122140
app-shells/bash-completion
141+
app-shells/gentoo-bashcomp
123142

124143
app-text/asciidoc
125144
app-text/build-docbook-catalog
@@ -129,6 +148,9 @@ app-text/docbook-xsl-stylesheets
129148
app-text/mandoc
130149
app-text/manpager
131150
app-text/sgml-common
151+
app-text/xmlto
152+
153+
app-vim/gentoo-syntax
132154

133155
dev-cpp/gtest
134156

‎changelog/updates/2023-12-07-app-automation.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- jq ([1.7](https://github.com/jqlang/jq/releases/tag/jq-1.7))
2+
- lz4 ([1.9.4](https://github.com/lz4/lz4/releases/tag/v1.9.4))

‎sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
=app-crypt/adcli-0.9.2 ~amd64 ~arm64
1717

1818
# Needed by arm64-native SDK.
19-
=app-crypt/efitools-1.9.2 ~arm64
19+
=app-crypt/efitools-1.9.2-r1 ~arm64
2020

2121
# Needed to fix CVE-2023-36054.
2222
=app-crypt/mit-krb5-1.21.2 ~amd64 ~arm64

‎sdk_container/src/third_party/portage-stable/app-admin/eselect/Manifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
DIST eselect-1.4.22.tar.xz 183480 BLAKE2B 8f86bdddaf98bc075694bdf7283cbd366e0ef93635472b3bbac11fdd9765984cd82e493b16836bae66e4b2c42a9cb33ad0d2aacaaf8529b59e4898e11f172d26 SHA512 73a10278d604f462aefa099df398eec2b08aee33da69419351ff2faf1cf4c0f3de0f301d92015e52da63046fe7e2c1c388e11ac84b7deb3def505a59fa291dac
2-
DIST eselect-1.4.25.tar.xz 184300 BLAKE2B 630fe27338bee0c921a2f90e42d0a8abbb60a141a82bc2c4e7cf43d37582c24b06986ae1cbd341f8d3e69d011edc6c29675bf91ceaf1dcbc2593086f451b8f5f SHA512 98f2752d61e2c31ff6d735d5df0e7d98c3cc51d51c26b71d796948b141ccbc017002185022e6e1e48660ae0012bfc9cd383dd5ac50f644b35bb0893b9271121b
1+
DIST eselect-1.4.26.tar.xz 184332 BLAKE2B ee1e8890802fc50646c8d1d5219f1ab0ec5cfc0138c758f73ad6baccf673992bbf3e763d8e84491f33e724ba4e1cf3bed6971ba7fa4373e0f06464ff4a5fa1e6 SHA512 397ae2f15d90d722eb84225b08f1afaaf6f89758bfae5d93b0a1c3eddc997c21e74ab62e09ee5e71941d3a8587b3372b64336d12054c3bbf0e56e1ba398a26f9
2+
DIST eselect-1.4.27.tar.xz 184464 BLAKE2B 718874f4d0651194f361ca3202e5140982812bf486c8efe82354944d55206b0113fa135992203e8baa00019c3fd773a90ddaf67157c16f4ac2d69965d9822fbd SHA512 f534785fc1f79869840f420b4ab2b2bf35593c504cce878a6d3d07f75012cf32288009ea9ac2a5607dba216a794110a64c5f2c54d5d8a3c641328489cecc024b

‎sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.25.ebuild renamed to ‎sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.26.ebuild

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33

44
EAPI=7
55

6+
# Packages sharing a common release tarball:
7+
# app-admin/eselect
8+
# app-emacs/eselect-mode
9+
# Please bump and mark them stable together!
10+
611
inherit bash-completion-r1
712

813
DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
@@ -11,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
1116

1217
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
1318
SLOT="0"
14-
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
19+
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
1520
IUSE="doc emacs vim-syntax"
1621

1722
DEPEND="sys-apps/sed

‎sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.22-r1.ebuild renamed to ‎sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.27.ebuild

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33

44
EAPI=7
55

6+
# Packages sharing a common release tarball:
7+
# app-admin/eselect
8+
# app-emacs/eselect-mode
9+
# Please bump and mark them stable together!
10+
611
inherit bash-completion-r1
712

813
DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
@@ -26,8 +31,6 @@ BDEPEND="doc? ( dev-python/docutils )"
2631
PDEPEND="emacs? ( app-emacs/eselect-mode )
2732
vim-syntax? ( app-vim/eselect-syntax )"
2833

29-
PATCHES=( "${FILESDIR}/${P}-env-module.patch" )
30-
3134
src_compile() {
3235
emake
3336
use doc && emake html

‎sdk_container/src/third_party/portage-stable/app-admin/eselect/files/eselect-1.4.22-env-module.patch

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎sdk_container/src/third_party/portage-stable/app-admin/perl-cleaner/Manifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
DIST perl-cleaner-2.30.tar.bz2 6963 BLAKE2B 8983060c7a904266ac82a67eba7b5d2184803b59c077f947a35d07e9af3046953705d31840b9508116578b8f3e8a8b97d77cf21eeac3b70f1c3fb5c1d71ae64e SHA512 436d26727bbb598bcd3c4f31e6b81e415a797cdba82dccfd55e54ee179bd2d6c1dc443e865f6f0a05b59f47ffd231dd10e55d5ea97a9a6875235ea1b49b68898
2+
DIST perl-cleaner-2.31.tar.bz2 6914 BLAKE2B 4b13ae42ab06ad75b6dbcb1306f3f4f476315db4504d0ffbc4c56d4d66a2da3a751d3682305daca6bcbae1861d182f16296c92f9a8d25687e35ab03a6f8734e3 SHA512 c4df0437604d41dbfdce0b72d72f975d464cf0c44f417c708917f01829e498ef8d6b47a78cee517836cac9344791ad49db98f29da5f78599e80b000e41b8127e

‎sdk_container/src/third_party/portage-stable/app-admin/perl-cleaner/metadata.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
33
<pkgmetadata>
4-
<maintainer type="project">
5-
<email>perl@gentoo.org</email>
6-
<name>Gentoo Perl Project</name>
7-
</maintainer>
4+
<maintainer type="project">
5+
<email>perl@gentoo.org</email>
6+
<name>Gentoo Perl Project</name>
7+
</maintainer>
8+
<use>
9+
<flag name="pkgcore">
10+
Use <pkg>sys-apps/pkgcore</pkg> instead of <pkg>sys-apps/portage</pkg>
11+
and <pkg>app-portage/portage-utils</pkg>.
12+
</flag>
13+
</use>
14+
<upstream>
15+
<remote-id type="github">gentoo-perl/perl-cleaner</remote-id>
16+
</upstream>
817
</pkgmetadata>

‎sdk_container/src/third_party/portage-stable/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Copyright 1999-2023 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
inherit prefix
7+
8+
DESCRIPTION="User land tool for cleaning up old perl installs"
9+
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
10+
11+
if [[ "${PV}" == "9999" ]] ; then
12+
inherit git-r3
13+
EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
14+
else
15+
SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
16+
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
17+
fi
18+
19+
LICENSE="GPL-2"
20+
SLOT="0"
21+
# TODO: Detect at runtime what's available and fallback if needed, possibly
22+
# integrate with eselect-package-manager, bug #779007.
23+
IUSE="pkgcore"
24+
25+
[[ "${PV}" == "9999" ]] && BDEPEND="sys-apps/help2man"
26+
27+
RDEPEND="
28+
app-shells/bash
29+
dev-lang/perl
30+
pkgcore? ( sys-apps/pkgcore )
31+
!pkgcore? (
32+
app-portage/portage-utils
33+
sys-apps/portage
34+
)
35+
"
36+
37+
src_prepare() {
38+
default
39+
eprefixify ${PN}
40+
}
41+
42+
src_install() {
43+
dosbin perl-cleaner
44+
doman perl-cleaner.1
45+
}

0 commit comments

Comments
 (0)