Update and cleanup elogind, networkmanager-qt and gvfs

10 files changed, 5 insertions, 285 deletions

diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 5975ff5..d28a1f3 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,2 +1 @@
-DIST gvfs-1.30.3.tar.xz 1894852 SHA256 b824a29489cae7f39e1a0fc0d154ac7b7bf43d8edd98ba83ffcad2f766d0f175 SHA512 50af5b6c6e435f861371a77be988c28313a730f2310f963f2d1cd5282fa250e36997af1ed0df7196739933b4f5ed08d3b1bd6141927dcbcc7ba061d90756b408 WHIRLPOOL c1380b760c8ef23d10eb119a5e4f67554add766a6b377ea5d4837a36aee12a1f478b550ccb4c6d4b62929714660810d5263a1455cba33bafc7c8acf45c02bfc4
 DIST gvfs-1.30.4.tar.xz 1895304 SHA256 981e0aca7f4e2e99860137f9fd99c335fa72a764156d253caf1069380a8e3afa SHA512 305b2abc8cfcb4bdea1fb84f5a7df4aac9697494f5d63d40ce1eb234b547aed497deb4d88a2cb17f9ab4fc188d49ff56033993a17cbfebae6d65a33dc84a633a WHIRLPOOL f945786e1a8476b7a01efe75138f5b2668d99fa85d8af2994826d2131e25650e504b7e4137ee26bf9aeafd878c6fe2891dd41762d0f84bd324b8f04e7537fcb2
diff --git a/gnome-base/gvfs/gvfs-1.30.3-r1.ebuild b/gnome-base/gvfs/gvfs-1.30.3-r1.ebuild
deleted file mode 100644
index f05481e..0000000
--- a/gnome-base/gvfs/gvfs-1.30.3-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 gnome2 systemd
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
-	cdda? ( udev )
-	elogind? ( !systemd udisks )
-	google? ( gnome-online-accounts )
-	mtp? ( udev )
-	udisks? ( udev )
-	systemd? ( !elogind udisks )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	app-crypt/gcr:=
-	>=dev-libs/glib-2.49.3:2
-	sys-apps/dbus
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray )
-	elogind? ( >=sys-auth/elogind-219:0= )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
-	google? (
-		>=dev-libs/libgdata-0.17.3:=[crypt,gnome-online-accounts]
-		>=net-libs/gnome-online-accounts-3.17.1:= )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-2.42:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:= )
-	mtp? ( >=media-libs/libmtp-1.1.12 )
-	nfs? ( >=net-fs/libnfs-1.9.7 )
-	policykit? (
-		sys-auth/polkit
-		sys-libs/libcap )
-	samba? ( || (
-		( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-4[smbclient] )
-		>=net-fs/samba-4[client] ) )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	udev? (
-		cdda? ( dev-libs/libcdio-paranoia )
-		virtual/libgudev:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-core-12.3.0
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-src_prepare() {
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-	fi
-
-	if use elogind; then
-		epatch "${FILESDIR}"/${PN}-enable-elogind.patch || die
-	fi
-
-	if ! use udev || use elogind; then
-		# Uncomment when eautoreconf stops being needed always
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	# --disable-obexftp, upstream bug #729945
-	gnome2_src_configure \
-		--disable-gdu \
-		--disable-hal \
-		--enable-bash-completion \
-		--enable-documentation \
-		--enable-gcr \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(use_enable afp) \
-		$(use_enable archive) \
-		$(use_enable bluray) \
-		$(use_enable cdda) \
-		$(use_enable elogind libelogind) \
-		$(use_enable fuse) \
-		$(use_enable gnome-keyring keyring) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable google) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable http) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable nfs) \
-		$(use_enable policykit admin) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udev gudev) \
-		$(use_enable udev) \
-		$(use_enable udisks udisks2) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
deleted file mode 100644
index ea905a8..0000000
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST networkmanager-qt-5.29.0.tar.xz 157292 SHA256 6a595c36cdb93c33398cbc3b76613aace64c0106ed08b88d25a8d0fbc0f6a24e SHA512 5a86ff2f2f97f832177c996470ddf9d1f4706fabaa4aaebf5dd387fed43c46da355e184072c63d3b2e07a8c8e4a019a08a762e3335eb80df4d7aa51cb6b1bc93 WHIRLPOOL 450a3e181766045fb4cc9f85ffc747549369d64f7a8e7c1136416f56ddbaf94a476b9a766144f2e10a5a74ba18f611632cc307d54caf816dc15115d4faa164af
diff --git a/kde-frameworks/networkmanager-qt/metadata.xml b/kde-frameworks/networkmanager-qt/metadata.xml
deleted file mode 100644
index 162d119..0000000
--- a/kde-frameworks/networkmanager-qt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="teamd">Enable Teamd control support</flag>
-	</use>
-</pkgmetadata>
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.29.0-r1.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.29.0-r1.ebuild
deleted file mode 100644
index 2b88285..0000000
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.29.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="NetworkManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="teamd"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtnetwork)
-	|| (
-		>=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=]
-		>=net-misc/networkmanager-1.4.0-r1[elogind,teamd=]
-		>=net-misc/networkmanager-1.4.0-r1[systemd,teamd=]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-libs/libnm-qt:5
-"
diff --git a/profiles/package.mask/elogind b/profiles/package.mask/elogind
index 6602eec..eecc207 100644
--- a/profiles/package.mask/elogind
+++ b/profiles/package.mask/elogind
@@ -1,13 +1,8 @@
 # Sven Eden <yamakuzure@gmx.net> (10 Nov 2016)
 # Testing ebuilds for elogind integration
-=gnome-base/gvfs-1.30.3-r1
 =gnome-base/gvfs-1.30.4-r1
-=kde-frameworks/networkmanager-qt-5.29.0-r1
 =sys-apps/accountsservice-0.6.43-r2
-=sys-auth/elogind-229.1
-=sys-auth/elogind-229.3
+=sys-auth/elogind-229.9999
 =sys-auth/pambase-20150213-r2
-=sys-fs/udisks-2.1.8-r1
-=sys-fs/udisks-2.6.5-r1
 =sys-process/procps-3.3.12-r2
 =x11-apps/xinit-1.3.4-r2
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
deleted file mode 100644
index 2b97987..0000000
--- a/sys-auth/elogind/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST elogind-229.1.tar.gz 755519 SHA256 a6ab4b6341438777edbb1b9cf52dac0c9faa03369b2b3e2149dc3a856c96bc61 SHA512 829add7df3474669867b5711694435c09f9bbd9690daa7bd2ab9e9acfe1870e98c7995a4353a3fd1a9ed6a2e6f705995953c80b1dcf5464b1bf262e4b1731f85 WHIRLPOOL e5c9deb9f6a2ace5c4ada50eb4daa24a9ce921b497b91d4f53aecf9be44927dde5cc4a27728ef59fdad058a1058fa6347783d1815ed930199c85d19c47c65069
-DIST elogind-229.3.tar.gz 757313 SHA256 8506145e6071a637aec91276e19cd932b3d9cd297c8e833f7b08b8d53fd7a1d7 SHA512 5449f6b8ca1cb14d91681de1273819e193c88f6ec22b790cfe2c9d9d6e0d37bfc3b707a650d14471e0cb3a577289f725e1a47d22a14db2154a2c0552ecde32ca WHIRLPOOL e71fc14453017a570c3c2766b42fb444e41b2a703689e745ea3a01bd915fdab896b4bd3f229f74d438d48b8383a0b590c456b9269a739e9bf7b8d60441fbb33c
diff --git a/sys-auth/elogind/elogind-229.3.ebuild b/sys-auth/elogind/elogind-229.3.ebuild
deleted file mode 100644
index 08e8538..0000000
--- a/sys-auth/elogind/elogind-229.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools linux-info pam udev
-
-DESCRIPTION="The systemd project's logind, extracted to a standalone package"
-HOMEPAGE="https://github.com/elogind/elogind"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" 
-
-LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl debug pam policykit selinux"
-
-COMMON_DEPEND="
-	sys-apps/util-linux
-	sys-libs/libcap
-	virtual/libudev:=
-	acl? ( sys-apps/acl )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-	!sys-apps/systemd
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-util/gperf
-	dev-util/intltool
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-PDEPEND="policykit? ( sys-auth/polkit )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-docs.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK
-		~SIGNALFD ~TIMERFD"
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch"
-}
-
-src_configure() {
-	econf \
-		--with-pamlibdir=$(getpam_mod_dir) \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--with-rootlibdir="${EPREFIX}"/$(get_libdir) \
-		--enable-smack \
-		--disable-kdbus \
-		$(use_enable debug debug elogind) \
-		$(use_enable acl) \
-		$(use_enable pam) \
-		$(use_enable selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	if [ "$(rc-config list default | grep elogind)" = "" ]; then
-		ewarn "To enable the elogind daemon, elogind must be"
-		ewarn "added to the default runlevel:"
-		ewarn "# rc-update add elogind default"
-	fi
-}
diff --git a/sys-auth/elogind/elogind-229.1.ebuild b/sys-auth/elogind/elogind-229.9999.ebuild
index 08e8538..000b8ee 100644
--- a/sys-auth/elogind/elogind-229.1.ebuild
+++ b/sys-auth/elogind/elogind-229.9999.ebuild
@@ -4,15 +4,16 @@
 
 EAPI=6
 
-inherit autotools linux-info pam udev
+inherit autotools git-r3 linux-info pam udev
 
 DESCRIPTION="The systemd project's logind, extracted to a standalone package"
 HOMEPAGE="https://github.com/elogind/elogind"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" 
+EGIT_REPO_URI="https://github.com/elogind/elogind.git"
+EGIT_BRANCH="dev_v230"
 
 LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS=""
 IUSE="acl debug pam policykit selinux"
 
 COMMON_DEPEND="
diff --git a/sys-auth/elogind/files/elogind.init b/sys-auth/elogind/files/elogind.init
index 04ce34a..4191923 100644
--- a/sys-auth/elogind/files/elogind.init
+++ b/sys-auth/elogind/files/elogind.init
@@ -13,12 +13,6 @@ depend() {
 start() {
 	ebegin "Starting elogind"
 
-	# elogind needs a /run/systemd directory
-	if [[ ! -e /run/systemd ]]; then
-		mkdir -p /run/systemd
-		chmod 755 /run/systemd
-	fi
-
 	start-stop-daemon --start --quiet --background \
 		--make-pidfile --pidfile "${ELOGIND_PIDFILE}" \
 		--exec "${ELOGIND_EXEC}"