From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1478590-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id DD8C015800F
	for <garchives@archives.gentoo.org>; Thu, 19 Jan 2023 10:39:03 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 12F56E0973;
	Thu, 19 Jan 2023 10:39:03 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id F24ECE0973
	for <gentoo-commits@lists.gentoo.org>; Thu, 19 Jan 2023 10:39:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id C6C9E340BF1
	for <gentoo-commits@lists.gentoo.org>; Thu, 19 Jan 2023 10:39:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F08C85C
	for <gentoo-commits@lists.gentoo.org>; Thu, 19 Jan 2023 10:38:58 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1674124726.56cec55d81f04119783d4ed5361cc55ff431f0dc.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/apptainer/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-containers/apptainer/Manifest app-containers/apptainer/apptainer-1.1.3.ebuild app-containers/apptainer/apptainer-1.1.5.ebuild
X-VCS-Directories: app-containers/apptainer/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: 56cec55d81f04119783d4ed5361cc55ff431f0dc
X-VCS-Branch: master
Date: Thu, 19 Jan 2023 10:38:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0045eb20-8dc5-422d-88a2-217c1ad94c13
X-Archives-Hash: 9fa5341f51a17b2d60b9ec098052985f

commit:     56cec55d81f04119783d4ed5361cc55ff431f0dc
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 10:05:49 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 10:38:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56cec55d

app-containers/apptainer: add 1.1.5, drop 1.1.3

Closes: https://bugs.gentoo.org/887575
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-containers/apptainer/Manifest                                 | 2 +-
 .../apptainer/{apptainer-1.1.3.ebuild => apptainer-1.1.5.ebuild}  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index 7afec17d5d0b..96eaa1486bf3 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1,2 +1,2 @@
 DIST apptainer-1.1.2.tar.gz 12896912 BLAKE2B 29a8df78617661e0a181955942e8321c112a69efaf15f4bb3e1563cc0789197916a3be1eb5396fb608d57b0edd5d5de2a70a2bda935095d8d511410660ebc106 SHA512 3fad253379a87ea790f22a14aec703296f606255d4ce847454a59f9dba0b9a6fc449489e7760c4696c1df90fc6abec198934310c1b762e33a83c72cafc7cb370
-DIST apptainer-1.1.3.tar.gz 12896905 BLAKE2B 100989c40625739d2c6e12ed73f41065d66c388015ebf9328f1f4d80421de46a907149ed1e8ca735bbb08d1fffcb35fe7e1db23d14466fdf6227f012d9fc82b5 SHA512 d6602cee3db9bd279b09a4cd4939a2e5474b53bcd323c181abcaedd671cefcdb47575801867fde2de5ae457aca6dc3318c2128eed20b2634bedcb3af9a06e915
+DIST apptainer-1.1.5.tar.gz 12915073 BLAKE2B 0cd696adb9f99782f6f1dd4d384f6aacb11a71f3df13c07775c376d42b88993ca82c02ad545a57b012a151403c3a3719e3e4512fe34e7de540d04d7d27ddf86f SHA512 e6a5d392f3874f093a8580508e83e270140ad52606c7856797e7e7665dd6687e63900984a4cb920c3cba9a4b7148047de4085a4353c9c77697b94f8d9cd099fc

diff --git a/app-containers/apptainer/apptainer-1.1.3.ebuild b/app-containers/apptainer/apptainer-1.1.5.ebuild
similarity index 93%
rename from app-containers/apptainer/apptainer-1.1.3.ebuild
rename to app-containers/apptainer/apptainer-1.1.5.ebuild
index 3134281dcb06..11042b31127b 100644
--- a/app-containers/apptainer/apptainer-1.1.3.ebuild
+++ b/app-containers/apptainer/apptainer-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -65,9 +65,11 @@ src_install() {
 	keepdir /var/${PN}/mnt/session
 
 	if use systemd; then
-		sed -i -e '/systemd cgroups/ s/no/yes/' "${ED}"/etc/${PN}/${PN}.conf || die "Failed to enable systemd use in configuration"
+		sed -i -e '/systemd cgroups/ s/no/yes/' "${ED}"/etc/${PN}/${PN}.conf \
+			|| die "Failed to enable systemd use in configuration"
 	else
-		sed -i -e '/systemd cgroups/ s/yes/no/' "${ED}"/etc/${PN}/${PN}.conf || die "Failed to disable systemd use in configuration"
+		sed -i -e '/systemd cgroups/ s/yes/no/' "${ED}"/etc/${PN}/${PN}.conf \
+			|| die "Failed to disable systemd use in configuration"
 	fi
 
 	einstalldocs