| 1 |
commit: e37e07c96faead88e87c679fe78265903b1466ee |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 3 20:12:08 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 3 20:55:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37e07c9 |
| 7 |
|
| 8 |
gnome-base/gnome-settings-daemon: remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
gnome-base/gnome-settings-daemon/Manifest | 1 - |
| 13 |
.../files/3.22.2-udevrulesdir-configure.patch | 48 ------- |
| 14 |
.../gnome-settings-daemon-3.22.0-optional.patch | 111 --------------- |
| 15 |
.../gnome-settings-daemon-3.22.2-r1.ebuild | 149 --------------------- |
| 16 |
4 files changed, 309 deletions(-) |
| 17 |
|
| 18 |
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest |
| 19 |
index 58b5a2fa553..3d64a49cf41 100644 |
| 20 |
--- a/gnome-base/gnome-settings-daemon/Manifest |
| 21 |
+++ b/gnome-base/gnome-settings-daemon/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
-DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 BLAKE2B 4582793b2c13b4cecb1e93ff5053f94af16dc72436fbfe83a74b21b21c4bf8473409f52acae30e717176b01fd60165e43a69ae16787883ee862fe7fa3b9c448c SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3 |
| 24 |
DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 BLAKE2B f075abe574663cb9e6092e9698efb12d598584fe004042b5ac63df7e30ba9dfdb28ac4d0fac4148fa8fd49ccb6991414dc9a3dc49400efbe2cf4752d6295d62c SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6 |
| 25 |
|
| 26 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch |
| 27 |
deleted file mode 100644 |
| 28 |
index d0436ecdc6e..00000000000 |
| 29 |
--- a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,48 +0,0 @@ |
| 32 |
-From 19394974869513ab4a98d72593dce18f08105983 Mon Sep 17 00:00:00 2001 |
| 33 |
-From: Mart Raudsepp <leio@g.o> |
| 34 |
-Date: Tue, 21 Mar 2017 01:30:52 +0200 |
| 35 |
-Subject: [PATCH] build: Get udevrulesdir from pkg-config |
| 36 |
- |
| 37 |
-Use the standard way to find the udev rules directory via pkg-config by default, |
| 38 |
-and support specifying it, should it be necessary. |
| 39 |
-This is the same logic as in colord. |
| 40 |
---- |
| 41 |
- configure.ac | 9 +++++++++ |
| 42 |
- plugins/rfkill/Makefile.am | 1 - |
| 43 |
- 2 files changed, 9 insertions(+), 1 deletion(-) |
| 44 |
- |
| 45 |
-diff --git a/configure.ac b/configure.ac |
| 46 |
-index 8d4f5cb..5390404 100644 |
| 47 |
---- a/configure.ac |
| 48 |
-+++ b/configure.ac |
| 49 |
-@@ -135,6 +135,15 @@ fi |
| 50 |
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) |
| 51 |
- |
| 52 |
- dnl --------------------------------------------------------------------------- |
| 53 |
-+dnl - Where to install udev rules |
| 54 |
-+dnl --------------------------------------------------------------------------- |
| 55 |
-+AC_ARG_WITH([udevrulesdir], |
| 56 |
-+ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), |
| 57 |
-+ [], |
| 58 |
-+ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) |
| 59 |
-+AC_SUBST([udevrulesdir], [$with_udevrulesdir]) |
| 60 |
-+ |
| 61 |
-+dnl --------------------------------------------------------------------------- |
| 62 |
- dnl - ALSA integration (default enabled) |
| 63 |
- dnl --------------------------------------------------------------------------- |
| 64 |
- ALSA_PKG="" |
| 65 |
-diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am |
| 66 |
-index fed7adc..05f2c78 100644 |
| 67 |
---- a/plugins/rfkill/Makefile.am |
| 68 |
-+++ b/plugins/rfkill/Makefile.am |
| 69 |
-@@ -59,7 +59,6 @@ plugin_in_files = rfkill.gnome-settings-plugin.in |
| 70 |
- |
| 71 |
- plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) |
| 72 |
- |
| 73 |
--udevrulesdir = $(prefix)/lib/udev/rules.d |
| 74 |
- udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules |
| 75 |
- |
| 76 |
- EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA) |
| 77 |
--- |
| 78 |
-2.10.1 |
| 79 |
- |
| 80 |
|
| 81 |
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch |
| 82 |
deleted file mode 100644 |
| 83 |
index 9b5369bb346..00000000000 |
| 84 |
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch |
| 85 |
+++ /dev/null |
| 86 |
@@ -1,111 +0,0 @@ |
| 87 |
-From 2aa9a92b06418642339cf27a3df5051f63eb8ddb Mon Sep 17 00:00:00 2001 |
| 88 |
-From: Ole Reifschneider <mail@×××××××××××××××××.de> |
| 89 |
-Date: Sat, 11 Apr 2015 23:10:21 +0200 |
| 90 |
-Subject: [PATCH] Make colord and wacom support optional |
| 91 |
- |
| 92 |
---- |
| 93 |
- configure.ac | 41 ++++++++++++++++++++++++++++++----------- |
| 94 |
- plugins/Makefile.am | 9 +++++++-- |
| 95 |
- 2 files changed, 37 insertions(+), 13 deletions(-) |
| 96 |
- |
| 97 |
-diff --git a/configure.ac b/configure.ac |
| 98 |
-index 6d9408a..628af0e 100644 |
| 99 |
---- a/configure.ac |
| 100 |
-+++ b/configure.ac |
| 101 |
-@@ -245,7 +245,17 @@ dnl --------------------------------------------------------------------------- |
| 102 |
- dnl - color |
| 103 |
- dnl --------------------------------------------------------------------------- |
| 104 |
- |
| 105 |
--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION]) |
| 106 |
-+AC_ARG_ENABLE([color], |
| 107 |
-+ AS_HELP_STRING([--disable-color], |
| 108 |
-+ [turn off color plugin]), |
| 109 |
-+ [], |
| 110 |
-+ [enable_color=yes]) |
| 111 |
-+ |
| 112 |
-+AS_IF([test "$enable_color" = "yes"], |
| 113 |
-+ [PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION]) |
| 114 |
-+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) |
| 115 |
-+ ]) |
| 116 |
-+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") |
| 117 |
- |
| 118 |
- dnl --------------------------------------------------------------------------- |
| 119 |
- dnl - datetime |
| 120 |
-@@ -270,22 +280,31 @@ case $host_os in |
| 121 |
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
| 122 |
- have_wacom=no |
| 123 |
- else |
| 124 |
-- if test x$enable_gudev != xno; then |
| 125 |
-- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
| 126 |
-- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) |
| 127 |
-- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
| 128 |
-- else |
| 129 |
-- AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) |
| 130 |
-- fi |
| 131 |
-- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
| 132 |
-- have_wacom=yes |
| 133 |
-+ have_wacom=no |
| 134 |
-+ AS_IF([test "$enable_gudev" != "no"], |
| 135 |
-+ [AC_ARG_ENABLE([wacom], |
| 136 |
-+ AS_HELP_STRING([--disable-wacom], |
| 137 |
-+ [turn off wacom plugin]), |
| 138 |
-+ [], |
| 139 |
-+ [enable_wacom=no]) dnl Default value |
| 140 |
-+ AS_IF([test "x$enable_wacom" = "xyes"], |
| 141 |
-+ [ |
| 142 |
-+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
| 143 |
-+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) |
| 144 |
-+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
| 145 |
-+ have_wacom=yes |
| 146 |
-+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
| 147 |
-+ ]) |
| 148 |
-+ ], [ |
| 149 |
-+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) |
| 150 |
-+ ]) |
| 151 |
- fi |
| 152 |
- ;; |
| 153 |
- *) |
| 154 |
- have_wacom=no |
| 155 |
- ;; |
| 156 |
- esac |
| 157 |
--AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) |
| 158 |
-+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) |
| 159 |
- |
| 160 |
- dnl ============================================== |
| 161 |
- dnl smartcard section |
| 162 |
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am |
| 163 |
-index 9324b40..ee78d6d 100644 |
| 164 |
---- a/plugins/Makefile.am |
| 165 |
-+++ b/plugins/Makefile.am |
| 166 |
-@@ -4,7 +4,6 @@ enabled_plugins = \ |
| 167 |
- a11y-keyboard \ |
| 168 |
- a11y-settings \ |
| 169 |
- clipboard \ |
| 170 |
-- color \ |
| 171 |
- datetime \ |
| 172 |
- dummy \ |
| 173 |
- power \ |
| 174 |
-@@ -22,13 +21,19 @@ enabled_plugins = \ |
| 175 |
- |
| 176 |
- disabled_plugins = $(NULL) |
| 177 |
- |
| 178 |
-+if BUILD_COLOR |
| 179 |
-+enabled_plugins += color |
| 180 |
-+else |
| 181 |
-+disabled_plugins += color |
| 182 |
-+endif |
| 183 |
-+ |
| 184 |
- if SMARTCARD_SUPPORT |
| 185 |
- enabled_plugins += smartcard |
| 186 |
- else |
| 187 |
- disabled_plugins += smartcard |
| 188 |
- endif |
| 189 |
- |
| 190 |
--if HAVE_WACOM |
| 191 |
-+if BUILD_WACOM |
| 192 |
- enabled_plugins += wacom |
| 193 |
- else |
| 194 |
- disabled_plugins += wacom |
| 195 |
--- |
| 196 |
-2.10.1 |
| 197 |
- |
| 198 |
|
| 199 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild |
| 200 |
deleted file mode 100644 |
| 201 |
index 76625b33ba7..00000000000 |
| 202 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild |
| 203 |
+++ /dev/null |
| 204 |
@@ -1,149 +0,0 @@ |
| 205 |
-# Copyright 1999-2017 Gentoo Foundation |
| 206 |
-# Distributed under the terms of the GNU General Public License v2 |
| 207 |
- |
| 208 |
-EAPI=6 |
| 209 |
-GNOME2_EAUTORECONF="yes" |
| 210 |
-GNOME2_LA_PUNT="yes" |
| 211 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 212 |
- |
| 213 |
-inherit gnome2 python-any-r1 systemd udev virtualx |
| 214 |
- |
| 215 |
-DESCRIPTION="Gnome Settings Daemon" |
| 216 |
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" |
| 217 |
- |
| 218 |
-LICENSE="GPL-2+" |
| 219 |
-SLOT="0" |
| 220 |
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" |
| 221 |
-REQUIRED_USE=" |
| 222 |
- input_devices_wacom? ( udev ) |
| 223 |
- smartcard? ( udev ) |
| 224 |
-" |
| 225 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
| 226 |
- |
| 227 |
-COMMON_DEPEND=" |
| 228 |
- >=dev-libs/glib-2.37.7:2[dbus] |
| 229 |
- >=x11-libs/gtk+-3.15.3:3 |
| 230 |
- >=gnome-base/gnome-desktop-3.11.1:3= |
| 231 |
- >=gnome-base/gsettings-desktop-schemas-3.20 |
| 232 |
- >=gnome-base/librsvg-2.36.2:2 |
| 233 |
- media-fonts/cantarell |
| 234 |
- media-libs/alsa-lib |
| 235 |
- media-libs/fontconfig |
| 236 |
- media-libs/libcanberra[gtk3] |
| 237 |
- >=media-sound/pulseaudio-2 |
| 238 |
- >=sys-power/upower-0.99:= |
| 239 |
- x11-libs/cairo |
| 240 |
- x11-libs/gdk-pixbuf:2 |
| 241 |
- >=x11-libs/libnotify-0.7.3:= |
| 242 |
- x11-libs/libX11 |
| 243 |
- x11-libs/libxkbfile |
| 244 |
- x11-libs/libXi |
| 245 |
- x11-libs/libXext |
| 246 |
- x11-libs/libXfixes |
| 247 |
- x11-libs/libXtst |
| 248 |
- x11-libs/libXxf86misc |
| 249 |
- x11-misc/xkeyboard-config |
| 250 |
- |
| 251 |
- >=app-misc/geoclue-2.3.1:2.0 |
| 252 |
- >=dev-libs/libgweather-3.9.5:2= |
| 253 |
- >=sci-geosciences/geocode-glib-3.10 |
| 254 |
- >=sys-auth/polkit-0.103 |
| 255 |
- |
| 256 |
- colord? ( |
| 257 |
- >=media-libs/lcms-2.2:2 |
| 258 |
- >=x11-misc/colord-1.0.2:= ) |
| 259 |
- cups? ( >=net-print/cups-1.4[dbus] ) |
| 260 |
- input_devices_wacom? ( |
| 261 |
- >=dev-libs/libwacom-0.7 |
| 262 |
- >=x11-libs/pango-1.20 |
| 263 |
- x11-drivers/xf86-input-wacom |
| 264 |
- virtual/libgudev:= ) |
| 265 |
- networkmanager? ( >=net-misc/networkmanager-1.0 ) |
| 266 |
- smartcard? ( >=dev-libs/nss-3.11.2 ) |
| 267 |
- udev? ( virtual/libgudev:= ) |
| 268 |
- wayland? ( dev-libs/wayland ) |
| 269 |
-" |
| 270 |
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly |
| 271 |
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x |
| 272 |
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x |
| 273 |
-# systemd needed for power and session management, bug #464944 |
| 274 |
-RDEPEND="${COMMON_DEPEND} |
| 275 |
- gnome-base/dconf |
| 276 |
- !openrc-force? ( sys-apps/systemd ) |
| 277 |
- !<gnome-base/gnome-control-center-2.22 |
| 278 |
- !<gnome-extra/gnome-color-manager-3.1.1 |
| 279 |
- !<gnome-extra/gnome-power-manager-3.1.3 |
| 280 |
-" |
| 281 |
-# xproto-7.0.15 needed for power plugin |
| 282 |
-# FIXME: tests require dbus-mock |
| 283 |
-DEPEND="${COMMON_DEPEND} |
| 284 |
- cups? ( sys-apps/sed ) |
| 285 |
- test? ( |
| 286 |
- ${PYTHON_DEPS} |
| 287 |
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
| 288 |
- gnome-base/gnome-session ) |
| 289 |
- app-text/docbook-xsl-stylesheets |
| 290 |
- dev-libs/libxml2:2 |
| 291 |
- dev-libs/libxslt |
| 292 |
- sys-devel/gettext |
| 293 |
- >=dev-util/intltool-0.40 |
| 294 |
- virtual/pkgconfig |
| 295 |
- x11-proto/inputproto |
| 296 |
- x11-proto/xf86miscproto |
| 297 |
- >=x11-proto/xproto-7.0.15 |
| 298 |
-" |
| 299 |
- |
| 300 |
-PATCHES=( |
| 301 |
- # Make colord and wacom optional; requires eautoreconf |
| 302 |
- "${FILESDIR}"/${PN}-3.22.0-optional.patch |
| 303 |
- # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf |
| 304 |
- "${FILESDIR}"/${PV}-udevrulesdir-configure.patch |
| 305 |
-) |
| 306 |
- |
| 307 |
-python_check_deps() { |
| 308 |
- if use test; then |
| 309 |
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" |
| 310 |
- fi |
| 311 |
-} |
| 312 |
- |
| 313 |
-pkg_setup() { |
| 314 |
- use test && python-any-r1_pkg_setup |
| 315 |
-} |
| 316 |
- |
| 317 |
-src_configure() { |
| 318 |
- gnome2_src_configure \ |
| 319 |
- --disable-static \ |
| 320 |
- --enable-man \ |
| 321 |
- --with-udevrulesdir="$(get_udevdir)"/rules.d \ |
| 322 |
- $(use_enable colord color) \ |
| 323 |
- $(use_enable cups) \ |
| 324 |
- $(use_enable debug) \ |
| 325 |
- $(use_enable debug more-warnings) \ |
| 326 |
- $(use_enable networkmanager network-manager) \ |
| 327 |
- $(use_enable smartcard smartcard-support) \ |
| 328 |
- $(use_enable udev gudev) \ |
| 329 |
- $(use_enable input_devices_wacom wacom) \ |
| 330 |
- $(use_enable wayland) |
| 331 |
-} |
| 332 |
- |
| 333 |
-src_test() { |
| 334 |
- virtx emake check |
| 335 |
-} |
| 336 |
- |
| 337 |
-pkg_postinst() { |
| 338 |
- gnome2_pkg_postinst |
| 339 |
- |
| 340 |
- if ! systemd_is_booted; then |
| 341 |
- ewarn "${PN} needs Systemd to be *running* for working" |
| 342 |
- ewarn "properly. Please follow the this guide to migrate:" |
| 343 |
- ewarn "https://wiki.gentoo.org/wiki/Systemd" |
| 344 |
- fi |
| 345 |
- |
| 346 |
- if use openrc-force; then |
| 347 |
- ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," |
| 348 |
- ewarn "this can lead to unexpected problems and is not supported neither by" |
| 349 |
- ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," |
| 350 |
- ewarn "you will need to disable this USE flag system wide and retest before" |
| 351 |
- ewarn "opening any bug report." |
| 352 |
- fi |
| 353 |
-} |
Archives