commit: 042fee9ddef2d2e9c5eab876b5b0a8e6038a7efe
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 03:06:17 2022 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 03:13:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042fee9d
app-containers/snapd: drop 2.54.3, 2.54.4
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-containers/snapd/Manifest | 2 -
app-containers/snapd/snapd-2.54.3.ebuild | 183 -------------------------------
app-containers/snapd/snapd-2.54.4.ebuild | 183 -------------------------------
3 files changed, 368 deletions(-)
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index 5347845a4cb6..a808820830e0 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,3 +1 @@
-DIST snapd-2.54.3.tar.xz 4831376 BLAKE2B
c74540e326e690ecced2e5dcab7246581e9f87412b2ba2fe16721fef5ec66eb20a915207e7c7d20579741929b0840760c336ebd75e4be77bc3f6d01e5909dad0
SHA512
ee89d7e02522ab9a50e17dbe34be19eeda10bf3518110e5c6b23987d618aaa324f762e745badb4e9d99e0b138788d1dc591802dd6c59e2ffc2ebec3eb384498f
-DIST snapd-2.54.4.tar.xz 4831036 BLAKE2B
b45ac9aacb0b023ab1cc79541dd97bda2d9f9a5987e9aa1a07b49b30667aa87fc38d74d24009f0ec6257cc8d764e2080cb4605cd5945bfc008f76008a1d29e0e
SHA512
267c9e4dab73990f2d2ebc9c035e02856ec04be9f96a7fa6994a1827b2bbe9f5fd3ba7e0fcc84a1fe1f04480ca8785a163ee42bbca05cde80ff197aa63eaad19
DIST snapd-2.55.2.tar.xz 6659212 BLAKE2B
a76cec2bf0f3c44212a20c8b0744e4327a725b28a0055be49dfbe638020532f4933c20edda3bdab20290d38f602459fd0962413a9c58400cdc8d6ef3b4634a41
SHA512
8fee8bb6ff52d3cbd5f0a9f206e7c93dea1b6c0ade9c2b6fbd7b0d729b6eeeb1fb01a28dab53543671c42ceac25d6d8932a8b4b9349332b0cde9b9226f6ec063
diff --git a/app-containers/snapd/snapd-2.54.3.ebuild
b/app-containers/snapd/snapd-2.54.3.ebuild
deleted file mode 100644
index bf6b2a0a243e..000000000000
--- a/app-containers/snapd/snapd-2.54.3.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/snapcore/${PN}"
-inherit autotools bash-completion-r1 flag-o-matic golang-vcs-snapshot
linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/";
-
-MY_S="${S}/src/github.com/snapcore/${PN}"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz
-> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
-
-CONFIG_CHECK="~CGROUPS
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~NAMESPACES
- ~SQUASHFS
- ~SQUASHFS_ZLIB
- ~SQUASHFS_LZO
- ~SQUASHFS_XZ
- ~BLK_DEV_LOOP
- ~SECCOMP
- ~SECCOMP_FILTER"
-
-RDEPEND="
- sys-libs/libseccomp:=
- apparmor? (
- sec-policy/apparmor-profiles
- sys-apps/apparmor:=
- )
- dev-libs/glib
- virtual/libudev
- systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
- sys-libs/libcap:=
- sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-lang/go-1.9
- dev-python/docutils
- sys-devel/gettext
- sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
- if use apparmor; then
- CONFIG_CHECK+=" ~SECURITY_APPARMOR"
- fi
- linux-info_pkg_setup
-
- # Seems to have issues building with -O3, switch to -O2
- replace-flags -O3 -O2
-}
-
-src_prepare() {
- default
- # Update apparmor profile to allow libtinfow.so*
- sed -i 's/libtinfo/libtinfo{,w}/' \
- "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
-
- if ! use forced-devmode; then
- sed -e 's#return !apparmorFull#if !apparmorFull
{\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
- -i "${MY_S}/sandbox/forcedevmode.go" || die
- grep -q 'panic("USE=forced-devmode is disabled")'
"${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
- fi
-
- sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh"
|| die
-
- pushd "${MY_S}" >/dev/null || die
- ./mkversion.sh "${PV}"
- popd >/dev/null || die
- pushd "${MY_S}/cmd" >/dev/null || die
- eautoreconf
-}
-
-src_configure() {
- SNAPD_MAKEARGS=(
- "BINDIR=${EPREFIX}/usr/bin"
- "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
- "LIBEXECDIR=${EPREFIX}/usr/lib"
- "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
- "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
- )
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
-
- pushd "${MY_S}/cmd" >/dev/null || die
- econf --libdir="${EPREFIX}/usr/lib" \
- --libexecdir="${EPREFIX}/usr/lib/snapd" \
- $(use_enable apparmor) \
- --enable-nvidia-biarch \
- --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
-
- local file
- for file in "${MY_S}/po/"*.po; do
- msgfmt "${file}" -o "${file%.po}.mo" || die
- done
-
- emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
-
- local -a flags=(-buildmode=pie -ldflags "-s -linkmode external
-extldflags '${LDFLAGS}'" -trimpath)
- local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external
-extldflags '${LDFLAGS} -static'" -trimpath)
-
- local cmd
- for cmd in snap snapd snap-bootstrap snap-failure snap-preseed
snap-recovery-chooser snap-repair snap-seccomp; do
- go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
- for cmd in snapctl snap-exec snap-update-ns; do
- go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
-}
-
-src_install() {
- emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
- emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
- if use apparmor; then
- mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} ||
die
- keepdir /var/lib/snapd/apparmor/profiles
- fi
- keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
- fperms 700 /var/lib/snapd/{cache,cookie}
-
- dobin "${GOBIN}/"{snap,snapctl}
- ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
- exeinto /usr/lib/snapd
- doexe
"${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns}
\
-
"${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt}
\
- "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
- dobashcomp "${MY_S}/data/completion/bash/snap"
-
- insinto /usr/share/zsh/site-functions
- doins "${MY_S}/data/completion/zsh/_snap"
-
- insinto "/usr/share/polkit-1/actions"
- doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
-
- dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
- domo "${MY_S}/po/"*.mo
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- xdg_desktop_database_update
-
- if use apparmor && [[ -z ${ROOT} && -e
/sys/kernel/security/apparmor/profiles &&
- $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
- apparmor_parser -r
"${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-containers/snapd/snapd-2.54.4.ebuild
b/app-containers/snapd/snapd-2.54.4.ebuild
deleted file mode 100644
index bf6b2a0a243e..000000000000
--- a/app-containers/snapd/snapd-2.54.4.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/snapcore/${PN}"
-inherit autotools bash-completion-r1 flag-o-matic golang-vcs-snapshot
linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/";
-
-MY_S="${S}/src/github.com/snapcore/${PN}"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz
-> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
-
-CONFIG_CHECK="~CGROUPS
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~NAMESPACES
- ~SQUASHFS
- ~SQUASHFS_ZLIB
- ~SQUASHFS_LZO
- ~SQUASHFS_XZ
- ~BLK_DEV_LOOP
- ~SECCOMP
- ~SECCOMP_FILTER"
-
-RDEPEND="
- sys-libs/libseccomp:=
- apparmor? (
- sec-policy/apparmor-profiles
- sys-apps/apparmor:=
- )
- dev-libs/glib
- virtual/libudev
- systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
- sys-libs/libcap:=
- sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-lang/go-1.9
- dev-python/docutils
- sys-devel/gettext
- sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
- if use apparmor; then
- CONFIG_CHECK+=" ~SECURITY_APPARMOR"
- fi
- linux-info_pkg_setup
-
- # Seems to have issues building with -O3, switch to -O2
- replace-flags -O3 -O2
-}
-
-src_prepare() {
- default
- # Update apparmor profile to allow libtinfow.so*
- sed -i 's/libtinfo/libtinfo{,w}/' \
- "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
-
- if ! use forced-devmode; then
- sed -e 's#return !apparmorFull#if !apparmorFull
{\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
- -i "${MY_S}/sandbox/forcedevmode.go" || die
- grep -q 'panic("USE=forced-devmode is disabled")'
"${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
- fi
-
- sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh"
|| die
-
- pushd "${MY_S}" >/dev/null || die
- ./mkversion.sh "${PV}"
- popd >/dev/null || die
- pushd "${MY_S}/cmd" >/dev/null || die
- eautoreconf
-}
-
-src_configure() {
- SNAPD_MAKEARGS=(
- "BINDIR=${EPREFIX}/usr/bin"
- "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
- "LIBEXECDIR=${EPREFIX}/usr/lib"
- "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
- "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
- )
- export CGO_ENABLED="1"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
-
- pushd "${MY_S}/cmd" >/dev/null || die
- econf --libdir="${EPREFIX}/usr/lib" \
- --libexecdir="${EPREFIX}/usr/lib/snapd" \
- $(use_enable apparmor) \
- --enable-nvidia-biarch \
- --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}"
-
- local file
- for file in "${MY_S}/po/"*.po; do
- msgfmt "${file}" -o "${file%.po}.mo" || die
- done
-
- emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}"
-
- local -a flags=(-buildmode=pie -ldflags "-s -linkmode external
-extldflags '${LDFLAGS}'" -trimpath)
- local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external
-extldflags '${LDFLAGS} -static'" -trimpath)
-
- local cmd
- for cmd in snap snapd snap-bootstrap snap-failure snap-preseed
snap-recovery-chooser snap-repair snap-seccomp; do
- go build -o "${GOBIN}/${cmd}" "${flags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
- for cmd in snapctl snap-exec snap-update-ns; do
- go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
- -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
- [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
- done
-}
-
-src_install() {
- emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
- emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
- if use apparmor; then
- mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} ||
die
- keepdir /var/lib/snapd/apparmor/profiles
- fi
- keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
- fperms 700 /var/lib/snapd/{cache,cookie}
-
- dobin "${GOBIN}/"{snap,snapctl}
- ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
- exeinto /usr/lib/snapd
- doexe
"${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns}
\
-
"${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt}
\
- "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
- dobashcomp "${MY_S}/data/completion/bash/snap"
-
- insinto /usr/share/zsh/site-functions
- doins "${MY_S}/data/completion/zsh/_snap"
-
- insinto "/usr/share/polkit-1/actions"
- doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy"
-
- dodoc "${MY_S}/packaging/ubuntu-16.04/changelog"
- domo "${MY_S}/po/"*.mo
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- xdg_desktop_database_update
-
- if use apparmor && [[ -z ${ROOT} && -e
/sys/kernel/security/apparmor/profiles &&
- $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
- apparmor_parser -r
"${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
