gentoo resync : 18.03.2018

3 files changed, 2 insertions, 59 deletions

diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
index 3cfec4d7b8af..c6dc81faf3c7 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -1,7 +1,5 @@
 AUX 70-spice-webdavd.rules 159 BLAKE2B 712c2513f1322e4144229e31c4df83cec6780a57590c26cca76d5a1d2844a7ea6bd0696906abba5441023b44985e26cee578a4c21ec00b62b236fdc25de2a964 SHA512 f9a427f0d4f4db4aa3e0c7a4f77281b405ebde3e932bf591f018f39f6094fa47f16649534b2dc45434433367f60b98d58e32e49c5b03ba1333015319de5644cc
 AUX spice-webdavd.initd 344 BLAKE2B 6a7f36f4f698e5327455b3e95a71ae39df56f6d57e8dbb050d255cb87e1847f6672ab7121829d08c39ae0b028c2e7d8e375724a1b6e06e8e547291cf0188749b SHA512 df4e08bb5fec88bd7c0002e25c5ce348f538d49de9b74890c97a53516e8c3d0f60c87c77050c5357e73f5d33f1daaabb9007d7e35d4d34b15b105dc4ce273dfb
-DIST phodav-2.1.tar.xz 293128 BLAKE2B bdb175812d742189b1efe5589f63a1fd50a18d7f1a59e0627a0eba0c8a82fd110bec1d434519c362a2d232680b3040c47768d9f960236c20dad0e036b7433529 SHA512 e43bd4c9ed97b7454e8452246c37211905b4cff430e91f3d2d36182736e1b8924d6ad477f58f110c98b85f02c085cd12c099020a0bea8abb19e65a9d52e1f4a8
 DIST phodav-2.2.tar.xz 294216 BLAKE2B e7062f933f407dff339b050a8b735e733fa41634cc34b0a37556b283b941ff620ae59a2ed3b7bce41530195f33a9fb3113f89e37190bb046352d90d72a750468 SHA512 1d16716c1bda674a6695b651e9b1bcb4b7cfefd9b60291ed3f5691f4f6f45f68a970d99fc4820bed0484cf0a43c1bf32e4d208fcc239ac0c0b7a75bf779e8913
-EBUILD phodav-2.1.ebuild 1255 BLAKE2B ce097cfc986614406a34dd30998b32b45d3b3b05b7e569b82cc0e3715f6cbf3f74d46cf8af45deab1f9ce3f48fe100285e674f952b723934bf2410f5c10373b6 SHA512 2a09d351e0b45efcb5efce2d58fe6e265c4e98d54795ff4d89c0751933534e8dc8dc0ce69031d7361f14155c822dcf90e6f9d322caffbf25c631729714a8fc1c
-EBUILD phodav-2.2.ebuild 1515 BLAKE2B 04f07baa40e775cef31ea356a1d0ca4b4944005bbb87bd29a3a50b288edfc654a7e6c2265f72d34c566690cd4326dacba5412a4bb33f58020c5f3d017eae9596 SHA512 589676bd6a861cac420852ff61088782217f2772816ba3eec2e310c0946c772d1199cf8e6b1a595c51003530ff8a0afdadc51c07e53f41131e36398016fe6938
+EBUILD phodav-2.2.ebuild 1513 BLAKE2B 8b9242bccb1d96205d2aa2e4e2193201389c6452994b21948b6a26581d422ce0162c490b082fb678302b2e0815c1b14ea5eec802cf3a4d16b05e786f8c63375c SHA512 1895863178b1f61ba3942046e1ebd93c685234f4c7929428d89bf3a941d2dba50bb3e53ec68bb496c3d762e1f8e64fb103a1d544854b9a990fefef9ea75648e1
 MISC metadata.xml 466 BLAKE2B 81d7512b98e6c1e300131546f378edffde1f5206fde50b012cda0167df1ff4e16c7f64b5362b2dfa6797c2ebabfd8f89f88fe2bd01f5c0d3397ba1f0555b00ea SHA512 835e6f875a2540a0f6761373e568c6e24bb60ab437164638f69e238c5eba8413cd3752a19aab9ecdbbef4f1f0927d00ee11a51f8786c54feec401426ae76b6ec
diff --git a/net-libs/phodav/phodav-2.1.ebuild b/net-libs/phodav/phodav-2.1.ebuild
deleted file mode 100644
index 91ed0ed6f210..000000000000
--- a/net-libs/phodav/phodav-2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 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 ppc ppc64 x86"
-IUSE="spice systemd zeroconf"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=net-libs/libsoup-2.48:2.4
-	dev-libs/libxml2
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--program-suffix=-${SLOT} \
-		$(use_with zeroconf avahi) \
-		--with-udevdir=$(get_udevdir) \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
-	if ! use zeroconf ; then
-		sed -i -e 's|avahi-daemon.service||' data/spice-webdavd.service || die
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use spice ; then
-		if ! use systemd ; then
-			newinitd "${FILESDIR}/spice-webdavd.initd" spice-webdavd
-			udev_dorules "${FILESDIR}/70-spice-webdavd.rules"
-			rm -r "${D}$(systemd_get_systemunitdir)" || die
-		fi
-	else
-		rm -r "${D}"{/usr/sbin,$(get_udevdir),$(systemd_get_systemunitdir)} || die
-	fi
-}
diff --git a/net-libs/phodav/phodav-2.2.ebuild b/net-libs/phodav/phodav-2.2.ebuild
index 5faffa3afdb1..05ff09d38b54 100644
--- a/net-libs/phodav/phodav-2.2.ebuild
+++ b/net-libs/phodav/phodav-2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/phodav"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="alpha amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 arm ppc ppc64 x86"
 IUSE="spice systemd zeroconf"
 
 # It included g_uuid_* symbols of its own from an unapplied patch to glib; now that they