gentoo auto-resync : 22:09:2023 - 05:16:14

7 files changed, 119 insertions, 138 deletions

diff --git a/app-containers/containers-storage/Manifest b/app-containers/containers-storage/Manifest
index 149c3bccd157..d24452d61978 100644
--- a/app-containers/containers-storage/Manifest
+++ b/app-containers/containers-storage/Manifest
@@ -1,5 +1,5 @@
-DIST containers-storage-1.41.0.tar.gz 3685908 BLAKE2B 5835fa222127d8e2398a33ec02b24ee0b5a94943ed30a19d8b5f76ce4b852f1e7ad9eceb052dcbb2a2c3db96d3ec4ca0150ab81cd0e0a0e351b353f47c0862b5 SHA512 e2d4d887f067d4bdab97426d9cfe7f941b8148d3c40ddb60d5cbc08f1b3a8c5e6a182586f9cdb96873377b8467368527ff89220ba8a5cd7ad4682a90a1243f56
-DIST containers-storage-1.42.0.tar.gz 3767236 BLAKE2B 3cca3833695bb5e15a0ab5d97d5f72e14102d8c6eee1c132932e4177f64ab9a171cf8486f4fe8d9e09a0537a325c988c6b766249c3c0843bb5f1b270a705b523 SHA512 c8a4fdfbc71915dd3a1d5c1fabef4be7641b8a0edb14805719d93bc9de5bd8fe150636c4457fa544487a6bccbb0f58ad36ca3990d6ca3c2b73935418aaf98f22
-EBUILD containers-storage-1.41.0.ebuild 1460 BLAKE2B 1e82d14bc4a40bfeec0c09d26d5e987cdf208a66e9359186512b067d454154337c301573f852fbeafaa572641acb6109e5f069273e4689efbaf0262be216e736 SHA512 3debf8e12d4ef6349aa00ad4594494999cacaba6f784db5c7ea79da9c81f7ca783a9bd8bc62e5fc81bc4629cd6ff49c8ca304e8df3741cd93cf6660246828801
-EBUILD containers-storage-1.42.0.ebuild 1460 BLAKE2B 1e82d14bc4a40bfeec0c09d26d5e987cdf208a66e9359186512b067d454154337c301573f852fbeafaa572641acb6109e5f069273e4689efbaf0262be216e736 SHA512 3debf8e12d4ef6349aa00ad4594494999cacaba6f784db5c7ea79da9c81f7ca783a9bd8bc62e5fc81bc4629cd6ff49c8ca304e8df3741cd93cf6660246828801
-MISC metadata.xml 604 BLAKE2B b132c7cf2a280a6c5fee5b37eb644c5644890b845a92165551a5466caf2fbfa07f7b63b1a387fee62467a7df4218e1e4c563fe70fc40209a4f2eae5b9c714b57 SHA512 21725a1c25a5912b26a56f1970b968ca686f55a27888e4a2948ea6d7a6b8f3d70f528e875d8d2271963ebebb6fee11c51f218045296dac21a1b86ba9b5481b28
+AUX system-md2man-path.patch 169 BLAKE2B 707d7396af9c6a04a3a4860198acb927d6fbc68d8a1375340220778528f472f9026fff63c24cfa11ba48f6157faff3f993c0d9bac3e125de6152045ec3c9876b SHA512 6430e890fa731b4a8646bd001557bc17180c312d1efdccfd3aa611f7402eb8e8cc0ef551b5cfc9b0db60a0e69a6dd90b5c75c46139fa3d9424ae6f9700c91f64
+DIST containers-storage-1.50.2.tar.gz 4278269 BLAKE2B 3a2b08c710c043cfc130b9ffe39807e5ced8aa3cdb9805e9d9a4d0f60d8136f99e78ca03992c566b7c7d9aa1c25a2ab9da5e9edc4f1f841663302f5873dce419 SHA512 eb2ca9d243511abd5d6d1727c60166422dbfef4a3ddbb5062e58d915d0705afcd10ded8f1f79e897f9f5244fb6b6d349fbf3ed86ae57f41e31a1965c4e926941
+EBUILD containers-storage-1.50.2.ebuild 841 BLAKE2B 767bbfc7a815dd17883d59bdc4e5a530a9140c2d30dbebb818da82946db373bd95c21ecb644ea2f58c14a40ddbb334aeede16c10fe87407a9b04c8aad89308ea SHA512 cae56fcb1a491193b10bd195b46f97043af30a340aac3a6abf82ed67380e5c0d6c8893c550c13f2feba6d6c5273dbbf305afb4b8808da958b86c0ce03ddbb7ef
+EBUILD containers-storage-9999.ebuild 841 BLAKE2B 767bbfc7a815dd17883d59bdc4e5a530a9140c2d30dbebb818da82946db373bd95c21ecb644ea2f58c14a40ddbb334aeede16c10fe87407a9b04c8aad89308ea SHA512 cae56fcb1a491193b10bd195b46f97043af30a340aac3a6abf82ed67380e5c0d6c8893c550c13f2feba6d6c5273dbbf305afb4b8808da958b86c0ce03ddbb7ef
+MISC metadata.xml 749 BLAKE2B ce52512722537fc1032a3ec28540328008665966819cf9faaa53144362bcc39a070452f688a429446fb9eaf5b55c185a4c16ccd3d3334ed632d87143acb25411 SHA512 05d49c0424b1d04dcc7a648968e41a1ef7f1c136e44d99d813708951231fb79069899304498cbd715f25785b63c6a38b66320bc670a72775a96a14079cd31864
diff --git a/app-containers/containers-storage/containers-storage-1.41.0.ebuild b/app-containers/containers-storage/containers-storage-1.41.0.ebuild
deleted file mode 100644
index c01863fdb218..000000000000
--- a/app-containers/containers-storage/containers-storage-1.41.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs +device-mapper test"
-SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RDEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )"
-DEPEND="${RDEPEND}
-	dev-go/go-md2man
-	test? (
-		sys-fs/btrfs-progs
-		sys-fs/lvm2
-		sys-apps/util-linux
-	)"
-RESTRICT="test"
-
-S=${WORKDIR}/${P#containers-}
-
-src_prepare() {
-	default
-
-	sed -e 's|: install\.tools|:|' -i Makefile || die
-
-	[[ -f hack/btrfs_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		"hack/btrfs_tag.sh" || die; }
-
-	[[ -f hack/libdm_tag.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
-		"hack/libdm_tag.sh" || die; }
-}
-
-src_compile() {
-	export -n GOCACHE GOPATH XDG_CACHE_HOME #678856
-	emake GOMD2MAN=go-md2man FFJSON= containers-storage docs
-}
-
-src_install() {
-	dobin "${PN}"
-	while read -r -d ''; do
-		mv "${REPLY}" "${REPLY%.1}" || die
-	done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0)
-	find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
-	env -u GOFLAGS unshare -m emake local-test-unit || die
-}
diff --git a/app-containers/containers-storage/containers-storage-1.42.0.ebuild b/app-containers/containers-storage/containers-storage-1.42.0.ebuild
deleted file mode 100644
index c01863fdb218..000000000000
--- a/app-containers/containers-storage/containers-storage-1.42.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs +device-mapper test"
-SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RDEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )"
-DEPEND="${RDEPEND}
-	dev-go/go-md2man
-	test? (
-		sys-fs/btrfs-progs
-		sys-fs/lvm2
-		sys-apps/util-linux
-	)"
-RESTRICT="test"
-
-S=${WORKDIR}/${P#containers-}
-
-src_prepare() {
-	default
-
-	sed -e 's|: install\.tools|:|' -i Makefile || die
-
-	[[ -f hack/btrfs_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		"hack/btrfs_tag.sh" || die; }
-
-	[[ -f hack/libdm_tag.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
-		"hack/libdm_tag.sh" || die; }
-}
-
-src_compile() {
-	export -n GOCACHE GOPATH XDG_CACHE_HOME #678856
-	emake GOMD2MAN=go-md2man FFJSON= containers-storage docs
-}
-
-src_install() {
-	dobin "${PN}"
-	while read -r -d ''; do
-		mv "${REPLY}" "${REPLY%.1}" || die
-	done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0)
-	find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
-	env -u GOFLAGS unshare -m emake local-test-unit || die
-}
diff --git a/app-containers/containers-storage/containers-storage-1.50.2.ebuild b/app-containers/containers-storage/containers-storage-1.50.2.ebuild
new file mode 100644
index 000000000000..523b3a92b7ba
--- /dev/null
+++ b/app-containers/containers-storage/containers-storage-1.50.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Default config and docs related to Containers' storage"
+HOMEPAGE="https://github.com/containers/storage"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/storage.git"
+else
+	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P#containers-}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND=">=dev-go/go-md2man-2.0.2"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/system-md2man-path.patch
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	emake -C docs containers-storage.conf.5
+}
+
+src_test() {
+	return
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C docs install
+
+	insinto /etc/containers
+	doins storage.conf
+}
diff --git a/app-containers/containers-storage/containers-storage-9999.ebuild b/app-containers/containers-storage/containers-storage-9999.ebuild
new file mode 100644
index 000000000000..523b3a92b7ba
--- /dev/null
+++ b/app-containers/containers-storage/containers-storage-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Default config and docs related to Containers' storage"
+HOMEPAGE="https://github.com/containers/storage"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/storage.git"
+else
+	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P#containers-}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND=">=dev-go/go-md2man-2.0.2"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/system-md2man-path.patch
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	emake -C docs containers-storage.conf.5
+}
+
+src_test() {
+	return
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C docs install
+
+	insinto /etc/containers
+	doins storage.conf
+}
diff --git a/app-containers/containers-storage/files/system-md2man-path.patch b/app-containers/containers-storage/files/system-md2man-path.patch
new file mode 100644
index 000000000000..f7d8d58aeb80
--- /dev/null
+++ b/app-containers/containers-storage/files/system-md2man-path.patch
@@ -0,0 +1,7 @@
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -1,2 +1,3 @@
+-GOMD2MAN = ../tests/tools/build/go-md2man
++GOMD2MAN = $(shell command -v go-md2man)
++
+ PREFIX ?= ${DESTDIR}/usr
diff --git a/app-containers/containers-storage/metadata.xml b/app-containers/containers-storage/metadata.xml
index e452dd2d6b3f..d0dc0f0abe1f 100644
--- a/app-containers/containers-storage/metadata.xml
+++ b/app-containers/containers-storage/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<use>
-		<flag name="btrfs">
-			Enables dependencies for the "btrfs" graph driver, including
-			necessary kernel flags.
-		</flag>
-		<flag name="device-mapper">
-			Enables dependencies for the "devicemapper" graph driver, including
-			necessary kernel flags.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">containers/storage</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+    <name>Zac Medico</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>rahil3108@gmail.com</email>
+    <name>Rahil Bhimjiani</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">containers/storage</remote-id>
+    <bugs-to>https://github.com/containers/storage/issues</bugs-to>
+    <doc>https://github.com/containers/storage/blob/main/README.md</doc>
+  </upstream>
 </pkgmetadata>