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 F1A35138351 for ; Tue, 5 May 2020 08:47:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B649E089F; Tue, 5 May 2020 08:47:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C2A2DE08A0 for ; Tue, 5 May 2020 08:47:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3EED234F630 for ; Tue, 5 May 2020 08:47:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6DAD226 for ; Tue, 5 May 2020 08:46:59 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1588668394.5be52125efb92ff18bc1292022040a9608ad67a5.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/bitlbee/bitlbee-3.5.1.ebuild net-im/bitlbee/bitlbee-3.6.ebuild net-im/bitlbee/bitlbee-9999.ebuild X-VCS-Directories: net-im/bitlbee/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 5be52125efb92ff18bc1292022040a9608ad67a5 X-VCS-Branch: master Date: Tue, 5 May 2020 08:46:59 +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: db15fe86-1798-4174-8ed3-e841bf5fbf99 X-Archives-Hash: 122cb412b024c1cce697b10d780270d0 commit: 5be52125efb92ff18bc1292022040a9608ad67a5 Author: Petr Vaněk atlas cz> AuthorDate: Mon Feb 10 22:49:31 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue May 5 08:46:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be52125 net-im/bitlbee: use acct-{group,user}/bitlbee Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.5.1.ebuild | 11 ++++------- net-im/bitlbee/bitlbee-3.6.ebuild | 11 ++++------- net-im/bitlbee/bitlbee-9999.ebuild | 11 ++++------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild index 3ce9cca1ef2..4d724abf2b8 100644 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit user systemd toolchain-funcs +inherit systemd toolchain-funcs if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git" @@ -30,6 +30,8 @@ REQUIRED_USE=" " COMMON_DEPEND=" + acct-group/bitlbee + acct-user/bitlbee >=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) @@ -52,11 +54,6 @@ RDEPEND="${COMMON_DEPEND} virtual/logger xinetd? ( sys-apps/xinetd )" -pkg_setup() { - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - src_prepare() { if [[ ${PV} != "9999" ]]; then eapply \ diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild index 9df170295b6..6643e1c5920 100644 --- a/net-im/bitlbee/bitlbee-3.6.ebuild +++ b/net-im/bitlbee/bitlbee-3.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit user systemd toolchain-funcs +inherit systemd toolchain-funcs if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git" @@ -30,6 +30,8 @@ REQUIRED_USE=" " COMMON_DEPEND=" + acct-group/bitlbee + acct-user/bitlbee >=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) @@ -51,11 +53,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} xinetd? ( sys-apps/xinetd )" -pkg_setup() { - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - src_prepare() { [[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch eapply_user diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild index 9df170295b6..6643e1c5920 100644 --- a/net-im/bitlbee/bitlbee-9999.ebuild +++ b/net-im/bitlbee/bitlbee-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit user systemd toolchain-funcs +inherit systemd toolchain-funcs if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git" @@ -30,6 +30,8 @@ REQUIRED_USE=" " COMMON_DEPEND=" + acct-group/bitlbee + acct-user/bitlbee >=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) @@ -51,11 +53,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} xinetd? ( sys-apps/xinetd )" -pkg_setup() { - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - src_prepare() { [[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch eapply_user