Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/
Date: Wed, 01 Jan 2020 16:07:03
Message-Id: 1577894804.e2d8858cc0c90a90ccdc98c13c52f5714d2e5141.leio@gentoo
1 commit: e2d8858cc0c90a90ccdc98c13c52f5714d2e5141
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 1 15:57:50 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 1 16:06:44 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d8858c
7
8 gnome-base/dconf: remove old
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 gnome-base/dconf/Manifest | 1 -
14 gnome-base/dconf/dconf-0.30.1.ebuild | 82 --------------------------------
15 gnome-base/dconf/dconf-0.32.0-r1.ebuild | 83 ---------------------------------
16 3 files changed, 166 deletions(-)
17
18 diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
19 index d4f2717e402..94a45c720e6 100644
20 --- a/gnome-base/dconf/Manifest
21 +++ b/gnome-base/dconf/Manifest
22 @@ -1,3 +1,2 @@
23 DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da
24 -DIST dconf-0.30.1.tar.xz 104376 BLAKE2B c5a90c092b6e028dafbc9aee2f29f622dc4a696e815266355de4a056fe507b0cca9eaa9b10753501ee44f74ee57d0095fd55aafc7205ffea1f0321ed705dbe0b SHA512 f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03
25 DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0
26
27 diff --git a/gnome-base/dconf/dconf-0.30.1.ebuild b/gnome-base/dconf/dconf-0.30.1.ebuild
28 deleted file mode 100644
29 index e52bab8ebd0..00000000000
30 --- a/gnome-base/dconf/dconf-0.30.1.ebuild
31 +++ /dev/null
32 @@ -1,82 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -inherit bash-completion-r1 gnome.org gnome2-utils meson vala virtualx xdg
38 -
39 -DESCRIPTION="Simple low-level configuration system"
40 -HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
41 -
42 -LICENSE="LGPL-2.1+"
43 -SLOT="0"
44 -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
45 -IUSE="gtk-doc"
46 -
47 -RDEPEND="
48 - >=dev-libs/glib-2.44.0:2
49 - sys-apps/dbus
50 -"
51 -DEPEND="${RDEPEND}
52 - $(vala_depend)
53 - app-text/docbook-xml-dtd:4.2
54 - app-text/docbook-xsl-stylesheets
55 - dev-libs/libxslt
56 - dev-util/gdbus-codegen
57 - gtk-doc? ( >=dev-util/gtk-doc-1.15 )
58 - >=sys-devel/gettext-0.19.8
59 - virtual/pkgconfig
60 - <dev-util/meson-0.52
61 -" # problem with meson-0.52+ https://gitlab.gnome.org/GNOME/dconf/issues/59
62 -
63 -PATCHES=(
64 - "${FILESDIR}"/${PV}-bash-completion-dir.patch
65 -)
66 -
67 -src_prepare() {
68 - xdg_src_prepare
69 - vala_src_prepare
70 -}
71 -
72 -src_configure() {
73 - local emesonargs=(
74 - -Dbash_completion_dir="$(get_bashcompdir)"
75 - -Dman=true
76 - $(meson_use gtk-doc gtk_doc)
77 - )
78 - meson_src_configure
79 -}
80 -
81 -src_test() {
82 - virtx meson_src_test
83 -}
84 -
85 -src_install() {
86 - meson_src_install
87 -
88 - # GSettings backend may be one of: memory, gconf, dconf
89 - # Only dconf is really considered functional by upstream
90 - # must have it enabled over gconf if both are installed
91 - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
92 - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
93 - doenvd 51dconf
94 -}
95 -
96 -pkg_postinst() {
97 - xdg_pkg_postinst
98 - gnome2_giomodule_cache_update
99 -
100 - # Kill existing dconf-service processes as recommended by upstream due to
101 - # possible changes in the dconf private dbus API.
102 - # dconf-service will be dbus-activated on next use.
103 - pids=$(pgrep -x dconf-service)
104 - if [[ $? == 0 ]]; then
105 - ebegin "Stopping dconf-service; it will automatically restart on demand"
106 - kill ${pids}
107 - eend $?
108 - fi
109 -}
110 -
111 -pkg_postrm() {
112 - xdg_pkg_postrm
113 - gnome2_giomodule_cache_update
114 -}
115
116 diff --git a/gnome-base/dconf/dconf-0.32.0-r1.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
117 deleted file mode 100644
118 index f4c1fa46b5c..00000000000
119 --- a/gnome-base/dconf/dconf-0.32.0-r1.ebuild
120 +++ /dev/null
121 @@ -1,83 +0,0 @@
122 -# Copyright 1999-2019 Gentoo Authors
123 -# Distributed under the terms of the GNU General Public License v2
124 -
125 -EAPI=7
126 -inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg
127 -
128 -DESCRIPTION="Simple low-level configuration system"
129 -HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
130 -
131 -LICENSE="LGPL-2.1+"
132 -SLOT="0"
133 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
134 -IUSE="gtk-doc"
135 -RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
136 -
137 -RDEPEND="
138 - >=dev-libs/glib-2.44.0:2
139 - sys-apps/dbus
140 -"
141 -DEPEND="${RDEPEND}"
142 -BDEPEND="
143 - app-text/docbook-xml-dtd:4.2
144 - app-text/docbook-xsl-stylesheets
145 - dev-libs/libxslt
146 - dev-util/gdbus-codegen
147 - gtk-doc? ( >=dev-util/gtk-doc-1.15 )
148 - >=sys-devel/gettext-0.19.8
149 - virtual/pkgconfig
150 - <dev-util/meson-0.52
151 -" # problem with meson-0.52+ https://gitlab.gnome.org/GNOME/dconf/issues/59
152 -
153 -PATCHES=(
154 - "${FILESDIR}"/0.30.1-bash-completion-dir.patch
155 - "${FILESDIR}"/${PV}-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep
156 -)
157 -
158 -src_configure() {
159 - local emesonargs=(
160 - -Dbash_completion_dir="$(get_bashcompdir)"
161 - -Dman=true
162 - $(meson_use gtk-doc gtk_doc)
163 - -Dvapi=true
164 - )
165 - meson_src_configure
166 -}
167 -
168 -src_install() {
169 - meson_src_install
170 -
171 - # GSettings backend may be one of: memory, gconf, dconf
172 - # Only dconf is really considered functional by upstream
173 - # must have it enabled over gconf if both are installed
174 - # This snippet can't be removed until gconf package is
175 - # ensured to not install a /etc/env.d/50gconf and then
176 - # still consider the CONFIG_PROTECT_MASK bit.
177 - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
178 - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
179 - doenvd 51dconf
180 -}
181 -
182 -src_test() {
183 - virtx meson_src_test
184 -}
185 -
186 -pkg_postinst() {
187 - xdg_pkg_postinst
188 - gnome2_giomodule_cache_update
189 -
190 - # Kill existing dconf-service processes as recommended by upstream due to
191 - # possible changes in the dconf private dbus API.
192 - # dconf-service will be dbus-activated on next use.
193 - pids=$(pgrep -x dconf-service)
194 - if [[ $? == 0 ]]; then
195 - ebegin "Stopping dconf-service; it will automatically restart on demand"
196 - kill ${pids}
197 - eend $?
198 - fi
199 -}
200 -
201 -pkg_postrm() {
202 - xdg_pkg_postrm
203 - gnome2_giomodule_cache_update
204 -}