Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/
Date: Tue, 05 May 2020 08:47:06
Message-Id: 1588668394.5be52125efb92ff18bc1292022040a9608ad67a5.juippis@gentoo
1 commit: 5be52125efb92ff18bc1292022040a9608ad67a5
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Mon Feb 10 22:49:31 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue May 5 08:46:34 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be52125
7
8 net-im/bitlbee: use acct-{group,user}/bitlbee
9
10 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
11 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
12
13 net-im/bitlbee/bitlbee-3.5.1.ebuild | 11 ++++-------
14 net-im/bitlbee/bitlbee-3.6.ebuild | 11 ++++-------
15 net-im/bitlbee/bitlbee-9999.ebuild | 11 ++++-------
16 3 files changed, 12 insertions(+), 21 deletions(-)
17
18 diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild
19 index 3ce9cca1ef2..4d724abf2b8 100644
20 --- a/net-im/bitlbee/bitlbee-3.5.1.ebuild
21 +++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild
22 @@ -1,9 +1,9 @@
23 -# Copyright 1999-2019 Gentoo Authors
24 +# Copyright 1999-2020 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28
29 -inherit user systemd toolchain-funcs
30 +inherit systemd toolchain-funcs
31
32 if [[ ${PV} == "9999" ]]; then
33 EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
34 @@ -30,6 +30,8 @@ REQUIRED_USE="
35 "
36
37 COMMON_DEPEND="
38 + acct-group/bitlbee
39 + acct-user/bitlbee
40 >=dev-libs/glib-2.16
41 purple? ( net-im/pidgin )
42 libevent? ( dev-libs/libevent:= )
43 @@ -52,11 +54,6 @@ RDEPEND="${COMMON_DEPEND}
44 virtual/logger
45 xinetd? ( sys-apps/xinetd )"
46
47 -pkg_setup() {
48 - enewgroup bitlbee
49 - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
50 -}
51 -
52 src_prepare() {
53 if [[ ${PV} != "9999" ]]; then
54 eapply \
55
56 diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild
57 index 9df170295b6..6643e1c5920 100644
58 --- a/net-im/bitlbee/bitlbee-3.6.ebuild
59 +++ b/net-im/bitlbee/bitlbee-3.6.ebuild
60 @@ -1,9 +1,9 @@
61 -# Copyright 1999-2019 Gentoo Authors
62 +# Copyright 1999-2020 Gentoo Authors
63 # Distributed under the terms of the GNU General Public License v2
64
65 EAPI=7
66
67 -inherit user systemd toolchain-funcs
68 +inherit systemd toolchain-funcs
69
70 if [[ ${PV} == "9999" ]]; then
71 EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
72 @@ -30,6 +30,8 @@ REQUIRED_USE="
73 "
74
75 COMMON_DEPEND="
76 + acct-group/bitlbee
77 + acct-user/bitlbee
78 >=dev-libs/glib-2.16
79 purple? ( net-im/pidgin )
80 libevent? ( dev-libs/libevent:= )
81 @@ -51,11 +53,6 @@ DEPEND="${COMMON_DEPEND}
82 RDEPEND="${COMMON_DEPEND}
83 xinetd? ( sys-apps/xinetd )"
84
85 -pkg_setup() {
86 - enewgroup bitlbee
87 - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
88 -}
89 -
90 src_prepare() {
91 [[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch
92 eapply_user
93
94 diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
95 index 9df170295b6..6643e1c5920 100644
96 --- a/net-im/bitlbee/bitlbee-9999.ebuild
97 +++ b/net-im/bitlbee/bitlbee-9999.ebuild
98 @@ -1,9 +1,9 @@
99 -# Copyright 1999-2019 Gentoo Authors
100 +# Copyright 1999-2020 Gentoo Authors
101 # Distributed under the terms of the GNU General Public License v2
102
103 EAPI=7
104
105 -inherit user systemd toolchain-funcs
106 +inherit systemd toolchain-funcs
107
108 if [[ ${PV} == "9999" ]]; then
109 EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
110 @@ -30,6 +30,8 @@ REQUIRED_USE="
111 "
112
113 COMMON_DEPEND="
114 + acct-group/bitlbee
115 + acct-user/bitlbee
116 >=dev-libs/glib-2.16
117 purple? ( net-im/pidgin )
118 libevent? ( dev-libs/libevent:= )
119 @@ -51,11 +53,6 @@ DEPEND="${COMMON_DEPEND}
120 RDEPEND="${COMMON_DEPEND}
121 xinetd? ( sys-apps/xinetd )"
122
123 -pkg_setup() {
124 - enewgroup bitlbee
125 - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
126 -}
127 -
128 src_prepare() {
129 [[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch
130 eapply_user