From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- gnome-base/dconf/Manifest | 6 +-- gnome-base/dconf/dconf-0.32.0-r2.ebuild | 83 --------------------------------- gnome-base/dconf/dconf-0.34.0.ebuild | 2 +- gnome-base/dconf/dconf-0.36.0.ebuild | 82 ++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 87 deletions(-) delete mode 100644 gnome-base/dconf/dconf-0.32.0-r2.ebuild create mode 100644 gnome-base/dconf/dconf-0.36.0.ebuild (limited to 'gnome-base/dconf') diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest index 2621f3c8a4ba..88d4e129b37b 100644 --- a/gnome-base/dconf/Manifest +++ b/gnome-base/dconf/Manifest @@ -1,8 +1,8 @@ AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664 -DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0 DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 -EBUILD dconf-0.32.0-r2.ebuild 2190 BLAKE2B 0986b0dd27d8b5ba3e52e294fa9e7e790ce808b3596f024d62112e89270c55bf6dc22585115cd3d58a9d4459a3cd006c1cc38371100b866d92771733d5d89bc7 SHA512 3d089f03f7cff19d6bd49fefbac7238f23852dd5286fe41056df9df66e600b8aa0808572721fc92eab2e9152187634beba9bfbb91bbdcad5f5d3e2368e495754 -EBUILD dconf-0.34.0.ebuild 2193 BLAKE2B 95d0cb6215cf5dc6dd8191255f6eccca73a132b8ac7f3d7e8cf1ce47dd9fcbc2b73b66fa07589ab3eb64f4db884b2e525b507bfea049a52ff8af226a7231ecbc SHA512 f09632debd5baed6af367b42d5cc935ba3c49e63dbd5081a0abe4b1caccd22f202acffd13f3bbe8fae7cfb4e1c95e67f616eeff34d138c4a227fc463213ad608 +DIST dconf-0.36.0.tar.xz 114828 BLAKE2B 033cb2e095d9dac72bd07c5fa8280a3e1012aac6c1b0657d5455c2a519617be9112acca702ec4078554a814f36d12ee8e25201cc5b8aed2d33a32ef14e2f6fa5 SHA512 fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d +EBUILD dconf-0.34.0.ebuild 2192 BLAKE2B 74e61c5af928ef2effa2d23593105fa50e0487b3d842b39a66c210a1b06b194d34b95d03cfa536764971b29e5cc139776641f77accb85f8f3be5ccad478c59a1 SHA512 d474a1b2ec9f6d30579c853bdf9a7e53ee19913553a4c0d62adf586de5633552966e9567439f2769f7c671b87286c5eef613241d64d0d4caff624344b19d9902 +EBUILD dconf-0.36.0.ebuild 2105 BLAKE2B 16528c7e2df5b0ff7f8c85e55292acbf08669a71f63100eb8a49234b978cd2d62a1cff62f0feae9659e80625be2c2e6d0885edefa1fa7b00a12c34566f310ec8 SHA512 a1b8a9e92c24c790c66eef0e35c29136c71b0f073cece569519714aae3f32b5f96105baaa3f19a2d226423fb02bf7c5f0f5fbb22781acb1692211d1f55a8cea3 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/dconf/dconf-0.32.0-r2.ebuild b/gnome-base/dconf/dconf-0.32.0-r2.ebuild deleted file mode 100644 index 6d8ce55d9a8d..000000000000 --- a/gnome-base/dconf/dconf-0.32.0-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg - -DESCRIPTION="Simple low-level configuration system" -HOMEPAGE="https://wiki.gnome.org/Projects/dconf" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux" -IUSE="gtk-doc" -RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass - -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - sys-apps/dbus -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/gdbus-codegen - gtk-doc? ( >=dev-util/gtk-doc-1.15 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/0.30.1-bash-completion-dir.patch - "${FILESDIR}"/${PV}-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep - "${FILESDIR}"/${PV}-meson-0.52-compat.patch # https://gitlab.gnome.org/GNOME/dconf/issues/59 -) - -src_configure() { - local emesonargs=( - -Dbash_completion_dir="$(get_bashcompdir)" - -Dman=true - $(meson_use gtk-doc gtk_doc) - -Dvapi=true - ) - meson_src_configure -} - -src_install() { - meson_src_install - - # GSettings backend may be one of: memory, gconf, dconf - # Only dconf is really considered functional by upstream - # must have it enabled over gconf if both are installed - # This snippet can't be removed until gconf package is - # ensured to not install a /etc/env.d/50gconf and then - # still consider the CONFIG_PROTECT_MASK bit. - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf - doenvd 51dconf -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_giomodule_cache_update - - # Kill existing dconf-service processes as recommended by upstream due to - # possible changes in the dconf private dbus API. - # dconf-service will be dbus-activated on next use. - pids=$(pgrep -x dconf-service) - if [[ $? == 0 ]]; then - ebegin "Stopping dconf-service; it will automatically restart on demand" - kill ${pids} - eend $? - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_giomodule_cache_update -} diff --git a/gnome-base/dconf/dconf-0.34.0.ebuild b/gnome-base/dconf/dconf-0.34.0.ebuild index 3840c821289b..f8c053be7442 100644 --- a/gnome-base/dconf/dconf-0.34.0.ebuild +++ b/gnome-base/dconf/dconf-0.34.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux" IUSE="gtk-doc" RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass diff --git a/gnome-base/dconf/dconf-0.36.0.ebuild b/gnome-base/dconf/dconf-0.36.0.ebuild new file mode 100644 index 000000000000..37e1aae85828 --- /dev/null +++ b/gnome-base/dconf/dconf-0.36.0.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg + +DESCRIPTION="Simple low-level configuration system" +HOMEPAGE="https://wiki.gnome.org/Projects/dconf" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux" +IUSE="gtk-doc" +RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass + +RDEPEND=" + >=dev-libs/glib-2.44.0:2 + sys-apps/dbus +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/gdbus-codegen + gtk-doc? ( >=dev-util/gtk-doc-1.15 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/0.30.1-bash-completion-dir.patch + "${FILESDIR}"/0.32.0-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep +) + +src_configure() { + local emesonargs=( + -Dbash_completion_dir="$(get_bashcompdir)" + -Dman=true + $(meson_use gtk-doc gtk_doc) + -Dvapi=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # GSettings backend may be one of: memory, gconf, dconf + # Only dconf is really considered functional by upstream + # must have it enabled over gconf if both are installed + # This snippet can't be removed until gconf package is + # ensured to not install a /etc/env.d/50gconf and then + # still consider the CONFIG_PROTECT_MASK bit. + echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf + echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf + doenvd 51dconf +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_giomodule_cache_update + + # Kill existing dconf-service processes as recommended by upstream due to + # possible changes in the dconf private dbus API. + # dconf-service will be dbus-activated on next use. + pids=$(pgrep -x dconf-service) + if [[ $? == 0 ]]; then + ebegin "Stopping dconf-service; it will automatically restart on demand" + kill ${pids} + eend $? + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_giomodule_cache_update +} -- cgit v1.2.3