gentoo resync : 04.05.2021

3 files changed, 141 insertions, 0 deletions

diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
index afa0e7c2c26e..98c4b2a194cb 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -1,5 +1,8 @@
+AUX 2.5-meson-Allow-specifying-systemd-udev-directories.patch 2410 BLAKE2B c511c6fa826e0ddad009ae35876d310b9baab86bdf773d28aacf8c92fe69c930d0f4ddbc37e43cb40bef22319fb6ef5b2a8a1a199456c7fb5c918a9b7449c4a1 SHA512 1f800ece56e65dc309df47c66aef02499fddf707dcdc98031f528d2648776d70dcd7099cd784fbf4ca34352caecee7e1d5aba8b314580326b4c74a0c0ffcab6d
 AUX 70-spice-webdavd.rules 159 BLAKE2B 712c2513f1322e4144229e31c4df83cec6780a57590c26cca76d5a1d2844a7ea6bd0696906abba5441023b44985e26cee578a4c21ec00b62b236fdc25de2a964 SHA512 f9a427f0d4f4db4aa3e0c7a4f77281b405ebde3e932bf591f018f39f6094fa47f16649534b2dc45434433367f60b98d58e32e49c5b03ba1333015319de5644cc
 AUX spice-webdavd.initd 344 BLAKE2B 6a7f36f4f698e5327455b3e95a71ae39df56f6d57e8dbb050d255cb87e1847f6672ab7121829d08c39ae0b028c2e7d8e375724a1b6e06e8e547291cf0188749b SHA512 df4e08bb5fec88bd7c0002e25c5ce348f538d49de9b74890c97a53516e8c3d0f60c87c77050c5357e73f5d33f1daaabb9007d7e35d4d34b15b105dc4ce273dfb
 DIST phodav-2.2.tar.xz 294216 BLAKE2B e7062f933f407dff339b050a8b735e733fa41634cc34b0a37556b283b941ff620ae59a2ed3b7bce41530195f33a9fb3113f89e37190bb046352d90d72a750468 SHA512 1d16716c1bda674a6695b651e9b1bcb4b7cfefd9b60291ed3f5691f4f6f45f68a970d99fc4820bed0484cf0a43c1bf32e4d208fcc239ac0c0b7a75bf779e8913
+DIST phodav-2.5.tar.xz 62992 BLAKE2B aca0141c20c727dd27af3760caf27ec0f7a4936c3c35dbdb60a8a15b5bd75ebd97dfef8bb96f50b266d7a0e53fb8c0e21416dea855ff107b362dba0e89283a64 SHA512 4b6cd6a40118bf9c042abcfc3e7cb593b620922aae4dd3daf77682bf9da2030a0958bc0206531d5950f85551ef8f5da21fb21c54b9bd5e56b880f54e0983bc01
 EBUILD phodav-2.2.ebuild 1524 BLAKE2B b1200825d532fa4af5ab4066ff7d730b6fc8aeb82fceda1768e9f6a70632df85c2c5f5a41fe2426f5dc11f9636cc3b2bffee18e9d7532cf9140fc0cf1ec3bcfc SHA512 3a54cf590cb2814895d53446c3fa4bf95ad383895073f7717becf35a49f0ac8b119f345d613660d7888eac5c9fbb52cbb8905a1e65df46f39b2a229b243e0f62
+EBUILD phodav-2.5.ebuild 1224 BLAKE2B 0d8a611f1faca656fde841303b4b7f86c9fbb83d867452f787790c75f38bd9f88a3818549f90989447f6173059414f603caa8906546aec78abf02e77709cd6aa SHA512 95cf8188f1b2cf7e09ba6bd702d34070913cf599617d2ebb84f6d32dab7bbc6bfa0343a735b9b330e85c4470bc4a18238a5bee274927298ab6b86fb5ecc709fd
 MISC metadata.xml 466 BLAKE2B 81d7512b98e6c1e300131546f378edffde1f5206fde50b012cda0167df1ff4e16c7f64b5362b2dfa6797c2ebabfd8f89f88fe2bd01f5c0d3397ba1f0555b00ea SHA512 835e6f875a2540a0f6761373e568c6e24bb60ab437164638f69e238c5eba8413cd3752a19aab9ecdbbef4f1f0927d00ee11a51f8786c54feec401426ae76b6ec
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
new file mode 100644
index 000000000000..87d4331d5397
--- /dev/null
+++ b/net-libs/phodav/files/2.5-meson-Allow-specifying-systemd-udev-directories.patch
@@ -0,0 +1,79 @@
+https://gitlab.gnome.org/GNOME/phodav/-/merge_requests/19
+
+From 5f6ca03ab91df31ede9a4435c63cf5af0ef50c06 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 3 May 2021 22:47:16 -0400
+Subject: [PATCH] meson: Allow specifying systemd/udev directories
+
+Closes: https://gitlab.gnome.org/GNOME/phodav/-/issues/1
+---
+ data/meson.build  | 24 ++++++++++++++++++------
+ meson_options.txt | 12 ++++++------
+ 2 files changed, 24 insertions(+), 12 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c466030..26ad939 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,16 +1,28 @@
+-systemd = dependency('systemd', required : get_option('systemd'))
+-if systemd.found()
++systemd_systemunitdir = get_option('systemdsystemunitdir')
++if systemd_systemunitdir == ''
++  systemd = dependency('systemd', required : false)
++  if systemd.found()
++    systemd_systemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
++  endif
++endif
++if systemd_systemunitdir != ''
+   install_data(
+     'spice-webdavd.service',
+-    install_dir : systemd.get_pkgconfig_variable('systemdsystemunitdir')
++    install_dir : systemd_systemunitdir
+   )
+ endif
+ 
+-udev = dependency('udev', required : get_option('udev'))
+-if udev.found()
++udev_rulesdir = get_option('udevrulesdir')
++if udev_rulesdir == ''
++  udev = dependency('udev', required : false)
++  if udev.found()
++    udev_rulesdir = '@0@/@1@'.format(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
++  endif
++endif
++if udev_rulesdir != ''
+   install_data(
+     '70-spice-webdavd.rules',
+-    install_dir : '@0@/@1@'.format(udev.get_pkgconfig_variable('udevdir'), 'rules.d'),
++    install_dir : udev_rulesdir
+   )
+ endif
+ 
+diff --git a/meson_options.txt b/meson_options.txt
+index 724a0d3..1b075f5 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -6,13 +6,13 @@ option('avahi',
+        type : 'feature',
+        description : 'Build with avahi/mdns')
+ 
+-option('systemd',
+-       type : 'feature',
+-       description : 'Install systemd units/configuration')
++option('systemdsystemunitdir',
++       type: 'string',
++       description: 'Directory for systemd system unit files')
+ 
+-option('udev',
+-       type : 'feature',
+-       description : 'Install udev rules')
++option('udevrulesdir',
++       type : 'string',
++       description : 'Directory for udev rules')
+ 
+ option('build-id',
+        type : 'integer',
+-- 
+2.26.3
+
diff --git a/net-libs/phodav/phodav-2.5.ebuild b/net-libs/phodav/phodav-2.5.ebuild
new file mode 100644
index 000000000000..884a5f1534ba
--- /dev/null
+++ b/net-libs/phodav/phodav-2.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson systemd udev
+
+DESCRIPTION="WebDav server implementation using libsoup"
+HOMEPAGE="https://wiki.gnome.org/phodav"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="gtk-doc systemd zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.51.2:2
+	>=net-libs/libsoup-2.48:2.4
+	dev-libs/libxml2
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-Allow-specifying-systemd-udev-directories.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use zeroconf ; then
+		sed -i -e 's|avahi-daemon.service||' data/spice-webdavd.service || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature gtk-doc gtk_doc)
+		$(meson_feature zeroconf avahi)
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dudevrulesdir="$(get_udevdir)/rules.d"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use systemd ; then
+		newinitd "${FILESDIR}/spice-webdavd.initd" spice-webdavd
+		udev_dorules "${FILESDIR}/70-spice-webdavd.rules"
+	fi
+}