[gentoo-commits] repo/gentoo:master commit in: app-emulation/crun/, app-emulation/crun/files/

[Joonas Niilola]

commit:     789dd9cb8e9c3a64faec1282d9fbf4931e5061f8
Author:     Robert Günzler <r <AT> gnzler <DOT> io>
AuthorDate: Fri Jul 17 16:09:53 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 12:18:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789dd9cb

app-emulation/crun: Remove 0.13

Signed-off-by: Robert Günzler <r <AT> gnzler.io>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/crun/Manifest                        |  1 -
 app-emulation/crun/crun-0.13.ebuild                | 73 ----------------------
 ...ec-deduplicate-json_common-in-makefile-am.patch | 31 ---------
 3 files changed, 105 deletions(-)

diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest
index db514cf9c50..e95ed9bd252 100644
--- a/app-emulation/crun/Manifest
+++ b/app-emulation/crun/Manifest
@@ -1,3 +1,2 @@
-DIST crun-0.13.tar.gz 1305048 BLAKE2B fbffabf4cfc744522147b47c5e2bf2bc48e074866108ec4ec8ab94e7ebdc39451851696fabde268b5853e1c3fafb0ac93527e08fdb766acebdd7cf952a9e1a9e SHA512 314612eaf3097160e9369b3400ac8a83e173ef1a53295191c925e96212ba00d032883db1e4615b8ba42ddb08f1e31ca5e5088ea583a469835ac3c27087a88d6e
 DIST crun-0.14.1.tar.gz 1341891 BLAKE2B c20d5001161e298050ddca859fa78487fe3f8577ef0b06eb5515056f19ba4f981debeb684148de49111a0370b9bafb7f6454d65f7ecf087862c697a162c9b377 SHA512 420f1713653cbd17df83b2a63d163aaa41baf78115b093877a2241305e10b2ceeaf08ea6700658eca894729ff8a20cbc66f868d18d27fba3fbedf1a9993b122e
 DIST libcrun.lds 257 BLAKE2B 00e7cdf3162ea0b7231dbb9037b192bcf5ffa83316e1aa60268560bc9fe8302be351c405861f9dfc06620ea64561a9226f58b7133039c0af1299dc4088b98272 SHA512 0e9b836c79ee4ad7ff33c592eca8ff41f38aed588f2f5a2416bed82efa819cd4c61ad65a2dfd11a37838a19d950688b1d5adb3b75841963dbb589536e8a867f7

diff --git a/app-emulation/crun/crun-0.13.ebuild b/app-emulation/crun/crun-0.13.ebuild
deleted file mode 100644
index 5b014ac1198..00000000000
--- a/app-emulation/crun/crun-0.13.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
-HOMEPAGE="https://github.com/containers/crun"
-SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="bpf +caps doc seccomp systemd static-libs"
-
-DEPEND="
-	dev-libs/yajl
-	caps? ( sys-libs/libcap )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( dev-go/go-md2man )
-"
-
-# the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the privileges
-# required to create linux "containers".
-RESTRICT="test"
-
-DOCS=( README.md )
-
-PATCHES=(
-	# see https://709982.bugs.gentoo.org/attachment.cgi?id=614208
-	"${FILESDIR}/libocispec-deduplicate-json_common-in-makefile-am.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-criu \
-		$(use_enable bpf) \
-		$(use_enable caps) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(usex static-libs '--enabled-shared  --enabled-static' '--enable-shared --disable-static' '' '')
-}
-
-src_compile() {
-	emake -C libocispec
-	emake crun
-	if use doc ; then
-		emake generate-man
-	fi
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install-exec
-	if use doc ; then
-		emake "DESTDIR=${D}" install-man
-	fi
-
-	einstalldocs
-}

diff --git a/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch b/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch
deleted file mode 100644
index 234ac20ad8d..00000000000
--- a/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9d58891c058efa55c7b95cb90597d4cadc5c66d8 Mon Sep 17 00:00:00 2001
-From: Bruce Guenter <bruce@××××××××××.org>
-Date: Mon, 17 Feb 2020 13:54:14 -0600
-Subject: [PATCH] De-duplicate json_common in Makefile.am
-
-The source file src/json_common.c is listed twice in Makefile.am,
-leading libtool to produce an archive with duplicated symbols. This
-change removes the duplicate source.
-
-This was introduced in commit 2e318803a2c49521ea448e3ae010b1564a7e95ed
-
-Signed-off-by: Bruce Guenter <bruce@××××××××××.org>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 65bed45..c7ede83 100644
---- a/libocispec/Makefile.am
-+++ b/libocispec/Makefile.am
-@@ -7,7 +7,7 @@ GITIGNOREFILES = build-aux/ gtk-doc.make config.h.in aclocal.m4
- noinst_LTLIBRARIES = libocispec.la
- noinst_LIBRARIES = libocispec.a
-
--SOURCE_FILES = src/json_common.c \
-+SOURCE_FILES = \
-	src/image_spec_schema_config_schema.c \
-	src/image_spec_schema_content_descriptor.c \
-	src/image_spec_schema_defs.c \
---
-2.24.1