diff options
author | Mart Raudsepp <leio@gentoo.org> | 2018-02-03 22:12:08 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2018-02-03 22:55:07 +0200 |
commit | e37e07c96faead88e87c679fe78265903b1466ee (patch) | |
tree | 347926508064d8c985885ef282e39982a3f484dd /gnome-base/gnome-settings-daemon | |
parent | gnome-base/gnome-session: remove old (diff) | |
download | gentoo-e37e07c96faead88e87c679fe78265903b1466ee.tar.gz gentoo-e37e07c96faead88e87c679fe78265903b1466ee.tar.bz2 gentoo-e37e07c96faead88e87c679fe78265903b1466ee.zip |
gnome-base/gnome-settings-daemon: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'gnome-base/gnome-settings-daemon')
4 files changed, 0 insertions, 309 deletions
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 58b5a2fa5530..3d64a49cf41a 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,2 +1 @@ -DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 BLAKE2B 4582793b2c13b4cecb1e93ff5053f94af16dc72436fbfe83a74b21b21c4bf8473409f52acae30e717176b01fd60165e43a69ae16787883ee862fe7fa3b9c448c SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3 DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 BLAKE2B f075abe574663cb9e6092e9698efb12d598584fe004042b5ac63df7e30ba9dfdb28ac4d0fac4148fa8fd49ccb6991414dc9a3dc49400efbe2cf4752d6295d62c SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6 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 deleted file mode 100644 index d0436ecdc6e1..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 19394974869513ab4a98d72593dce18f08105983 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Tue, 21 Mar 2017 01:30:52 +0200 -Subject: [PATCH] build: Get udevrulesdir from pkg-config - -Use the standard way to find the udev rules directory via pkg-config by default, -and support specifying it, should it be necessary. -This is the same logic as in colord. ---- - configure.ac | 9 +++++++++ - plugins/rfkill/Makefile.am | 1 - - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d4f5cb..5390404 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -135,6 +135,15 @@ fi - AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) - - dnl --------------------------------------------------------------------------- -+dnl - Where to install udev rules -+dnl --------------------------------------------------------------------------- -+AC_ARG_WITH([udevrulesdir], -+ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), -+ [], -+ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) -+AC_SUBST([udevrulesdir], [$with_udevrulesdir]) -+ -+dnl --------------------------------------------------------------------------- - dnl - ALSA integration (default enabled) - dnl --------------------------------------------------------------------------- - ALSA_PKG="" -diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am -index fed7adc..05f2c78 100644 ---- a/plugins/rfkill/Makefile.am -+++ b/plugins/rfkill/Makefile.am -@@ -59,7 +59,6 @@ plugin_in_files = rfkill.gnome-settings-plugin.in - - plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) - --udevrulesdir = $(prefix)/lib/udev/rules.d - udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules - - EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA) --- -2.10.1 - 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 deleted file mode 100644 index 9b5369bb3462..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 2aa9a92b06418642339cf27a3df5051f63eb8ddb Mon Sep 17 00:00:00 2001 -From: Ole Reifschneider <mail@ole-reifschneider.de> -Date: Sat, 11 Apr 2015 23:10:21 +0200 -Subject: [PATCH] Make colord and wacom support optional - ---- - configure.ac | 41 ++++++++++++++++++++++++++++++----------- - plugins/Makefile.am | 9 +++++++-- - 2 files changed, 37 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6d9408a..628af0e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -245,7 +245,17 @@ dnl --------------------------------------------------------------------------- - dnl - color - dnl --------------------------------------------------------------------------- - --PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION]) -+AC_ARG_ENABLE([color], -+ AS_HELP_STRING([--disable-color], -+ [turn off color plugin]), -+ [], -+ [enable_color=yes]) -+ -+AS_IF([test "$enable_color" = "yes"], -+ [PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION]) -+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) -+ ]) -+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") - - dnl --------------------------------------------------------------------------- - dnl - datetime -@@ -270,22 +280,31 @@ case $host_os in - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -- if test x$enable_gudev != xno; then -- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -- 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]) -- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -- else -- AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) -- fi -- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) -- have_wacom=yes -+ have_wacom=no -+ AS_IF([test "$enable_gudev" != "no"], -+ [AC_ARG_ENABLE([wacom], -+ AS_HELP_STRING([--disable-wacom], -+ [turn off wacom plugin]), -+ [], -+ [enable_wacom=no]) dnl Default value -+ AS_IF([test "x$enable_wacom" = "xyes"], -+ [ -+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -+ 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]) -+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -+ have_wacom=yes -+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) -+ ]) -+ ], [ -+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) -+ ]) - fi - ;; - *) - have_wacom=no - ;; - esac --AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) -+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) - - dnl ============================================== - dnl smartcard section -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 9324b40..ee78d6d 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -4,7 +4,6 @@ enabled_plugins = \ - a11y-keyboard \ - a11y-settings \ - clipboard \ -- color \ - datetime \ - dummy \ - power \ -@@ -22,13 +21,19 @@ enabled_plugins = \ - - disabled_plugins = $(NULL) - -+if BUILD_COLOR -+enabled_plugins += color -+else -+disabled_plugins += color -+endif -+ - if SMARTCARD_SUPPORT - enabled_plugins += smartcard - else - disabled_plugins += smartcard - endif - --if HAVE_WACOM -+if BUILD_WACOM - enabled_plugins += wacom - else - disabled_plugins += wacom --- -2.10.1 - 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 deleted file mode 100644 index 76625b33ba7b..000000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit gnome2 python-any-r1 systemd udev virtualx - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" -REQUIRED_USE=" - input_devices_wacom? ( udev ) - smartcard? ( udev ) -" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -COMMON_DEPEND=" - >=dev-libs/glib-2.37.7:2[dbus] - >=x11-libs/gtk+-3.15.3:3 - >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.20 - >=gnome-base/librsvg-2.36.2:2 - media-fonts/cantarell - media-libs/alsa-lib - media-libs/fontconfig - media-libs/libcanberra[gtk3] - >=media-sound/pulseaudio-2 - >=sys-power/upower-0.99:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/libnotify-0.7.3:= - x11-libs/libX11 - x11-libs/libxkbfile - x11-libs/libXi - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/libXxf86misc - x11-misc/xkeyboard-config - - >=app-misc/geoclue-2.3.1:2.0 - >=dev-libs/libgweather-3.9.5:2= - >=sci-geosciences/geocode-glib-3.10 - >=sys-auth/polkit-0.103 - - colord? ( - >=media-libs/lcms-2.2:2 - >=x11-misc/colord-1.0.2:= ) - cups? ( >=net-print/cups-1.4[dbus] ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=x11-libs/pango-1.20 - x11-drivers/xf86-input-wacom - virtual/libgudev:= ) - networkmanager? ( >=net-misc/networkmanager-1.0 ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - udev? ( virtual/libgudev:= ) - wayland? ( dev-libs/wayland ) -" -# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly -# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x -# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x -# systemd needed for power and session management, bug #464944 -RDEPEND="${COMMON_DEPEND} - gnome-base/dconf - !openrc-force? ( sys-apps/systemd ) - !<gnome-base/gnome-control-center-2.22 - !<gnome-extra/gnome-color-manager-3.1.1 - !<gnome-extra/gnome-power-manager-3.1.3 -" -# xproto-7.0.15 needed for power plugin -# FIXME: tests require dbus-mock -DEPEND="${COMMON_DEPEND} - cups? ( sys-apps/sed ) - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - gnome-base/gnome-session ) - app-text/docbook-xsl-stylesheets - dev-libs/libxml2:2 - dev-libs/libxslt - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig - x11-proto/inputproto - x11-proto/xf86miscproto - >=x11-proto/xproto-7.0.15 -" - -PATCHES=( - # Make colord and wacom optional; requires eautoreconf - "${FILESDIR}"/${PN}-3.22.0-optional.patch - # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf - "${FILESDIR}"/${PV}-udevrulesdir-configure.patch -) - -python_check_deps() { - if use test; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --enable-man \ - --with-udevrulesdir="$(get_udevdir)"/rules.d \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable debug more-warnings) \ - $(use_enable networkmanager network-manager) \ - $(use_enable smartcard smartcard-support) \ - $(use_enable udev gudev) \ - $(use_enable input_devices_wacom wacom) \ - $(use_enable wayland) -} - -src_test() { - virtx emake check -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! systemd_is_booted; then - ewarn "${PN} needs Systemd to be *running* for working" - ewarn "properly. Please follow the this guide to migrate:" - ewarn "https://wiki.gentoo.org/wiki/Systemd" - fi - - if use openrc-force; then - ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," - ewarn "this can lead to unexpected problems and is not supported neither by" - ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," - ewarn "you will need to disable this USE flag system wide and retest before" - ewarn "opening any bug report." - fi -} |