From 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2019 17:49:31 +0100 Subject: Revert "gentoo resync : 13.09.2019" This reverts commit a1392efe64137262023d92492396ca9156d22396. --- gnome-base/dconf/Manifest | 3 - gnome-base/dconf/dconf-0.32.0-r1.ebuild | 81 ---------------------- .../dconf/files/0.32.0-drop-vapigen-dep.patch | 44 ------------ 3 files changed, 128 deletions(-) delete mode 100644 gnome-base/dconf/dconf-0.32.0-r1.ebuild delete mode 100644 gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch (limited to 'gnome-base/dconf') diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest index b2c196e7858d..0d56b01ecb98 100644 --- a/gnome-base/dconf/Manifest +++ b/gnome-base/dconf/Manifest @@ -1,9 +1,6 @@ AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa -AUX 0.32.0-drop-vapigen-dep.patch 1113 BLAKE2B 17bc1da864e0a706aee7574115604e8bd8fa3048febdc2daa8bc0792a0ebd676d3ad3d334d1af86a4441d13074bf9dbf1a66c832d36c036b4909736f2c166aef SHA512 bca6484acb0a7cba34c16c3ac841970a93f4da3f439c7352824049641f256164588b7f184781b77e2d85e0906750b55573bcbd0a8819247f64bc702bf95e5231 DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da DIST dconf-0.30.1.tar.xz 104376 BLAKE2B c5a90c092b6e028dafbc9aee2f29f622dc4a696e815266355de4a056fe507b0cca9eaa9b10753501ee44f74ee57d0095fd55aafc7205ffea1f0321ed705dbe0b SHA512 f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03 -DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0 EBUILD dconf-0.26.1.ebuild 1498 BLAKE2B 7829c513e07d7d7f40404f18a173310b4d7f9d591650b807529512b37431c34404fbc8a3b02cf854044e450c6009eb02b1a5582dc930dac621aa2a961d46f14d SHA512 229b151dc70b0dffce0998fab2dcb6e7f8b44c518e9f07ca80340f53124b9a91cc6b2c1c2ca6c64be9704511ed46505ee3c6f45c14fe666f2e64ed96adeb5e7b EBUILD dconf-0.30.1.ebuild 1833 BLAKE2B 992db142e268c021eaaa09f4e923cd5a51d4a83648b042b6742cf4669a9897120ee96f2dbe3f83ecc999522a5c4396eb0def38825c029f0c9ddf62de8528ba48 SHA512 20bddd4e4399da71113e34a19436ca344564895d987fec4df19a86b476b3b581cb35cfcf642e86553b2c14a754df31dcdf9d6e547a8a5b2f68ed9f3f5ada94e4 -EBUILD dconf-0.32.0-r1.ebuild 2119 BLAKE2B ba1b3594c0879866da0dd7803b82e3db668a25fe2d6e9626a6ce14518438faaec23e4fb0b497afaba7efcac4fc0c4e2ef5ce4666ddef421bf29c9e2b4b6b4a09 SHA512 7680177935489778b066dfe7166029604aa57e6bd7bc465b68f0192719cce4b6b385474d06b11306bf34d615aafe79b6456dc51882102d1f1f1b3b33347aefa2 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/dconf/dconf-0.32.0-r1.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild deleted file mode 100644 index 8e9d9a0257d7..000000000000 --- a/gnome-base/dconf/dconf-0.32.0-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2019 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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} - 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 -) - -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/files/0.32.0-drop-vapigen-dep.patch b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch deleted file mode 100644 index 55959a7febf0..000000000000 --- a/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 22d4c12d73238d24b91a753c414c5f5a5a9c76b6 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 8 Sep 2019 14:17:20 +0300 -Subject: [PATCH] build: Don't hard require vapigen.pc - -.. by having a fallback to the well known location of packages shipped -vapi files ---- - client/meson.build | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/client/meson.build b/client/meson.build -index f3b7122..7dbca97 100644 ---- a/client/meson.build -+++ b/client/meson.build -@@ -57,17 +57,21 @@ pkg.generate( - ) - - if get_option('vapi') -- vapigen_dep = dependency('vapigen') -+ vapigen_dep = dependency('vapigen', required: false) - - vapi_data = files( - 'dconf.vapi', - 'dconf.deps', - ) - -- vapi_dir = vapigen_dep.get_pkgconfig_variable( -- 'vapidir', -- define_variable: ['datadir', dconf_datadir] -+ if vapigen_dep.found() -+ vapi_dir = vapigen_dep.get_pkgconfig_variable( -+ 'vapidir', -+ define_variable: ['datadir', dconf_datadir] - ) -+ else -+ vapi_dir = dconf_datadir / 'vala' / 'vapi' -+ endif - - install_data( - vapi_data, --- -2.20.1 - -- cgit v1.2.3