Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/
Date: Fri, 01 May 2020 17:57:43
Message-Id: 1588355851.160c813a710d08ee2123ed643016eb48b60ab9f5.pacho@gentoo
1 commit: 160c813a710d08ee2123ed643016eb48b60ab9f5
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 1 17:50:05 2020 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Fri May 1 17:57:31 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=160c813a
7
8 net-p2p/transmission: Migrate to 'appindicator' USE
9
10 Package-Manager: Portage-2.3.96, Repoman-2.3.22
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12
13 net-p2p/transmission/transmission-2.94-r1.ebuild | 10 +++++-----
14 net-p2p/transmission/transmission-9999.ebuild | 6 +++---
15 2 files changed, 8 insertions(+), 8 deletions(-)
16
17 diff --git a/net-p2p/transmission/transmission-2.94-r1.ebuild b/net-p2p/transmission/transmission-2.94-r1.ebuild
18 index 86c72f12f62..432fe079c92 100644
19 --- a/net-p2p/transmission/transmission-2.94-r1.ebuild
20 +++ b/net-p2p/transmission/transmission-2.94-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2019 Gentoo Authors
23 +# Copyright 1999-2020 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.t
28 # MIT is in several libtransmission/ headers
29 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
30 SLOT=0
31 -IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
32 +IUSE="appindicator gtk libressl lightweight systemd qt5 xfs"
33 KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux"
34
35 ACCT_DEPEND="
36 @@ -31,7 +31,7 @@ COMMON_DEPEND=">=dev-libs/libevent-2.0.10:=
37 >=dev-libs/dbus-glib-0.100
38 >=dev-libs/glib-2.32:2
39 >=x11-libs/gtk+-3.4:3
40 - ayatana? ( >=dev-libs/libappindicator-0.4.90:3 )
41 + appindicator? ( >=dev-libs/libappindicator-0.4.90:3 )
42 )
43 qt5? (
44 dev-qt/qtcore:5
45 @@ -53,7 +53,7 @@ DEPEND="${COMMON_DEPEND}
46 RDEPEND="${COMMON_DEPEND}
47 ${ACCT_DEPEND}"
48
49 -REQUIRED_USE="ayatana? ( gtk )"
50 +REQUIRED_USE="appindicator? ( gtk )"
51
52 DOCS=( AUTHORS NEWS qt/README.txt )
53
54 @@ -65,7 +65,7 @@ src_prepare() {
55 sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
56
57 # Trick to avoid automagic dependency
58 - if ! use ayatana ; then
59 + if ! use appindicator ; then
60 sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
61 fi
62
63
64 diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
65 index f7f2735ac3c..36907b345d4 100644
66 --- a/net-p2p/transmission/transmission-9999.ebuild
67 +++ b/net-p2p/transmission/transmission-9999.ebuild
68 @@ -21,7 +21,7 @@ HOMEPAGE="https://transmissionbt.com/"
69 # MIT is in several libtransmission/ headers
70 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
71 SLOT="0"
72 -IUSE="ayatana gtk libressl lightweight nls mbedtls qt5 systemd test"
73 +IUSE="appindicator gtk libressl lightweight nls mbedtls qt5 systemd test"
74 RESTRICT="!test? ( test )"
75
76 ACCT_DEPEND="
77 @@ -57,7 +57,7 @@ COMMON_DEPEND="
78 >=dev-libs/dbus-glib-0.100
79 >=dev-libs/glib-2.32:2
80 >=x11-libs/gtk+-3.4:3
81 - ayatana? ( >=dev-libs/libappindicator-0.4.30:3 )
82 + appindicator? ( >=dev-libs/libappindicator-0.4.30:3 )
83 )
84 qt5? (
85 dev-qt/qtcore:5
86 @@ -111,7 +111,7 @@ src_configure() {
87
88 -DWITH_CRYPTO=$(usex mbedtls polarssl openssl)
89 -DWITH_INOTIFY=ON
90 - -DWITH_LIBAPPINDICATOR=$(usex ayatana ON OFF)
91 + -DWITH_LIBAPPINDICATOR=$(usex appindicator ON OFF)
92 -DWITH_SYSTEMD=$(usex systemd ON OFF)
93 )