[gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/

[Joonas Niilola]

commit:     5be52125efb92ff18bc1292022040a9608ad67a5
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Feb 10 22:49:31 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> 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 <arkamar <AT> atlas.cz>
Signed-off-by: Joonas Niilola <juippis <AT> 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