From f8da8ce58cb0bf7fa750375577cd3230a31cf65f Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 22 Dec 2014 23:27:14 +0000 Subject: [PATCH] Version bump for Gnome 3.14. ppc and ppc64 keywords at bug #523468. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xC6085806 --- gnome-base/gnome-settings-daemon/ChangeLog | 9 +- gnome-base/gnome-settings-daemon/Manifest | 13 +-- ...nome-settings-daemon-3.14.0-optional.patch | 95 +++++++++++++++++++ ...ld => gnome-settings-daemon-3.14.2.ebuild} | 29 +++--- 4 files changed, 127 insertions(+), 19 deletions(-) create mode 100644 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch rename gnome-base/gnome-settings-daemon/{gnome-settings-daemon-3.12.2.ebuild => gnome-settings-daemon-3.14.2.ebuild} (80%) diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index 3589d9dacfaf..4e8192eb59ff 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gnome-settings-daemon # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.149 2014/12/19 13:37:30 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.150 2014/12/22 23:27:10 eva Exp $ + +*gnome-settings-daemon-3.14.2 (22 Dec 2014) + + 22 Dec 2014; Gilles Dartiguelongue + -gnome-settings-daemon-3.12.2.ebuild, +gnome-settings-daemon-3.14.2.ebuild, + +files/gnome-settings-daemon-3.14.0-optional.patch: + Version bump for Gnome 3.14. ppc and ppc64 keywords at bug #523468. 19 Dec 2014; Pacho Ramos gnome-settings-daemon-3.12.3.ebuild: diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 300e92622ca8..42f015904297 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -2,17 +2,18 @@ Hash: SHA256 AUX gnome-settings-daemon-3.12.0-optional.patch 3231 SHA256 02cba586c02849e7bb6662fed09e7ee43c375440088baba943ef676fd358dc9c SHA512 237212486b458144f5d795887fffbf29b0b8b2560eb4bb78b7dccf53dc1acd90f097bd47080d07d0b62a70c6df89b50b8891ebba2007253b2f5c182025297bf9 WHIRLPOOL d03bbc35493a63d226e8c703fac42052f45be3fd98c44f995b02c96b945dc13016b73b981d7bc13720e7cd9b06ca2736897c5f0cb09db5890faaf7baa04d48fe +AUX gnome-settings-daemon-3.14.0-optional.patch 3621 SHA256 f32703d16e3a4a3165ee1fc628766a64c469988a222f73e98a715f72b91c19f6 SHA512 b02efcb5030f9ea3694c7c320bf4efb73bedd7a55386f7a3a610e6f86fb20c4fb05162a6c9926ee4358c77ae6735d8809684be219d1ebb2844cf5a3a17213ba6 WHIRLPOOL 378bc84a3514f1eee18b4c249a05f8804340c9af1cdf1a9066c3c4cd9a22a25bb05393b3ee8d9e1c04fb745223e5a307e6578ef5cfe05c2fb1186820b69ffd4e AUX gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch 960 SHA256 d69495e4fca23d7faa7c9fefb0ec42d0d7d0769d3830f8cde08d5caea015138b SHA512 c431973f6d5b461a3d8bc1702522ac20d3c54252341e4ba5f712dd524a322e28d1a6a5f89920e9be9438217a6c418c5b254112be68f47d2ceb6b62790497e16f WHIRLPOOL dae508b8717d31bd6fa525d080c8f5d1e065b8d8c43102263760101cb48a7554e86887a5956efb3695023f412806fa67176f00d4de6ee614c630c56b3c46bfc6 -DIST gnome-settings-daemon-3.12.2.tar.xz 1672512 SHA256 e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f SHA512 d8063933ace4dfc9943991b5e6d29811546dec362cd3e26ec3c1c355ee2bbb854fb6fcc37ebaee78d70342ea2f6ae46325712dc6e20e6404ed54b0ee81c4bb8c WHIRLPOOL 977b689616645329dddeb515e0353927d901c8abf0f8033dd1fca245c77b71477249c5fd1abf82cb8ada25ec0d37a97eaf3af1f9d972f7d983d9e16aee4cd2c5 DIST gnome-settings-daemon-3.12.3.tar.xz 1632208 SHA256 4a92ad7090e76d621be181a48ede75a8da310e86e85d16cd82a9f5cf20297dbc SHA512 0e1f7a61c449ba0785f0d26cc681fe412c57b555aea4d4ac47f83c85147c4d1940c5a563b88e947728543822366703c7939bceaecc0b5f68817d87950a0de09d WHIRLPOOL bb9393e71d64f5b221082cff04b29c2b4eace0d0e56f547d1bafa4098d9dcfd9c953d73defaa8e3da1b060992c14717f06675a192e46dc7d262522331f8c0f2c -EBUILD gnome-settings-daemon-3.12.2.ebuild 4315 SHA256 e5678387e248c37a401097c471c84260caf512a66dc49dedab1dd3f9a79b21b0 SHA512 0ce16e3777c9ddea09fb1f75ec61d7e575ebb9b3403e78389406f7ac686dfdd12f0641b60f33a64ecb1d24cfa48a57eff9147afa88f4574f94ec7f8f24742ee4 WHIRLPOOL ffcc3d1072cae660e6e789a79424a0d9df12739a9c8267161e3c7ed53ebc7e0b1ecd3fac784472db4236b50066903a352dc52f2ca773076820e6692ec75a382f +DIST gnome-settings-daemon-3.14.2.tar.xz 1612184 SHA256 066bc8ed751c5f6b5a9590911a0fb2b51b0c3436ae1caccfa42e0791c34fedee SHA512 3cd125ed89d47b03439f473df861d41696f6281c9df84218f3fe29d86570fbcd13dd2bedb3f63b354e06043d7d8fda0d1304e03a6ca39b9bcbd369a908d88ba2 WHIRLPOOL 157195486a9ed8db18fe851ea8a567d2c53beeaf3cfc6d21f5e25a876f2e5b6847ccb6e848bae6accdd3861c96b16a0bfd5642f8e0fce3f8c3d4923599d49260 EBUILD gnome-settings-daemon-3.12.3.ebuild 4315 SHA256 47e7db4f62a4d7668168bcae48ff347c949fc001d9f857dfd74620640984f6e8 SHA512 ca562cf5e11153cdb766c4cb140df24ea1298613b8894931527aa86c07a6c040b5741be632477e748f3dc8f237fba401944e86b385b92dd5c71cfa9e9b7a03d8 WHIRLPOOL 93a71c7cb8850f0225ebc15e47a46ac5ff824bff5eaf460ffe21dfabc341ebd0928ac6e5a6360bf11d51fc38dee732545eda9b5ab950755b725bea02cc7ab6ca -MISC ChangeLog 30733 SHA256 7573a6176f1d298e36336672cc7a5c314444cc72d33ece1cad5e26c3357ab07b SHA512 6ea4ff429206e81eb2573b5507a5b0ef86b549b3e9172781d5fa5714ea8e79323fe140176bf3f8ae3886e54a0f26a684dc1ad926cf21b41e035f66b10a1b308b WHIRLPOOL 268e3e27222060b952c8a46d8da9719f6121baf7ef4632dbd34d37c9c43c92327efecca6f555c4809929e06575833c868ab5ff9882ee5b6ebed19ee3db95073b +EBUILD gnome-settings-daemon-3.14.2.ebuild 4482 SHA256 add81bf262cfd10207e936d2e8562a73148250ac6043147c52743fd186d53710 SHA512 cc7fc21181ae0b557ebdf2e21fd33fe0a1ab3aae76c118f4edb8ead3354a0362b9c72bbcc0670d17dba7791e251892ecb847d7f5a6dfaf8e94cc8693f3b7a057 WHIRLPOOL b65ace3920c7a820241adb5f6a61f56e8c92690ab1e1ce6311f7dd8c16988f6133c6ea60b4da526482b826c1bab58696158c971fd3231bdac1911b705acc497d +MISC ChangeLog 31033 SHA256 fff79699e11287c5a6d55876f0ffcf9c2b20bcb466eaf5e170ef40a7aadc5cab SHA512 c798a26da5a87c159adcf4e3e07705b8e354dc6392277f3af0740a016f3b0833efcc832fc1b498be01b30a29c23e2a3fcf58e5ea0baaea090602c4f5fed5e40b WHIRLPOOL 06bd09d0bb00299af7e7934f211f67efc6ddd1d3277762fcad0246bff4ce999a3d59707a5c86c19a309f05e7e68dcca1047c5dbcd01dc6d137589918ba2cabd3 MISC metadata.xml 845 SHA256 87b6e8c514c79aea8bdb954ca9f74f04b3306999182fa8ac411ff4e16826c45e SHA512 4356b3dec82fed1c90398069d4648d728de7931e18920fc6c09e9a6ba7225331d21ae240ff93d6d2e447d4c6e7caf86b770107451b2b39c79c4e7b301798b5bf WHIRLPOOL a6cf1dc73278bd537c4e0687256109740ba924967b16be1cdb03315fc4ede64aacfe58af18fc85cafa6c5c074c2be705ca5050d373db368242d13fe7f80b0202 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSUKhsACgkQCaWpQKGI+9RraACfb/4n1eVc4LcfvmpyCx/gFjwi -bFMAn3lzvQct1vr88/LL6lXSwR/UC8PT -=DGjQ +iEYEAREIAAYFAlSYqM8ACgkQ1fmVwcYIWAZtiQCgqWTJCv/7hNFZ+B2dhr+oajBv +720AoKKSLGAtjCkGCKZFNZA+67YqALLM +=mnIo -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch new file mode 100644 index 000000000000..a7a56b00f4a6 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch @@ -0,0 +1,95 @@ +From b9515b8ef35915fd1a9721e2eb6ca4e1272d0f47 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour +Date: Tue, 10 Dec 2013 00:27:27 +0100 +Subject: [PATCH] Make colord and wacom support optional + +--- + configure.ac | 35 +++++++++++++++++++++++++++++------ + plugins/Makefile.am | 7 ++++++- + 2 files changed, 35 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c42ea8b..26ccd36 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -225,7 +225,20 @@ dnl --------------------------------------------------------------------------- + dnl - color + dnl --------------------------------------------------------------------------- + +-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) ++AC_ARG_ENABLE([color], ++ AS_HELP_STRING([--disable-color], ++ [turn off color plugin]), ++ [with_color=$enableval], ++ [with_color=yes]) dnl Default value ++ ++if test x$with_color = xyes; then ++ PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) ++ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) ++fi ++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes") ++ ++AC_SUBST(COLOR_CFLAGS) ++AC_SUBST(COLOR_LIBS) + + dnl --------------------------------------------------------------------------- + dnl - datetime +@@ -256,15 +269,25 @@ case $host_os in + if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then + have_wacom=no + else ++ have_wacom=no + 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]) ++ AC_ARG_ENABLE([wacom], ++ AS_HELP_STRING([--disable-wacom], ++ [turn off wacom plugin]), ++ [with_wacom=$enableval], ++ [with_wacom=no]) dnl Default value ++ if test x$with_wacom = xyes; 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]) ++ have_wacom=yes ++ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) ++ fi ++ AC_SUBST(WACOM_CFLAGS) ++ AC_SUBST(WACOM_LIBS) + 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 + fi + ;; + *) +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 7bb01f0..7cc3655 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -4,7 +4,6 @@ enabled_plugins = \ + a11y-keyboard \ + a11y-settings \ + clipboard \ +- color \ + cursor \ + datetime \ + dummy \ +@@ -22,6 +21,12 @@ enabled_plugins = \ + + disabled_plugins = $(NULL) + ++if WITH_COLOR ++enabled_plugins += color ++else ++disabled_plugins += color ++endif ++ + if SMARTCARD_SUPPORT + enabled_plugins += smartcard + else +-- +2.1.2 + diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild similarity index 80% rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.2.ebuild rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild index 55c9d384ba91..45a52cc2557e 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.2.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild @@ -1,24 +1,25 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.2.ebuild,v 1.5 2014/09/26 20:36:22 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild,v 1.1 2014/12/22 23:27:10 eva Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -inherit autotools eutils gnome2 systemd udev virtualx +inherit autotools eutils gnome2 python-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 +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev" +IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland" REQUIRED_USE=" - packagekit? ( udev ) smartcard? ( udev ) + test? ( ${PYTHON_REQUIRED_USE} ) " -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" COMMON_DEPEND=" >=dev-libs/glib-2.37.7:2 @@ -51,15 +52,15 @@ COMMON_DEPEND=" colord? ( >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) - i18n? ( >=app-i18n/ibus-1.4.99 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) - packagekit? ( >=app-admin/packagekit-base-0.8.1 ) + networkmanager? ( >=net-misc/networkmanager-0.9.9.1 ) 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 # =dev-util/intltool-0.40 @@ -93,10 +97,10 @@ src_prepare() { # people, so revert it if USE=short-touchpad-timeout. # Revisit if/when upstream adds a setting for customizing the timeout. use short-touchpad-timeout && - epatch "${FILESDIR}/${PN}-3.7.90-short-touchpad-timeout.patch" + epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch # Make colord and wacom optional; requires eautoreconf - epatch "${FILESDIR}/${PN}-3.12.0-optional.patch" + epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch epatch_user eautoreconf @@ -112,14 +116,15 @@ src_configure() { $(use_enable cups) \ $(use_enable debug) \ $(use_enable debug more-warnings) \ - $(use_enable i18n ibus) \ - $(use_enable packagekit) \ + $(use_enable networkmanager network-manager) \ $(use_enable smartcard smartcard-support) \ $(use_enable udev gudev) \ - $(use_enable input_devices_wacom wacom) + $(use_enable input_devices_wacom wacom) \ + $(use_enable wayland) } src_test() { + python_export_best Xemake check } -- 2.26.2