From d950fa39dbe16d164ed0cb8e3036fd5d0d896a4c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Oct 2017 15:47:53 +0000 Subject: gentoo resync : 31.10.2017 --- gnome-base/gnome-common/Manifest | 1 - gnome-base/gnome-common/gnome-common-3.18.0.ebuild | 25 ---- gnome-base/gnome-settings-daemon/Manifest | 1 - .../files/3.24.2-optional.patch | 145 --------------------- gnome-base/libgnome-keyring/Manifest | 2 +- .../libgnome-keyring-3.12.0-r1.ebuild | 2 +- 6 files changed, 2 insertions(+), 174 deletions(-) delete mode 100644 gnome-base/gnome-common/gnome-common-3.18.0.ebuild delete mode 100644 gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch (limited to 'gnome-base') diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest index ee7d72a0c039..fe52021f9a3e 100644 --- a/gnome-base/gnome-common/Manifest +++ b/gnome-base/gnome-common/Manifest @@ -1,6 +1,5 @@ DIST gnome-common-3.18.0.tar.xz 155804 SHA256 22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf SHA512 b931c9a6668d996560549738bb2d95f86f56fa68ce930c077275bdc8fddbc2d28d215c1190099db1df851417902fca87ec81f1c0e644c5b9630a175e1cde0719 WHIRLPOOL d84fbee01c1b51c333395998d98eeb2d31d60dbac6a624bdc066b62d1f583bd36759e8e46528970f12b786ccf2724ad8204af5dadaf75656d9b9b0567269f07e EBUILD gnome-common-3.18.0-r1.ebuild 663 SHA256 aef9eaecad9abcd4e41c04e7c4336b876f450ddd22194794923ab20464e428e4 SHA512 01df27dc01c1311bc12baf38362100058cb6592cebd2a7c2904e70e77cf1c37c5d36f3bebdcfc467cb94034e3f82ad3b24f2d44d8e59db2a1af54585b002e248 WHIRLPOOL b6fd3d8b9065007df297b1c3080488733a2b9b3966b4a8a93c993bb7819d898d0295478dd7cdacf50d403751a6fd716eb8afd7c762bb40c1d6b15681c29ab8d4 -EBUILD gnome-common-3.18.0.ebuild 752 SHA256 68fe51dcfeecedf208adb2cb2c523fd947a92048f61d2fd0a94d08a864190491 SHA512 ad16bc58c922293a52ba972b400d9ee9664cfd100bb86b13f29e636a5ecc6939af73a8923901d37248a94563fe39f51859639f6ce560fa1eff1f31d6a6f33a0b WHIRLPOOL d74c66b8c7cdf4e4c52bd27f390e1f016aa3eb661e9dc9e59ecc3524acc4c4843bb8c269b6ea01f97ccfb5c061e4d5154151c8234709be9ec3d0a2f29a768a63 MISC ChangeLog 4857 SHA256 97553f7e82ac1049085e32c39908a8e8f93696356163143179794e921fd88e78 SHA512 040839d6266c284f3e4926f347e724eb9331ee1a89b6472d24e55b10bc8c1e464fd6c005807ee49e35c75cf02840bf6959bdc462805d40dfdbb547e5d3d41a6b WHIRLPOOL 3220cd8f56431a2a7801f143961f70947bf27ee308a3ca5e576479699410eb400744f4cbb03785eebdb78a64c6ae4321e3dfe514a27f2bc3cfd6fd738da14210 MISC ChangeLog-2015 19149 SHA256 0f68d4914f9db2e6c7c5828d9f94c52c7a09082c41e5d66b5623305cbb880fcf SHA512 ede3324eeb8d1be3b78e0417b91e89556f75e9ec2b1a3d325372d13490749edf7fef1654309d80fc9f2ad3e6038c0ca9806110f1d3ad872b10dd63ec43f14eff WHIRLPOOL 10acc2908ecc5357df63763fbfb2b090b197bd68869cbd63ceae4425d4a98e4205064572f8c551ff4ea40ab311749e9d2182008d78fbf6c61d2f51bf068b1e53 MISC metadata.xml 423 SHA256 5f437a19b22ddcbcb9c86d13d17b2a4f7d86790cbe5c28567e0af9222ce1051f SHA512 267dd7f1897f75f178b4f83325117792d9bccfdc339327eb54b151452c65fedadd72b4c0205b00d18a9edd985dbb9cc32e11bf4e3b587a8dd3d6a3a9bc8d1183 WHIRLPOOL 31b79fa614ed401814c3c81f07fc5c9f499fa39b380f83e3fd42eced470a4cac1c4cd181b9df34a33e58117fa7b0fe21f53f774fb4e84cde2a2140cd9a2ab9c8 diff --git a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild deleted file mode 100644 index 6453ba4ad343..000000000000 --- a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Common files for development of Gnome packages" -HOMEPAGE="https://git.gnome.org/browse/gnome-common" - -LICENSE="GPL-3" -SLOT="3" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="+autoconf-archive" - -RDEPEND="autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 ) - !autoconf-archive? ( !>=sys-devel/autoconf-archive-2015.02.04 ) -" -DEPEND="" - -src_configure() { - gnome2_src_configure \ - $(use_with autoconf-archive) -} diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 9a6145d2639a..6ad8ef25835f 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,5 +1,4 @@ AUX 3.22.2-udevrulesdir-configure.patch 1858 SHA256 782b0514b340f8784718a7faa8e0101439df78e450a1538be0a06740930bb85b SHA512 f2435821bedcf8858c7017053ce0a55591d75da741ee00a1ba54ce70ab6839fe34183425d07a0ebf6ceb18051bdc4d21dd3027b893acfb8eecf05d02d826a020 WHIRLPOOL a38928768044da08bc8afda966d588b5a1edb69bc512ef17f88e86424411bcd04afc4600a65f9017c3facdb924d0b853223d89ad2bc7e1b9be51c62ab6492c4d -AUX 3.24.2-optional.patch 4458 SHA256 f25b04306b261df7b3dad8017762bbf7bf37592f9b16dcb9c872ddcc74d54a8e SHA512 f413f6697dc939fd9c28bd0297cdd04b7642c8cd8c078ecc7b99447d2fe3685e1247f96a318077becbc55db67adf594aef238b11167b19c84412c8e619884eae WHIRLPOOL 47723e658526bda65f5ad07035a094fec71d145186e519b6ed45522566a7fdcb03dcb87564f2f9360fcbfc491598d8af385b6dcce0be48f1a8bbbaa9b1be0410 AUX 3.24.2-reduce-memory-usage.patch 6121 SHA256 134ad864967d235285ffabfcec8be3da6682b2f8c41865d768c8db39fd9edcf9 SHA512 c6b172e171461d79f2dfc37b26a0f17a44b2bba0ce6392053129a9137b76c35956d9ab88e22e111d2613c0ff6ee2affc87756c8e0c4fd28d928d948feebd2a41 WHIRLPOOL 80bfb12f43c5d0fb3afe24546fe4d4145e0b016aa722f4f97fdd3d3e16b84b9bebe52a1af102abed29fe83e0acd47bbf210ad0926873617a1b1c9776261c7428 AUX 3.24.2-remove-unneeded-gtk-init.patch 2101 SHA256 d35369d941630890c646a551d9909a492587825797e0a8412f9ade64562ba4b3 SHA512 6da74748bbee31bb2b98ba090927c0e787552cabe2ef028781f3e12ccf9b444bf41480f561a307cc71777efaca23ce2f65e2ebb559a33b6a0d9a4270e9da5016 WHIRLPOOL 6f8fed9f64f2892063f314062c0c4fcecb767dfaf9c951ecb06c3bb8c50dc2bfc82d8ffaeb5a3556777e86ac53f072dec1a5ecbad53f3a59501366bfdaee39df AUX 3.24.2-udevrulesdir-configure.patch 1918 SHA256 8806dc4eaad81fb9484bac819d41aeb8ad5cad6bd9d97ee17feda601c28a8c34 SHA512 4d30c85add1c667a4c2fd712c7bf208f358a9313baf29172407eab4236817c86b30d8fca0141541abf8ff0ccd09f51065ceee12a2dbb39827d4facac255c8564 WHIRLPOOL bca5dd46e2a77126814c568f21276c84322ca85d8aa10130c99800dca7dd8f3e5f689b7875834140ea0ac5d2a62639f7a7badab915d7b02ddad5c28d5010868e diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch deleted file mode 100644 index 64c47a92e3f0..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 22f6a45b665e604f874e82a817d45bb976d8c5ae Mon Sep 17 00:00:00 2001 -From: Timo Tambet -Date: Sat, 25 Feb 2017 14:48:19 +0200 -Subject: [PATCH 1/1] [PATCH] Make colord and wacom support optional - ---- - configure.ac | 56 +++++++++++++++++++++++++++++++---------------- - plugins/Makefile.am | 9 ++++++-- - plugins/dummy/Makefile.am | 5 ++++- - 3 files changed, 48 insertions(+), 22 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0d169c8f..792195aa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD, - gtk+-x11-3.0 - x11) - --PKG_CHECK_MODULES(COLOR, -- colord >= 1.0.2 -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION -- libcanberra-gtk3 -- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION -- lcms2 >= $LCMS_REQUIRED_VERSION -- libnotify) -+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 -+ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION -+ lcms2 >= $LCMS_REQUIRED_VERSION -+ libnotify) -+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) -+ ]) -+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") - - PKG_CHECK_MODULES(DATETIME, - libnotify >= $LIBNOTIFY_REQUIRED_VERSION -@@ -268,23 +278,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 -- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION" -- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -- else -+ 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 "$enable_wacom" = "xyes"], -+ [ -+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -+ PKG_CHECK_MODULES(WACOM, [gtk+-3.0, 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 -- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) -- have_wacom=yes -+ ]) - fi - ;; - *) -- have_wacom=no -- ;; -+ have_wacom=no -+ ;; - esac --AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) -+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) - - dnl --------------------------------------------------------------------------- - dnl - common -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 9324b406..ee78d6d0 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 -diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am -index cb5856cf..06ac595a 100644 ---- a/plugins/dummy/Makefile.am -+++ b/plugins/dummy/Makefile.am -@@ -22,10 +22,13 @@ gsd_dummy_LDADD = $(DUMMY_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la - desktopdir = $(sysconfdir)/xdg/autostart - - desktop_DATA = -+if !BUILD_COLOR -+desktop_DATA += org.gnome.SettingsDaemon.Color.desktop -+endif - if !SMARTCARD_SUPPORT - desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop - endif --if !HAVE_WACOM -+if !BUILD_WACOM - desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop - endif - if !BUILD_PRINT_NOTIFICATIONS --- -2.11.1 - diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest index 069f075e3351..5916c92c8b5d 100644 --- a/gnome-base/libgnome-keyring/Manifest +++ b/gnome-base/libgnome-keyring/Manifest @@ -1,5 +1,5 @@ DIST libgnome-keyring-3.12.0.tar.xz 435092 SHA256 c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd WHIRLPOOL 8494913559cf057a77457bdafdff90099075421e88fa247e0215bd0dbb3f79ef41552c5825cfb99857b4f1bf9bc9d677facca779f9d6ed0892eabe9291e0d9a5 -EBUILD libgnome-keyring-3.12.0-r1.ebuild 1734 SHA256 d6b436780905691790bedf7a999a1bfb6ba833bd3ac7c42bdbf51f103b8ed371 SHA512 5ad4a75227990576871f963a12af6855b74aee134e422a65546e79e4fe2f49dc71ff41bc7ef9d2ea6a50a46f89cbc643e209b10d607f034e50d02e54bfddd85f WHIRLPOOL 6e55086f6aa64b9a65a995090a69d96cbb73fa742d6cf88fdeddd21b88bf76613ff61fe5f264699f9d9417d99ce7618f34f26497f6331964a9b22fbb7de7b32c +EBUILD libgnome-keyring-3.12.0-r1.ebuild 1733 SHA256 03e2c77e3f5ef38a11eefe5a6dca93df67155ecef13ff5303ef4fc7869be8ed5 SHA512 6cc37e90b95695cabd46e45eadc0a09c9bfb1cafdc28c064c1a4486f68e8537bb19d40c114c9d8b0497544b818e3934181faa630dea40475d00db0a1296e36a4 WHIRLPOOL cd4556c35e55d08777c3f5a5623ae1be558aa4b82be9a4d0414ebb228ad72f38fb1d89de61ba7e13d7c0be24f358a1bc23fd6e62b2680748fbf5737ebf05ba52 EBUILD libgnome-keyring-3.12.0.ebuild 1414 SHA256 2624013e4981abf60cfbc5023aa114571358e14428bd17c26b3b975220134a97 SHA512 a8040b8b5358dbe9861c8c515ae0bedb4ba5b93a5d15a77526f988ab856c2548e409e0b8b8b3daf34444bea0dfc7f7ee1db5075a44d8da19a77f6882c915c412 WHIRLPOOL fb3741703225f2e946b633c948c4b002b03603f50bd65bddf4ea2d37f27c1117fe7b1d72e51fd7edfcc811f0669b829097a24fc5cdffd30dcc435540e580d0f7 MISC ChangeLog 2921 SHA256 e6f16bdf5cfa7b3b1ed987f19a26945af47559977b417dfaa2462669bbfb6303 SHA512 c082b0af25702eabca23d551699a708f4ae8bf66b8e74e8a384ddb5461c2d50026233cfb6541518656cceca54272ef6006a3b2c23290c6e83a31159a9ee61bc4 WHIRLPOOL f76df2e9552c7759e5c2e6118f406e5e704c66f13e5d496e20224acab3511dfc9ab23edf9b044e56ff916ab25988853adbd7153f903f6919e2fbae03531964ed MISC ChangeLog-2015 10306 SHA256 ef98c776eb487f0fbcf93611ae9f4712b6314d4cd617bcc8edbec624f0615113 SHA512 6da704e6221847cdbd2649bad119df04b9023c6dfbc0898f4e510e1ae675dd3aa9ba880aa798ab055d5e0cf31c34e67261d36b27c060a95a313fb74f211444ad WHIRLPOOL 5c1d612955b859f592f06a3bfefc4997afee3c6a69d5950868a5a1a96fe1ba635140565e57262270899c3c29c7e13c1ab7fef6333c9658236c4f706164fd10ed diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild index d1b62da34294..d63dbd165905 100644 --- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild +++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild @@ -17,7 +17,7 @@ LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2 SLOT="0" IUSE="debug +introspection test vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris" RDEPEND=" >=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}] -- cgit v1.2.3