From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B3E4138350 for ; Tue, 17 Mar 2020 13:49:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AFB0E09C8; Tue, 17 Mar 2020 13:49:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED6D5E09C8 for ; Tue, 17 Mar 2020 13:49:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81BC134F19B for ; Tue, 17 Mar 2020 13:49:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FD18175 for ; Tue, 17 Mar 2020 13:49:22 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1584452951.59ab450e7a612e0215ecb7a5acb9de4c414b255d.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/swift/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/swift/metadata.xml sys-cluster/swift/swift-2.23.1-r1.ebuild sys-cluster/swift/swift-2.23.1-r2.ebuild X-VCS-Directories: sys-cluster/swift/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 59ab450e7a612e0215ecb7a5acb9de4c414b255d X-VCS-Branch: master Date: Tue, 17 Mar 2020 13:49:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 908ad728-159e-4a60-97f2-52aced33a4a0 X-Archives-Hash: dbfb4032e64b210b4dfef575a40ee47d commit: 59ab450e7a612e0215ecb7a5acb9de4c414b255d Author: Matthew Thode gentoo org> AuthorDate: Tue Mar 17 13:49:11 2020 +0000 Commit: Matthew Thode gentoo org> CommitDate: Tue Mar 17 13:49:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ab450e sys-cluster/swift: migration to user packages Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --force Signed-off-by: Matthew Thode gentoo.org> sys-cluster/swift/metadata.xml | 4 ---- .../{swift-2.23.1-r1.ebuild => swift-2.23.1-r2.ebuild} | 18 +++++++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/sys-cluster/swift/metadata.xml b/sys-cluster/swift/metadata.xml index 14aa35f3e4a..6a12c88d2a7 100644 --- a/sys-cluster/swift/metadata.xml +++ b/sys-cluster/swift/metadata.xml @@ -16,10 +16,6 @@ openstack@gentoo.org Openstack - - Swift is a highly available, distributed, eventually consistent object/blob - store. - swift diff --git a/sys-cluster/swift/swift-2.23.1-r1.ebuild b/sys-cluster/swift/swift-2.23.1-r2.ebuild similarity index 93% rename from sys-cluster/swift/swift-2.23.1-r1.ebuild rename to sys-cluster/swift/swift-2.23.1-r2.ebuild index 81130d620e2..0209967c131 100644 --- a/sys-cluster/swift/swift-2.23.1-r1.ebuild +++ b/sys-cluster/swift/swift-2.23.1-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_6 python3_7 ) -inherit distutils-r1 eutils linux-info user +inherit distutils-r1 eutils linux-info DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" HOMEPAGE="https://launchpad.net/swift" @@ -19,7 +19,7 @@ fi LICENSE="Apache-2.0" SLOT="0" -IUSE="account container doc +memcached object proxy" +IUSE="account container doc +memcached +object proxy" REQUIRED_USE="|| ( proxy account container object )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" @@ -40,7 +40,9 @@ RDEPEND=" >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] >=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}] memcached? ( net-misc/memcached ) - net-misc/rsync[xattr]" + net-misc/rsync[xattr] + acct-user/swift + acct-group/swift" pkg_pretend() { linux-info_pkg_setup @@ -54,11 +56,6 @@ pkg_pretend() { fi } -pkg_setup() { - enewuser swift - enewgroup swift -} - src_prepare() { sed -i 's/xattr/pyxattr/g' requirements.txt || die sed -i '/^hacking/d' test-requirements.txt || die @@ -87,8 +84,7 @@ python_install_all() { newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" newins "etc/proxy-server.conf-sample" "proxy-server.conf" if use memcached; then - sed -i '/depend/a\ - need memcached' "${D}/etc/init.d/swift-proxy" + sed -i '/depend/a\ need memcached' "${D}/etc/init.d/swift-proxy" fi fi if use account; then