gentoo resync : 19.03.2019

3 files changed, 59 insertions, 5 deletions

diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
index 1cb3a5ffaca1..88326328edb5 100644
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@@ -1,3 +1,4 @@
 DIST openrc-settingsd-1.0.1.tar.xz 243552 BLAKE2B 2abf084c59ef310ca72bf2d528c6f8f04b3a502ea421247989e5356e759f2850f1749ffae7592ff30c92a0496db01e9d5e55c2a4ae9dbd3a9954414d4eabd31b SHA512 1f04a4b078a5fb659573daec0962f819af7eaff17a6213c4881726833cf32becd71dd820cd63767e2933465df26b3e4a3475d94f23e203a6977298965c709b21
+EBUILD openrc-settingsd-1.0.1-r1.ebuild 1427 BLAKE2B 8b468392950009e0a693a8f0268404bb2555ef14cfd8f0f26ceead96c3bc4323dc7c05641329a7b4a38cc3e7d556397b6746eec154dc6569cdcf64291e098378 SHA512 4ba3e95ce2561a38ace8c91fd122c3b61aabdfbfae2f978645bcd67fbb55dfd246470f5cf8f85457d4d32f307c681de80469f9fafb0574aeea62fdc350d6f04d
 EBUILD openrc-settingsd-1.0.1.ebuild 1318 BLAKE2B b2c6e2d8e24600bc262a8560d88643e088a1136249e2de289d9f4cf184ec7ac24a89b36fda046803187babfbc22c9a7b4a1ec81c86d7d2d5973ead2369a37951 SHA512 8bd54bc1ff1f1adc6020224d58c72833c2f804f4d1f1d43f38664b52bc3e08fbf37c8c65517aea089f3acb4a5f1afa895aa60e61a8d6da26c19330e0f562b7b6
-MISC metadata.xml 488 BLAKE2B 9c5343c770ffe757e60a0137609ea51584caeaf250323c6df562f70b79560a9b895c49c7fcfe5270c29e10970059a0de5ba10ecdb7cdd9849e6e74b2f6ad03e2 SHA512 0e73f3f4231bebdf2c317d2737782e35e66cd08aead5b8192211857842d9c5d8ff62f6d0654940daccd444dc6884ecdcb2c4ffb0aa51bf999c09cacb3af1be15
+MISC metadata.xml 375 BLAKE2B 2ef1245cabf20154d53ca5b9161f9e5055d38ede47687bc2314cf787c804dbff40a1278769fec061468c95139a8c5f9f573e06e901c580e6923e93b29e3db398 SHA512 489eae3aa828d6aeb43f3b24783777644f7abd7522d842c44918ba6c5fecf0ca9f02f91764f7f2566960283737f4a2c17f307f4f26e9d1c8ff92ee9e2e99e8fc
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
index fae0fa87a25c..aefee902e98a 100644
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tetromino@gentoo.org</email>
-	<name>Alexandre Rostovtsev</name>
-</maintainer>
 <maintainer type="project">
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..ffe29605f1ff
--- /dev/null
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="System settings D-Bus service for OpenRC"
+HOMEPAGE="https://gitweb.gentoo.org/proj/openrc-settingsd.git"
+SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.30:2
+	dev-libs/libdaemon:0=
+	sys-apps/dbus
+	sys-apps/openrc:=
+	sys-auth/polkit
+"
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-197 )
+	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:g' data/init.d/openrc-settingsd.in || die
+}
+
+src_configure() {
+	econf \
+		--with-pidfile="${EPREFIX}"/run/openrc-settingsd.pid
+}
+
+src_install() {
+	default
+	if use systemd; then
+		# Avoid file collision with systemd
+		rm -vr "${ED}"/usr/share/{dbus-1,polkit-1} "${ED}"/etc/dbus-1 || die "rm failed"
+	fi
+}
+
+pkg_postinst() {
+	if use systemd; then
+		elog "You installed ${PN} with USE=systemd. In this mode,"
+		elog "${PN} will not start via simple dbus activation, so you"
+		elog "will have to manually enable it as an rc service:"
+		elog " # /etc/init.d/openrc-settingsd start"
+		elog " # rc-update add openrc-settingsd default"
+	fi
+}