1 |
commit: 1ac9d8ece19b65355a90de4eeaf983ccc3c700b9 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 8 12:44:53 2017 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 8 12:46:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1ac9d8ec |
7 |
|
8 |
sys-fs/udisks: bump to 2.7.4, stable on x86 |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
RepoMan-Options: --force |
12 |
|
13 |
sys-fs/udisks/Manifest | 2 +- |
14 |
sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch | 42 ----------- |
15 |
sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch | 11 --- |
16 |
.../{udisks-2.1.6.ebuild => udisks-2.7.4.ebuild} | 82 ++++++++++++++-------- |
17 |
4 files changed, 53 insertions(+), 84 deletions(-) |
18 |
|
19 |
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest |
20 |
index b806a13..83c86f6 100644 |
21 |
--- a/sys-fs/udisks/Manifest |
22 |
+++ b/sys-fs/udisks/Manifest |
23 |
@@ -1 +1 @@ |
24 |
-DIST udisks-2.1.6.tar.bz2 908987 SHA256 dec5f5c85fa0f74f39336acbfba1770f9988c096be23873714543c304b09f46a SHA512 33badcf87986504cf13926f23f1ac0386d732920918871e5bdbcbd704bfcee17d9d3c5002bbdd497bf88a47f844595ad06fc2049bc805099c052943ba3750770 WHIRLPOOL 798cfae910b4cc85ebbd0b60aa987fda6bc6009fb37bba8ad3644bca497f1bb5dde04d574aab97f323dd4c4ae8dcbbc3de9fa09cbdbee45ff19a0b1fbf22b797 |
25 |
+DIST udisks-2.7.4.tar.gz 1286465 SHA256 2ca70f67cdfb4bd5b630972f72fd29eb35eb1b644e161132488446776a1d70fc SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849 WHIRLPOOL dd99c4287e8b0a3276573da092d8826d32c13ca6b99a6945ed731ca6443b0f74e21f4876ef84c89c7a665d9e1f96fb67c2455b46def60b905fd0cebf95821f93 |
26 |
|
27 |
diff --git a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch b/sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch |
28 |
deleted file mode 100644 |
29 |
index 6e2277b..0000000 |
30 |
--- a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch |
31 |
+++ /dev/null |
32 |
@@ -1,42 +0,0 @@ |
33 |
-From 725384004aef55e6f7cfb132ae07afc1a14b429d Mon Sep 17 00:00:00 2001 |
34 |
-From: Kylie McClain <somasis@×××××××.org> |
35 |
-Date: Wed, 25 Nov 2015 21:43:03 -0500 |
36 |
-Subject: [PATCH] Fix building on musl-libc |
37 |
- |
38 |
-Original patches are from https://github.com/voidlinux/void-packages/tree/master/srcpkgs/udisks2/patches |
39 |
---- |
40 |
- src/udiskslinuxfilesystem.c | 1 + |
41 |
- tools/udisksctl.c | 4 ++-- |
42 |
- 2 files changed, 3 insertions(+), 2 deletions(-) |
43 |
- |
44 |
-diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c |
45 |
-index 4db3745..971c5e1 100644 |
46 |
---- a/src/udiskslinuxfilesystem.c |
47 |
-+++ b/src/udiskslinuxfilesystem.c |
48 |
-@@ -31,6 +31,7 @@ |
49 |
- #include <mntent.h> |
50 |
- #include <sys/types.h> |
51 |
- #include <sys/acl.h> |
52 |
-+#include <sys/wait.h> |
53 |
- #include <errno.h> |
54 |
- |
55 |
- #include <glib/gstdio.h> |
56 |
-diff --git a/tools/udisksctl.c b/tools/udisksctl.c |
57 |
-index 2456a96..3e85e15 100644 |
58 |
---- a/tools/udisksctl.c |
59 |
-+++ b/tools/udisksctl.c |
60 |
-@@ -229,8 +229,8 @@ _color_run_pager (void) |
61 |
- } |
62 |
- else |
63 |
- { |
64 |
-- fclose (stdout); |
65 |
-- stdout = _color_pager_out; |
66 |
-+ fflush (stdout); |
67 |
-+ dup2 (fileno(_color_pager_out), fileno(stdout)); |
68 |
- } |
69 |
- |
70 |
- out: |
71 |
--- |
72 |
-2.6.3 |
73 |
- |
74 |
- |
75 |
|
76 |
diff --git a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch b/sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch |
77 |
deleted file mode 100644 |
78 |
index fa3507f..0000000 |
79 |
--- a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch |
80 |
+++ /dev/null |
81 |
@@ -1,11 +0,0 @@ |
82 |
---- a/src/udiskslinuxblock.c |
83 |
-+++ b/src/udiskslinuxblock.c |
84 |
-@@ -24,6 +24,7 @@ |
85 |
- #include <sys/types.h> |
86 |
- #include <sys/mount.h> |
87 |
- #include <sys/stat.h> |
88 |
-+#define __USE_GNU |
89 |
- #include <fcntl.h> |
90 |
- #include <pwd.h> |
91 |
- #include <grp.h> |
92 |
- |
93 |
|
94 |
diff --git a/sys-fs/udisks/udisks-2.1.6.ebuild b/sys-fs/udisks/udisks-2.7.4.ebuild |
95 |
similarity index 55% |
96 |
rename from sys-fs/udisks/udisks-2.1.6.ebuild |
97 |
rename to sys-fs/udisks/udisks-2.7.4.ebuild |
98 |
index d92a3ee..5eee78f 100644 |
99 |
--- a/sys-fs/udisks/udisks-2.1.6.ebuild |
100 |
+++ b/sys-fs/udisks/udisks-2.7.4.ebuild |
101 |
@@ -1,26 +1,31 @@ |
102 |
-# Copyright 1999-2016 Gentoo Foundation |
103 |
+# Copyright 1999-2017 Gentoo Foundation |
104 |
# Distributed under the terms of the GNU General Public License v2 |
105 |
|
106 |
-EAPI=5 |
107 |
-inherit bash-completion-r1 eutils linux-info systemd udev |
108 |
+EAPI=6 |
109 |
+inherit autotools bash-completion-r1 eutils linux-info systemd udev xdg-utils |
110 |
|
111 |
DESCRIPTION="Daemon providing interfaces to work with storage devices" |
112 |
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks" |
113 |
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2" |
114 |
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" |
115 |
+SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz" |
116 |
|
117 |
LICENSE="GPL-2" |
118 |
SLOT="2" |
119 |
-KEYWORDS="amd64 arm ~mips ppc x86" |
120 |
-IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd" |
121 |
+KEYWORDS="~amd64 x86" |
122 |
+IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd" |
123 |
+ |
124 |
+REQUIRED_USE="?? ( elogind systemd )" |
125 |
|
126 |
COMMON_DEPEND=" |
127 |
>=dev-libs/glib-2.36:2 |
128 |
>=dev-libs/libatasmart-0.19 |
129 |
>=sys-auth/polkit-0.110 |
130 |
- virtual/acl |
131 |
+ >=sys-libs/libblockdev-2.14[crypt,lvm?] |
132 |
>=virtual/libgudev-165:= |
133 |
virtual/udev |
134 |
+ acl? ( virtual/acl ) |
135 |
+ elogind? ( >=sys-auth/elogind-219 ) |
136 |
introspection? ( >=dev-libs/gobject-introspection-1.30:= ) |
137 |
+ lvm? ( sys-fs/lvm2 ) |
138 |
systemd? ( >=sys-apps/systemd-209 ) |
139 |
" |
140 |
# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1) |
141 |
@@ -32,7 +37,7 @@ RDEPEND="${COMMON_DEPEND} |
142 |
cryptsetup? ( |
143 |
sys-fs/cryptsetup[udev(+)] |
144 |
sys-fs/lvm2[udev(+)] |
145 |
- ) |
146 |
+ ) |
147 |
gptfdisk? ( >=sys-apps/gptfdisk-0.8 ) |
148 |
selinux? ( sec-policy/selinux-devicekit ) |
149 |
" |
150 |
@@ -40,15 +45,19 @@ DEPEND="${COMMON_DEPEND} |
151 |
app-text/docbook-xsl-stylesheets |
152 |
dev-libs/libxslt |
153 |
>=dev-util/gdbus-codegen-2.32 |
154 |
- >=dev-util/gtk-doc-am-1.3 |
155 |
- dev-util/intltool |
156 |
+ >=dev-util/gtk-doc-1.3 |
157 |
+ gnome-base/gnome-common:3 |
158 |
+ sys-devel/autoconf-archive |
159 |
>=sys-kernel/linux-headers-3.1 |
160 |
virtual/pkgconfig |
161 |
+ nls? ( dev-util/intltool ) |
162 |
" |
163 |
|
164 |
+S="${WORKDIR}/${PN}-${P}" |
165 |
+ |
166 |
QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd" |
167 |
|
168 |
-DOCS="AUTHORS HACKING NEWS README" |
169 |
+DOCS=( AUTHORS HACKING NEWS README.md ) |
170 |
|
171 |
pkg_setup() { |
172 |
# Listing only major arch's here to avoid tracking kernel's defconfig |
173 |
@@ -63,26 +72,37 @@ pkg_setup() { |
174 |
} |
175 |
|
176 |
src_prepare() { |
177 |
- use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; } |
178 |
+ xdg_environment_reset |
179 |
|
180 |
- epatch "${FILESDIR}"/${PN}-2.1.6-musl-fixup.patch |
181 |
- epatch "${FILESDIR}"/${PN}-2.1.6-musl-fixup1.patch |
182 |
epatch "${FILESDIR}"/${PN}-musl-nonglibc.patch |
183 |
|
184 |
- epatch_user |
185 |
+ default |
186 |
+ |
187 |
+ eautoreconf |
188 |
+ |
189 |
+ if ! use systemd ; then |
190 |
+ sed -i -e 's:libsystemd-login:&disable:' configure || die |
191 |
+ fi |
192 |
} |
193 |
|
194 |
src_configure() { |
195 |
- econf \ |
196 |
- --localstatedir="${EPREFIX}"/var \ |
197 |
- --disable-static \ |
198 |
- $(use_enable debug) \ |
199 |
- --disable-gtk-doc \ |
200 |
- $(use_enable introspection) \ |
201 |
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
202 |
- --with-udevdir="$(get_udevdir)" \ |
203 |
- --enable-compile-warnings=minimum \ |
204 |
- "$(systemd_with_unitdir)" |
205 |
+ local myeconfargs=( |
206 |
+ --enable-btrfs |
207 |
+ --disable-gtk-doc |
208 |
+ --disable-static |
209 |
+ --localstatedir="${EPREFIX%/}"/var |
210 |
+ --with-html-dir="${EPREFIX%/}"/usr/share/gtk-doc/html |
211 |
+ --with-modprobedir="${EPREFIX%/}"/lib/modprobe.d |
212 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
213 |
+ --with-udevdir="$(get_udevdir)" |
214 |
+ $(use_enable acl) |
215 |
+ $(use_enable debug) |
216 |
+ $(use_enable introspection) |
217 |
+ $(use_enable lvm lvm2) |
218 |
+ $(use_enable lvm lvmcache) |
219 |
+ $(use_enable nls) |
220 |
+ ) |
221 |
+ econf "${myeconfargs[@]}" |
222 |
} |
223 |
|
224 |
src_install() { |
225 |
@@ -90,12 +110,14 @@ src_install() { |
226 |
prune_libtool_files |
227 |
keepdir /var/lib/udisks2 #383091 |
228 |
|
229 |
- rm -rf "${ED}"/usr/share/bash-completion |
230 |
+ rm -rf "${ED%/}"/usr/share/bash-completion |
231 |
dobashcomp data/completions/udisksctl |
232 |
+} |
233 |
|
234 |
- local htmldir=udisks2 |
235 |
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then |
236 |
- dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir} |
237 |
+pkg_preinst() { |
238 |
+ # Remove gtk-doc symlink, #597628 |
239 |
+ if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then |
240 |
+ rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die |
241 |
fi |
242 |
} |