1 |
commit: 30c2f36efb1baa5618431cf3d53cf5f2750c3639 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 4 02:10:37 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 4 03:28:35 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c2f36e |
7 |
|
8 |
net-libs/phodav: Version bump to 2.5 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/609390 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
net-libs/phodav/Manifest | 1 + |
14 |
...Allow-specifying-systemd-udev-directories.patch | 79 ++++++++++++++++++++++ |
15 |
net-libs/phodav/phodav-2.5.ebuild | 59 ++++++++++++++++ |
16 |
3 files changed, 139 insertions(+) |
17 |
|
18 |
diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest |
19 |
index 96718b331e3..543b0b63754 100644 |
20 |
--- a/net-libs/phodav/Manifest |
21 |
+++ b/net-libs/phodav/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST phodav-2.2.tar.xz 294216 BLAKE2B e7062f933f407dff339b050a8b735e733fa41634cc34b0a37556b283b941ff620ae59a2ed3b7bce41530195f33a9fb3113f89e37190bb046352d90d72a750468 SHA512 1d16716c1bda674a6695b651e9b1bcb4b7cfefd9b60291ed3f5691f4f6f45f68a970d99fc4820bed0484cf0a43c1bf32e4d208fcc239ac0c0b7a75bf779e8913 |
24 |
+DIST phodav-2.5.tar.xz 62992 BLAKE2B aca0141c20c727dd27af3760caf27ec0f7a4936c3c35dbdb60a8a15b5bd75ebd97dfef8bb96f50b266d7a0e53fb8c0e21416dea855ff107b362dba0e89283a64 SHA512 4b6cd6a40118bf9c042abcfc3e7cb593b620922aae4dd3daf77682bf9da2030a0958bc0206531d5950f85551ef8f5da21fb21c54b9bd5e56b880f54e0983bc01 |
25 |
|
26 |
diff --git a/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch b/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch |
27 |
new file mode 100644 |
28 |
index 00000000000..004adccf0da |
29 |
--- /dev/null |
30 |
+++ b/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch |
31 |
@@ -0,0 +1,79 @@ |
32 |
+https://gitlab.gnome.org/GNOME/phodav/-/merge_requests/19 |
33 |
+ |
34 |
+From c67bd2f698e0e1c6d0747a1be6217e6e435ef798 Mon Sep 17 00:00:00 2001 |
35 |
+From: Matt Turner <mattst88@×××××.com> |
36 |
+Date: Mon, 3 May 2021 22:47:16 -0400 |
37 |
+Subject: [PATCH] meson: Allow specifying systemd/udev directories |
38 |
+ |
39 |
+Closes: https://gitlab.gnome.org/GNOME/phodav/-/issues/1 |
40 |
+--- |
41 |
+ data/meson.build | 24 ++++++++++++++++++------ |
42 |
+ meson_options.txt | 12 ++++++------ |
43 |
+ 2 files changed, 24 insertions(+), 12 deletions(-) |
44 |
+ |
45 |
+diff --git a/data/meson.build b/data/meson.build |
46 |
+index c466030..57ee6d1 100644 |
47 |
+--- a/data/meson.build |
48 |
++++ b/data/meson.build |
49 |
+@@ -1,16 +1,28 @@ |
50 |
+-systemd = dependency('systemd', required : get_option('systemd')) |
51 |
+-if systemd.found() |
52 |
++systemd_systemunitdir = get_option('systemdsystemunitdir') |
53 |
++if systemd_systemunitdir == '' |
54 |
++ systemd = dependency('systemd') |
55 |
++ if systemd.found() |
56 |
++ systemd_systemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') |
57 |
++ endif |
58 |
++endif |
59 |
++if systemd_systemunitdir != '' |
60 |
+ install_data( |
61 |
+ 'spice-webdavd.service', |
62 |
+- install_dir : systemd.get_pkgconfig_variable('systemdsystemunitdir') |
63 |
++ install_dir : systemd_systemunitdir |
64 |
+ ) |
65 |
+ endif |
66 |
+ |
67 |
+-udev = dependency('udev', required : get_option('udev')) |
68 |
+-if udev.found() |
69 |
++udev_rulesdir = get_option('udevrulesdir') |
70 |
++if udev_rulesdir == '' |
71 |
++ udev = dependency('udev') |
72 |
++ if udev.found() |
73 |
++ udev_rulesdir = '@0@/@1@'.format(udev.get_pkgconfig_variable('udevdir'), 'rules.d') |
74 |
++ endif |
75 |
++endif |
76 |
++if udev_rulesdir != '' |
77 |
+ install_data( |
78 |
+ '70-spice-webdavd.rules', |
79 |
+- install_dir : '@0@/@1@'.format(udev.get_pkgconfig_variable('udevdir'), 'rules.d'), |
80 |
++ install_dir : udev_rulesdir |
81 |
+ ) |
82 |
+ endif |
83 |
+ |
84 |
+diff --git a/meson_options.txt b/meson_options.txt |
85 |
+index 724a0d3..1b075f5 100644 |
86 |
+--- a/meson_options.txt |
87 |
++++ b/meson_options.txt |
88 |
+@@ -6,13 +6,13 @@ option('avahi', |
89 |
+ type : 'feature', |
90 |
+ description : 'Build with avahi/mdns') |
91 |
+ |
92 |
+-option('systemd', |
93 |
+- type : 'feature', |
94 |
+- description : 'Install systemd units/configuration') |
95 |
++option('systemdsystemunitdir', |
96 |
++ type: 'string', |
97 |
++ description: 'Directory for systemd system unit files') |
98 |
+ |
99 |
+-option('udev', |
100 |
+- type : 'feature', |
101 |
+- description : 'Install udev rules') |
102 |
++option('udevrulesdir', |
103 |
++ type : 'string', |
104 |
++ description : 'Directory for udev rules') |
105 |
+ |
106 |
+ option('build-id', |
107 |
+ type : 'integer', |
108 |
+-- |
109 |
+2.26.3 |
110 |
+ |
111 |
|
112 |
diff --git a/net-libs/phodav/phodav-2.5.ebuild b/net-libs/phodav/phodav-2.5.ebuild |
113 |
new file mode 100644 |
114 |
index 00000000000..884a5f1534b |
115 |
--- /dev/null |
116 |
+++ b/net-libs/phodav/phodav-2.5.ebuild |
117 |
@@ -0,0 +1,59 @@ |
118 |
+# Copyright 1999-2021 Gentoo Authors |
119 |
+# Distributed under the terms of the GNU General Public License v2 |
120 |
+ |
121 |
+EAPI=7 |
122 |
+ |
123 |
+inherit gnome.org meson systemd udev |
124 |
+ |
125 |
+DESCRIPTION="WebDav server implementation using libsoup" |
126 |
+HOMEPAGE="https://wiki.gnome.org/phodav" |
127 |
+ |
128 |
+LICENSE="LGPL-2.1+" |
129 |
+SLOT="2.0" |
130 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
131 |
+IUSE="gtk-doc systemd zeroconf" |
132 |
+ |
133 |
+RDEPEND=" |
134 |
+ >=dev-libs/glib-2.51.2:2 |
135 |
+ >=net-libs/libsoup-2.48:2.4 |
136 |
+ dev-libs/libxml2 |
137 |
+ zeroconf? ( net-dns/avahi[dbus] ) |
138 |
+" |
139 |
+DEPEND="${RDEPEND}" |
140 |
+BDEPEND=" |
141 |
+ app-text/asciidoc |
142 |
+ app-text/xmlto |
143 |
+ sys-devel/gettext |
144 |
+ virtual/pkgconfig |
145 |
+" |
146 |
+ |
147 |
+PATCHES=( |
148 |
+ "${FILESDIR}"/${PV}-meson-Allow-specifying-systemd-udev-directories.patch |
149 |
+) |
150 |
+ |
151 |
+src_prepare() { |
152 |
+ default |
153 |
+ |
154 |
+ if ! use zeroconf ; then |
155 |
+ sed -i -e 's|avahi-daemon.service||' data/spice-webdavd.service || die |
156 |
+ fi |
157 |
+} |
158 |
+ |
159 |
+src_configure() { |
160 |
+ local emesonargs=( |
161 |
+ $(meson_feature gtk-doc gtk_doc) |
162 |
+ $(meson_feature zeroconf avahi) |
163 |
+ -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" |
164 |
+ -Dudevrulesdir="$(get_udevdir)/rules.d" |
165 |
+ ) |
166 |
+ meson_src_configure |
167 |
+} |
168 |
+ |
169 |
+src_install() { |
170 |
+ meson_src_install |
171 |
+ |
172 |
+ if ! use systemd ; then |
173 |
+ newinitd "${FILESDIR}/spice-webdavd.initd" spice-webdavd |
174 |
+ udev_dorules "${FILESDIR}/70-spice-webdavd.rules" |
175 |
+ fi |
176 |
+} |