commit: 6da92d43fd40ccf450ad0687a8ee7d719834e28b Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Mon Sep 25 16:54:18 2017 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Mon Sep 25 16:54:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da92d43
gnome-base/gnome-settings-daemon: remove old Package-Manager: Portage-2.3.6, Repoman-2.3.2 gnome-base/gnome-settings-daemon/Manifest | 1 - .../files/3.24.2-fix-color-tests.patch | 85 ----------- .../gnome-settings-daemon-3.22.2.ebuild | 149 ------------------- .../gnome-settings-daemon-3.24.2.ebuild | 160 --------------------- 4 files changed, 395 deletions(-) diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index bff715e5361..b185d4f051b 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,3 +1,2 @@ DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 SHA256 0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01 SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3 WHIRLPOOL edae1afc97a314f3d90c7d77d9a456e74e9fe9059353e15a5a9b8318c32d2ebad792e7c9b7acaf54a8f3ea11a5de629f06d7bdb9cb3d5bff4f0621fe6a50683a -DIST gnome-settings-daemon-3.24.2.tar.xz 1621368 SHA256 4aa9d72644e3ee8a30096a38986b0e9543fca92f586c561f6c8a11fb8148dcca SHA512 fa75a499750c9e8f8fd2c1af44d033e55f90f97ef39c4159fa58a2957aeae036b4ae505dede6333b640b0dfcd0400eacd3715aeb184fc021c1d787230b1a1f12 WHIRLPOOL 305f16567488b54be4f7ec359f4a1249c18de74e967a410e18fd4bc8b84748bd5146a3bd2b86852d9e6a37bc829b281e79a38c7a3cfcece5f80ae516d062780f DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 SHA256 68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593 SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6 WHIRLPOOL 90fa96f9e1c641a63ba4eac2160f6fbc141f31009eaa93be7a4d3737d086553bb5f3fec7a75c32c2e9a364071216a36c578948f60d89867b6e12f8d12948dab4 diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch deleted file mode 100644 index 70069589dae..00000000000 --- a/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 63b73af23efd97de34a9dde58938c5c772040974 Mon Sep 17 00:00:00 2001 -From: Iain Lane <[email protected]> -Date: Fri, 19 May 2017 16:38:07 +0100 -Subject: [PATCH] color: Make the testcase able to run uninstalled - -Distributions might want to be able to run their tests during package -builds, for example. - -Compile the schema and set GSETTINGS_SCHEMA_DIR to the build dir. - -https://bugzilla.gnome.org/show_bug.cgi?id=782170 ---- - Makefile.am | 2 +- - plugins/color/Makefile.am | 11 ++++++++++- - plugins/color/gcm-self-test.c | 6 ++++++ - 3 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 0a32954..096c245 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,8 +2,8 @@ NULL = - - SUBDIRS = \ - gnome-settings-daemon \ -- plugins \ - data \ -+ plugins \ - po \ - tests \ - $(NULL) -diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am -index a280ba8..35dcad4 100644 ---- a/plugins/color/Makefile.am -+++ b/plugins/color/Makefile.am -@@ -30,6 +30,15 @@ gcm_self_test_LDADD = \ - - TESTS = gcm-self-test - -+BUILT_SOURCES = gschemas.compiled -+ -+CLEANFILES = gschemas.compiled -+ -+gschemas.compiled: $(top_builddir)/data/org.gnome.settings-daemon.plugins.color.gschema.xml -+ $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --schema-file=$< --targetdir=$(builddir) -+ -+all-am: gschemas.compiled -+ - libexec_PROGRAMS = gsd-color - gsd_color_SOURCES = \ - main.c \ -@@ -80,7 +89,7 @@ EXTRA_DIST = \ - test-data/Lenovo-T61-Internal.bin \ - test-data/LG-L225W-External.bin - --CLEANFILES = \ -+CLEANFILES += \ - $(desktop_DATA) - - DISTCLEANFILES = \ -diff --git a/plugins/color/gcm-self-test.c b/plugins/color/gcm-self-test.c -index 83c06c5..3f00b60 100644 ---- a/plugins/color/gcm-self-test.c -+++ b/plugins/color/gcm-self-test.c -@@ -281,11 +281,17 @@ gcm_test_frac_day (void) - int - main (int argc, char **argv) - { -+ char *schema_dir; -+ - g_setenv ("GSETTINGS_BACKEND", "memory", TRUE); - - gtk_init (&argc, &argv); - g_test_init (&argc, &argv, NULL); - -+ schema_dir = g_test_build_filename (G_TEST_BUILT, "", NULL); -+ g_setenv("GSETTINGS_SCHEMA_DIR", schema_dir, TRUE); -+ g_free (schema_dir); -+ - g_test_add_func ("/color/edid", gcm_test_edid_func); - g_test_add_func ("/color/sunset-sunrise", gcm_test_sunset_sunrise); - g_test_add_func ("/color/sunset-sunrise/fractional-timezone", gcm_test_sunset_sunrise_fractional_timezone); --- -2.10.2 - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.ebuild deleted file mode 100644 index b748cd5fa44..00000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2.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 ~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 -} diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.2.ebuild deleted file mode 100644 index 2b68c5d1b65..00000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.2.ebuild +++ /dev/null @@ -1,160 +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,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 -PYTHON_COMPAT=( python2_7 ) - -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.44.0:2[dbus] - >=x11-libs/gtk+-3.15.3:3[X] - >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.23.3 - >=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 - !<gnome-base/gnome-session-3.23.2 -" -# xproto-7.0.15 needed for power plugin -DEPEND="${COMMON_DEPEND} - cups? ( sys-apps/sed ) - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') - gnome-base/gnome-session ) - dev-libs/libxml2:2 - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig - x11-proto/inputproto - x11-proto/xf86miscproto - x11-proto/kbproto - >=x11-proto/xproto-7.0.15 -" - -# TypeErrors with python3; weird test errors with python2; all in power component that was made required now -RESTRICT="test" -# RESTRICT="!test? ( test )" - -PATCHES=( - # Make colord and wacom optional; requires eautoreconf - "${FILESDIR}"/${PV}-optional.patch - # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf - "${FILESDIR}"/${PV}-udevrulesdir-configure.patch - # Fix uninstalled (during build) color plugin test run - "${FILESDIR}"/${PV}-fix-color-tests.patch - # Reduce memory usage by not initing GTK+ where not needed - "${FILESDIR}"/${PV}-remove-unneeded-gtk-init.patch - # Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf - "${FILESDIR}"/${PV}-reduce-memory-usage.patch -) - -python_check_deps() { - if use test; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && - has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --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 -}
