gentoo auto-resync : 12:03:2023 - 00:09:21

7 files changed, 21 insertions, 54 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 0bacabbad0ef..36a51b99ec0d 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index ffe71c46e3c1..c0862e336683 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1,5 +1,6 @@
 DIST docker-cli-20.10.22.tar.gz 7590020 BLAKE2B ab003a9af2b441a9bad9c27345dea2e82087cfc8a8ac865adeb2e47e91be4bd9b27f499ae95b0ddcddb66d27c3498938682dcd10d5e3bef41fc18ce1f034a476 SHA512 550346904d172725f48c4de0e34fa95123c7022b14980d30cd01df0c9e154ac817f19e24b61538f8cbc23db090de56977c8b885b96f99583e8a5f773691280a6
+DIST docker-cli-23.0.1-man.tar.xz 81956 BLAKE2B 4660d760fc405f9c3fdc38d7324c34d6a5ab1c567f792d400b91b57e2f3c2257b72cd1b02cab2fde8016ac37f6630e6c5c60da0d9064250f341baf3a5e28419a SHA512 88b926f661f3d291dbd71c0ba6f930c13e81760b354f8abccf802abd8175f312a7b3487ed3d767ae02e3c3d4172d02b6bf55b21b3921c9850a05de5efc204b1f
 DIST docker-cli-23.0.1.tar.gz 6215114 BLAKE2B 4449de9fdc64f45daf6dbbe762bf6e2320aa32bed1aba90a3c1c81df343f3c3a667e62e950896f5d2b12e33d758507b4cec7d6ed3b06c3815ad528be2c47510a SHA512 77d30945160dc4d9c50354c57d2efed49b99c872c8782f6ad121e6dc1489899d8967ba95cca36499c1b59bc5ef71f4a6b516c635b0cf41b50722bb71597aa496
 EBUILD docker-cli-20.10.22.ebuild 1892 BLAKE2B 4ebcbda14444d8789d84fa81c395cf49148ed44ea70f269016ff6cd60da2b959f36c222b34ab914ccd8ea2d20f22bb063c1718231e89da969c0f0da6ebd1b3ac SHA512 5ec21ada14efe0bb6506dba41e7b6401f4a31d18b42c4d05623de939a9156ee16fc4adef8d076ec50b11b10a3c7dcb39bc51be83650114a00cc5750bdeda2414
-EBUILD docker-cli-23.0.1.ebuild 1897 BLAKE2B c81ea23ce2c3d1a36f184e500c6f6ad1e248b025a88f7f8a7092f601209f4e80c3fd15844a3496ec99ddbad2683b2520adda3f102ac6360ddf7fea15f94db452 SHA512 cf97e8f4d928ebd882787b4294702eafd264b109cfd077b5ea384612024bd4b58afb3ab38e61fd128ea5a0bad68c631160d571db6ee7d83a2122d38d31f1c663
+EBUILD docker-cli-23.0.1.ebuild 1659 BLAKE2B 0104e20b1c9f88c4b84e91d04e7cf328b4c9f9cc67d4f495912b4b4d008cba824dbce610a1ec4545a48f12aca3b1e4b409d9819732b2bb368bfca05d71b4e2f8 SHA512 222a14c2a51ff626a417d8f1859c28b91fc1cc28cac21ec1ce9adbef52f5d56752c7bd8d47efea6507e6f949210cf39be071e847925076c5b3d5f6fa500c21e7
 MISC metadata.xml 689 BLAKE2B 45f4a07f9d949ad4e0175908af936140573bd257f7b11f9b9cc25cdd52bb821a294036635fd81662bcd348aa21e69b5582ab2dc8efaf94dbbdc9608b131414f4 SHA512 efe37f3ae8bc6b26433b7bacfda203ea3b480f419b343921214f19a4ad4e25b2cca5f0426a27348902f51ef15f558e81599ccdadcab6504f9d22314bb472d80c
diff --git a/app-containers/docker-cli/docker-cli-23.0.1.ebuild b/app-containers/docker-cli/docker-cli-23.0.1.ebuild
index 78a598ba9c32..ef48a886e348 100644
--- a/app-containers/docker-cli/docker-cli-23.0.1.ebuild
+++ b/app-containers/docker-cli/docker-cli-23.0.1.ebuild
@@ -10,22 +10,28 @@ inherit bash-completion-r1  golang-vcs-snapshot
 DESCRIPTION="the command line binary for docker"
 HOMEPAGE="https://www.docker.com/"
 SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="hardened selinux"
 
 RDEPEND="!<app-containers/docker-20.10.1
 	selinux? ( sec-policy/selinux-docker )"
 BDEPEND="
-	>=dev-lang/go-1.16.6
-	dev-go/go-md2man"
+	>=dev-lang/go-1.16.6"
 
 RESTRICT="installsources strip test"
 
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	set -- ${A}
+	unpack ${2}
+}
+
 src_prepare() {
 	default
 	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
@@ -43,21 +49,11 @@ src_compile() {
 		VERSION="${PV}" \
 		GITCOMMIT="${GIT_COMMIT}" \
 		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	mkdir -p ./man/man1 || die "mkdir failed"
-	go build -o "${T}"/gen-manpages ./man ||
-		die 'build gen-manpages failed'
-	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
-		die 'gen-manpages failed'
-	./man/md2man-all.sh -q ||
-		die 'md2man-all.sh failed'
 }
 
 src_install() {
 	dobin build/docker
-	doman man/man*/*
+	doman "${WORKDIR}"/man/man?/*
 	dobashcomp contrib/completion/bash/*
 	bashcomp_alias docker dockerd
 	insinto /usr/share/fish/vendor_completions.d/
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index e7dd22c66066..902122fea0ce 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -9,5 +9,5 @@ EBUILD docker-compose-1.29.2-r1.ebuild 1918 BLAKE2B bf3402c6139087a39c13b23710b9
 EBUILD docker-compose-1.29.2-r2.ebuild 1969 BLAKE2B 1b64296bae273bb6ff90991988d94b6470fafe365915183d52e8d56106702fc30d856dc6e23eb7c094bbc4f12bee70ead77d03a31512dd89fed6824ae3151c43 SHA512 43f0a4ab7009a6a4516f30a7432a9a11c60b33a8e845eb9ad0d64f1e9f091cb2fbb32baa04cbdc034d9fa23709ec79cfe2dba12d19588b5b33326c4696d595bc
 EBUILD docker-compose-1.29.2-r3.ebuild 2003 BLAKE2B d1e7de7c5a30ba4bf7d0de36de4da1778e66f20c761cd4edc8801d093dec2c5f882d9997ad60ab039ac048c1692af628a0c3bda94c0989e04f6c269c5caa73cb SHA512 acae66015644f268d94778edc88565016e6a171cc8e4185a9c9607375efc775dc866b8354296db03e2bdfc0dd11691c09ea76f2244618c075e7777dd664ad55e
 EBUILD docker-compose-2.12.2.ebuild 1143 BLAKE2B 65406f19f5454c903ac34ce63653083ec4533707c5e507e56c767f8529b1fdf397573cac69efef2981c77314feced2b5a7723cd6ded71ecd422787b5ad0347ed SHA512 5ba4e727da997ecc072a8ee09b60d5986f7313c8b6c097680c07b67c156cc59f912256b99075de1c0b91f66e81ded4a0411099f89585a7f3c4f26bd0a2a6aa4f
-EBUILD docker-compose-2.16.0.ebuild 1144 BLAKE2B 06b9272476e80faef1b842381949d1471de2cd68eabdf4690c673e25a80d85ba185649f2893ff6673cb98b14a60869e49173daa4e769f841cf4f559ca18903f2 SHA512 558aa2829d8578eb6810960befed189b887ba0d444e571943be99df055970cabcec90a1d2a225072a86b2175d189872e14438d4c209934f3f49dfa6a9d3d5eba
+EBUILD docker-compose-2.16.0.ebuild 1142 BLAKE2B b1889ef6e4657930147d8541a0c6a53eb013f9a81b756d0898617cfe4cb74c2bdb493c34a2707ccef44da87f37273d9cde3e6aacc33d61575155d2acdb7d238e SHA512 921964225e698658fbc716cbde486d3a8e9f062fe11a220aadc7e14a535a0e8a39820af50c228b4ed7b18bcc064a76c270c20f5db0e56d14190538551062383b
 MISC metadata.xml 544 BLAKE2B d515d07ee7d2045db1d4a2a0e8f0e797e23b01dea7ab164d9bffc85bc00ddc18a050f296db0a80df8a65c9c554d6e189218a1939b07b29ea823e5eea65d803e6 SHA512 17c3b4e7be1318a36aa744e185d7f7d5571107cecc98eed8fce07b4d905273409b95a202129440082f29be57d6a44eabda43730e8f47cc7c63c04d6d0ed05645
diff --git a/app-containers/docker-compose/docker-compose-2.16.0.ebuild b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
index ff968eb11724..a8e67ae22e10 100644
--- a/app-containers/docker-compose/docker-compose-2.16.0.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-# KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND=">=app-containers/docker-cli-23.0.0"
 
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 34a5cb5337c3..536398a51c57 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -3,5 +3,5 @@ AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79
 DIST docker-20.10.22.tar.gz 11232083 BLAKE2B 89dea21be77beb00a5c7fde382f1621558c676c63a85cac9664ec04130b875db649b84433ef2d9a0ca9ee221bf38a46b3af85ad6bfe920cf22a15d0cac450b99 SHA512 81aec7faedced07718e3e228e999c4774fd293cedfacd272798a0057177ddca5322a701d0f644777a69b87140cd7a7194aa93a524507f202d050eb30b1a4142c
 DIST docker-23.0.1.tar.gz 13612828 BLAKE2B ad5ff3a3c722b21e7cb0f6bab52fd66f4c0df185699b057d081cd49ee56cec3eda18d94f4236f45e57c2190831945f67c81b90a136231d6dc067ddad69a01625 SHA512 135e312b76fbd61c425713c51b1b9622491d1d03264cd5100296fec6c00778bf7d9c2c7cb0522d0474753b797a6e87552b47dad7e05e44400561a833bc8616f0
 EBUILD docker-20.10.22.ebuild 8058 BLAKE2B caa8ba3cabfe38c69273ce970c420d69561b73b5b3608a4c576cc151572f901c6a192131be12b1eb8a5bbd8ea114fc37d220eef1a78b68d783b93bed2f2de66c SHA512 966ff3f88054f4717548c88411cfd1415d4d6355a2ea3a4332a909e0b15b0dcb05074fd6d6b31ba8abeb0807b28561b26441d544801e0c4e00f4773184a80c79
-EBUILD docker-23.0.1.ebuild 8824 BLAKE2B 3dd09127743e2edc2be223ca53516d8a773afed55981f352e1cf09e07e165344348832643dc3d5a13ea8abbcb83c36f818140fdbafbaf599468ea596c62919d9 SHA512 18784c81cd79e1200a66cbaafd655a22427b295e2733fe643b166b2e3d319ed50b3102d1dd6f246accfe4d7ac5e74cede20d388bd2e1b826624ddcf4842d6737
+EBUILD docker-23.0.1.ebuild 7770 BLAKE2B f0ec7c92b0b4fa64ddedec18b744dd59be095b8dac91b47ca9635c370359698d690aff6e9b4b16fb7faa95f7373457a23610c7443d3e5fe2d7fff149e9fd28c6 SHA512 14879e807d3e8fe0032f80b526bdd8a1bd7088e407fa22ee78481aaf227a4ad15742443a409717d2575a655b042a95d1f4913e40d977e0ed3194d8e757a97405
 MISC metadata.xml 1680 BLAKE2B 6c128f9ea99f1634e260b2f944b6560636d8501f93c3e208aff7ca8ee10199f520b187a063f9a8869130305bef8749ee1af10971658e04515e80907bc8a48be0 SHA512 913bed94f44d2093868999e8a1064c8443e4d1298b53ac065b0df0857809e93194f7650dfa1e49933022461f0adec956effff61f627838e1d0104e9d9004bf14
diff --git a/app-containers/docker/docker-23.0.1.ebuild b/app-containers/docker/docker-23.0.1.ebuild
index e8c53f5f178b..d592dae8135b 100644
--- a/app-containers/docker/docker-23.0.1.ebuild
+++ b/app-containers/docker/docker-23.0.1.ebuild
@@ -14,8 +14,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened
-overlay seccomp selinux"
+IUSE="apparmor aufs btrfs +container-init device-mapper overlay seccomp selinux"
 
 DEPEND="
 	acct-group/docker
@@ -125,12 +124,12 @@ pkg_setup() {
 	fi
 
 	CONFIG_CHECK+="
-	~!LEGASY_SYSCALL_NATIVE
-	~LEGASY_SYSCALL_emulate
-	~!LEGASY_SYSCALL_none
+	~!LEGACY_VSYSCALL_NATIVE
+	~LEGACY_VSYSCALL_EMULATE
+	~!LEGACY_VSYSCALL_NONE
 	"
-	WARNING_LEGASY_SYSCALL_NONE="CONFIG_LEGASY_SYSCALL_NONE enabled: \
-		Containers with <=glibc 2.13 will not work"
+	WARNING_LEGACY_SYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
+		Containers with <=glibc-2.13 will not work"
 
 	if kernel_is le 4 5; then
 		CONFIG_CHECK+="
@@ -253,14 +252,6 @@ src_compile() {
 		fi
 	done
 
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
 	# build daemon
 	./hack/make.sh dynbinary || die 'dynbinary failed'
 }
@@ -320,27 +311,6 @@ pkg_postinst() {
 		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
 		elog
 	fi
-
-	if use cli; then
-		ewarn "Starting with docker 20.10.2, docker has been split into"
-		ewarn "two packages upstream, so Gentoo has followed suit."
-		ewarn
-		ewarn "app-containers/docker contains the daemon and"
-		ewarn "app-containers/docker-cli contains the docker command."
-		ewarn
-		ewarn "docker currently installs docker-cli using the cli use flag."
-		ewarn
-		ewarn "This use flag is temporary, so you need to take the"
-		ewarn "following actions:"
-		ewarn
-		ewarn "First, disable the cli use flag for app-containers/docker"
-		ewarn
-		ewarn "Then, if you need docker-cli and docker on the same machine,"
-		ewarn "run the following command:"
-		ewarn
-		ewarn "# emerge --noreplace docker-cli"
-		ewarn
-	fi
 }
 
 pkg_postrm() {