Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/
Date: Mon, 23 Dec 2019 21:27:06
Message-Id: 1577136348.5fc645e83cb65feb9bea88d0da3516828a5f73ab.leio@gentoo
1 commit: 5fc645e83cb65feb9bea88d0da3516828a5f73ab
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 23 21:21:06 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 23 21:25:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc645e8
7
8 gnome-base/gnome-settings-daemon: remove old
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 gnome-base/gnome-settings-daemon/Manifest | 2 -
14 .../gnome-settings-daemon-3.30.2-r1.ebuild | 137 ---------------------
15 2 files changed, 139 deletions(-)
16
17 diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
18 index 2a6ee2053d5..3cd58255783 100644
19 --- a/gnome-base/gnome-settings-daemon/Manifest
20 +++ b/gnome-base/gnome-settings-daemon/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST gnome-settings-daemon-3.30.2-patchset.tar.xz 20132 BLAKE2B b8f2573e806ee5aedcc1476de3550cdc39933c869d64c9d13e463cdf27fa7695e69e57612738fa5438988eda78ae998808508c94fbf841ec037eb1f103921458 SHA512 7318029f4145379b05f7a95686917b4ea7623fd0059559930072350db12170d6083d75c170578516bcede5282da677013086c343abe779b9d1696bd882b7e34d
23 -DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B a7cf276c5a802b7d9a6f738048b5bc34d97f79723c6f4cfb4f29ac3ed0f43e307cbdd6793e8d8115f51981ee576737d75c58531dcd5d0779d9f3670b68523a60 SHA512 517cb6bab3da10d5d47ab9c9690da3fa23e64d023d01b7cc101441f6b65639f3b6c8d0a0d19da80b22924b3dbe6430b2573fb861060f02fda248b24f00be5d84
24 DIST gnome-settings-daemon-3.32.1-patchset.tar.xz 9840 BLAKE2B 0b0249b6335fc64c111cfd4c221b408460105bd544527ca29a32b2ceb82d39c1ca8c9813916cde9afdac1cf146c1286ed937dadb07eb0263b5ab3ada2a95e0aa SHA512 175f4d0200b88b696b73fc7e7b10065b3e6f046e48955408cc438499fdc6464483420b4801dbb77b5ae819cb52a131e2594a628b9731eaa167b802b5b2cbe855
25 DIST gnome-settings-daemon-3.32.1.tar.xz 1372968 BLAKE2B ba0596d9f2019f2ecff32b70c03d962dd7966c282d1fb0ea94c38fc895b7ef788d9dd179a037b74a319ca520811e985465578a725bf14d1eff92846f188445ea SHA512 8d6aca1041cbd50d7dda67dc711269a51c4a5148d55dc63969f47c21bf309126f5d5cb13c1e6fa9e6498fbb30dc70fa7a049fead7d32c6a20d550da0ce8828c3
26
27 diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild
28 deleted file mode 100644
29 index 5f6e5cc909c..00000000000
30 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild
31 +++ /dev/null
32 @@ -1,137 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -PYTHON_COMPAT=( python{3_5,3_6,3_7} )
38 -
39 -inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
40 -
41 -DESCRIPTION="Gnome Settings Daemon"
42 -HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
43 -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
44 -
45 -LICENSE="GPL-2+ LGPL-2+"
46 -SLOT="0"
47 -IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland"
48 -REQUIRED_USE="
49 - ^^ ( elogind systemd )
50 - input_devices_wacom? ( udev )
51 - wayland? ( udev )
52 -"
53 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
54 -
55 -# >=polkit-0.114 for ITS translation rules of .policy files
56 -COMMON_DEPEND="
57 - >=sci-geosciences/geocode-glib-3.10
58 - >=dev-libs/glib-2.53.0:2
59 - >=gnome-base/gnome-desktop-3.11.1:3=
60 - >=gnome-base/gsettings-desktop-schemas-3.27.90
61 - >=x11-libs/gtk+-3.15.3:3[X,wayland?]
62 - >=dev-libs/libgweather-3.9.5:2=
63 - colord? (
64 - >=x11-misc/colord-1.0.2:=
65 - >=media-libs/lcms-2.2:2 )
66 - media-libs/libcanberra[gtk3]
67 - >=app-misc/geoclue-2.3.1:2.0
68 - >=x11-libs/libnotify-0.7.3
69 - >=media-sound/pulseaudio-2[glib]
70 - >=sys-auth/polkit-0.114
71 - >=sys-power/upower-0.99:=
72 - x11-libs/libX11
73 - x11-libs/libXtst
74 - udev? ( dev-libs/libgudev:= )
75 - wayland? ( dev-libs/wayland )
76 - input_devices_wacom? ( >=dev-libs/libwacom-0.7
77 - >=x11-libs/pango-1.20.0
78 - x11-libs/gdk-pixbuf:2 )
79 - smartcard? ( >=dev-libs/nss-3.11.2 )
80 - cups? ( >=net-print/cups-1.4[dbus] )
81 - networkmanager? ( >=net-misc/networkmanager-1.0 )
82 - media-libs/alsa-lib
83 - x11-libs/libXi
84 - x11-libs/libXext
85 - media-libs/fontconfig
86 -"
87 -# logind needed for power and session management, bug #464944
88 -# gnome-session-3.27.90 and gdm-3.27.9 adapt to A11yKeyboard component removal (moved to shell dealing with it)
89 -RDEPEND="${COMMON_DEPEND}
90 - gnome-base/dconf
91 - elogind? ( sys-auth/elogind )
92 - systemd? ( sys-apps/systemd )
93 - !<gnome-base/gnome-session-3.27.90
94 - !<gnome-base/gdm-3.27.90
95 -"
96 -# rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
97 -DEPEND="${COMMON_DEPEND}
98 - sys-kernel/linux-headers
99 - dev-util/glib-utils
100 - dev-util/gdbus-codegen
101 - x11-base/xorg-proto
102 - ${PYTHON_DEPS}
103 - test? (
104 - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
105 - $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
106 - gnome-base/gnome-session )
107 - >=sys-devel/gettext-0.19.8
108 - virtual/pkgconfig
109 -"
110 -
111 -# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.30+ (incompatible build system python needs until then as well)
112 -#RESTRICT="!test? ( test )"
113 -
114 -PATCHES=(
115 - # Translation updates from gnome-3-30 branch
116 - # Allow disabling udev and networkmanager on Linux
117 - # Make colord and wacom optional
118 - "${WORKDIR}"/patches/
119 -)
120 -
121 -python_check_deps() {
122 - if use test; then
123 - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
124 - has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
125 - fi
126 -}
127 -
128 -pkg_setup() {
129 - python-any-r1_pkg_setup
130 -}
131 -
132 -src_configure() {
133 - local emesonargs=(
134 - #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
135 - -Dudev_dir="$(get_udevdir)"
136 - -Dalsa=true
137 - $(meson_use udev gudev)
138 - $(meson_use colord)
139 - $(meson_use cups)
140 - $(meson_use networkmanager network_manager)
141 - -Drfkill=true
142 - $(meson_use smartcard)
143 - $(meson_use input_devices_wacom wacom)
144 - $(meson_use wayland)
145 - -Dexperimental_suspend_then_hibernate=false
146 - )
147 - meson_src_configure
148 -}
149 -
150 -src_install() {
151 - meson_src_install
152 - # Don't auto-suspend by default on AC power
153 - insinto /usr/share/glib-2.0/schemas
154 - doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override
155 -}
156 -
157 -src_test() {
158 - virtx meson_src_test
159 -}
160 -
161 -pkg_postinst() {
162 - xdg_pkg_postinst
163 - gnome2_schemas_update
164 -}
165 -
166 -pkg_postrm() {
167 - xdg_pkg_postrm
168 - gnome2_schemas_update
169 -}