Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/
Date: Sun, 31 May 2020 09:44:24
Message-Id: 1590918251.6ab98c966613ad11358f8f97384ec44b9d084ef7.mgorny@gentoo
1 commit: 6ab98c966613ad11358f8f97384ec44b9d084ef7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 31 09:42:35 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun May 31 09:44:11 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab98c96
7
8 sys-devel/distcc: Remove USE=gnome w/ deprecated deps
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-devel/distcc/distcc-3.3.3-r1.ebuild | 20 ++++----------------
13 1 file changed, 4 insertions(+), 16 deletions(-)
14
15 diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
16 index 3ab5ecab6d3..62198b2b38a 100644
17 --- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
18 +++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
19 @@ -15,16 +15,10 @@ SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz"
20 LICENSE="GPL-2+"
21 SLOT="0"
22 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
23 -IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
24 +IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
25
26 CDEPEND="${PYTHON_DEPS}
27 dev-libs/popt
28 - gnome? (
29 - >=gnome-base/libgnome-2
30 - >=gnome-base/libgnomeui-2
31 - x11-libs/gtk+:2
32 - x11-libs/pango
33 - )
34 gssapi? ( net-libs/libgssglue )
35 gtk? ( x11-libs/gtk+:2 )
36 zeroconf? ( >=net-dns/avahi-0.6[dbus] )
37 @@ -84,7 +78,7 @@ src_configure() {
38 --libdir=/usr/lib
39 $(use_enable ipv6 rfc2553)
40 $(use_with gtk)
41 - $(use_with gnome)
42 + --without-gnome
43 $(use_with gssapi auth)
44 $(use_with zeroconf avahi)
45 )
46 @@ -137,7 +131,7 @@ src_install() {
47
48 dobin "${T}/distcc-config"
49
50 - if use gnome || use gtk; then
51 + if use gtk; then
52 einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
53 einfo "This is to have a little sensability in naming schemes between distccmon programs"
54 mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
55 @@ -170,8 +164,6 @@ pkg_postinst() {
56 eselect compiler-shadow update distccd
57 fi
58
59 - use gnome && xdg_desktop_database_update
60 -
61 elog
62 elog "Tips on using distcc with Gentoo can be found at"
63 elog "https://wiki.gentoo.org/wiki/Distcc"
64 @@ -182,7 +174,7 @@ pkg_postinst() {
65 elog "To use the distccmon programs with Gentoo you should use this command:"
66 elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
67
68 - if use gnome || use gtk; then
69 + if use gtk; then
70 elog "Or:"
71 elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
72 fi
73 @@ -200,7 +192,3 @@ pkg_prerm() {
74 eselect compiler-shadow remove distcc
75 fi
76 }
77 -
78 -pkg_postrm() {
79 - use gnome && xdg_desktop_database_update
80 -}