gentoo resync : 25.08.2020

4 files changed, 29 insertions, 52 deletions

diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index dc8b5ad88f5e..f2b6c2a45e9f 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,6 +1,4 @@
-DIST bolt-0.8.tar.gz 219317 BLAKE2B 9d76f3630d7f690c96447a894e54095deb7a19e46f2b02d7fbd9e584376d6b1a19391007a3a80e293adc8c9de6470279b587807d08006bbc12c7179bf0501e40 SHA512 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09
+AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e
 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
-DIST bolt-210-r2.patch 369 BLAKE2B 2ee8b084d8a89fac361e434fddaac50a1c10fd412b450dbe496d263d07cbd9961c33b84b04ae8296154ad16c01f6c3ba6599b48649d54c4ceb77d52797eddb53 SHA512 e66787ab18acb9924903ab92bf878e48b4aed39ea6aa18d874121316cb0452a00358a4adde1e7bbd903d682a6a001e20fd573af782db25d6c54b18ffafd29329
-EBUILD bolt-0.8-r1.ebuild 1035 BLAKE2B 86674fb1f2b2c59cdf07d60cb9671cadd9bbd6da0ce20ea559b4f2c545414580f032d6aec687890244388e1b877095930df7cbcc4e69cf814f5196766fc1775f SHA512 0aae5be42f2062a68723542aeaff86e74ad34f488338034b2c9398fd04ff03c49de4eff2f5c43231bdc31bff47d6a11a46a47299c428a7a2d689d934190332fe
-EBUILD bolt-0.9.ebuild 870 BLAKE2B 323048debaab00c3dcc587bd33023cf4b3073aaacf99d5c43fa044d0beab2a99df81f740d1a6ff929d8b5e79e7f1bbf21ddb64c191d098ee8a421852b1b22550 SHA512 be8f347b7bb3e99797b80bc06c26bfb0b05fb3e7f17fd18c3da38a7eb2b10a4f7bb6d539cc13740c33e50d87746469f327f4de4d5e0dfd58ba78a960e66cff88
+EBUILD bolt-0.9-r1.ebuild 1179 BLAKE2B 2275f3ce707e18f2481a34f7b96acfb2f58a03d511be185ffcaa50e93460b52cdb78d202f5b3bec36147aca04a4585bdbf4b5ecb4d98a70d9b05e58b7eccf716 SHA512 01e8bfa3ee62e9f28c3da06f7adf5c79be75b736a3fa7f1ce6f0cff559307f3e254a63bb6115fbecc0d70f95baae02f4fe4b5772cd225075d9541bf27192c279
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.8-r1.ebuild b/sys-apps/bolt/bolt-0.8-r1.ebuild
deleted file mode 100644
index 83ece17b667f..000000000000
--- a/sys-apps/bolt/bolt-0.8-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson systemd
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz
-	https://gitlab.freedesktop.org/bolt/bolt/-/commit/5a739574608e5190816b3efd22e75f214c5fe4c4.diff -> ${PN}-210-r2.patch"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.50.0:2
-	dev-util/glib-utils
-	virtual/libudev
-	virtual/udev
-	dev-util/umockdev
-	sys-auth/polkit[introspection]
-	systemd? ( sys-apps/systemd )
-	doc? ( app-text/asciidoc )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-210-r2.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dman=$(usex doc true false)
-		--sysconfdir=/etc
-		--localstatedir=/var
-		--sharedstatedir=/var/lib
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	keepdir /var/lib/boltd
-}
diff --git a/sys-apps/bolt/bolt-0.9.ebuild b/sys-apps/bolt/bolt-0.9-r1.ebuild
index f9decd2321f0..8145c75880e1 100644
--- a/sys-apps/bolt/bolt-0.9.ebuild
+++ b/sys-apps/bolt/bolt-0.9-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit meson systemd
+inherit linux-info meson systemd
 
 DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
 HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
@@ -25,6 +25,16 @@ DEPEND="
 	doc? ( app-text/asciidoc )"
 RDEPEND="${DEPEND}"
 
+pkg_pretend() {
+	CONFIG_CHECK="~THUNDERBOLT"
+	ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
+	check_extra_config
+
+	CONFIG_CHECK="~HOTPLUG_PCI"
+	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
+	check_extra_config
+}
+
 src_configure() {
 	local emesonargs=(
 		-Dman=$(usex doc true false)
@@ -37,5 +47,6 @@ src_configure() {
 
 src_install() {
 	meson_src_install
+	newinitd "${FILESDIR}"/${PN}.openrc boltd
 	keepdir /var/lib/boltd
 }
diff --git a/sys-apps/bolt/files/bolt.openrc b/sys-apps/bolt/files/bolt.openrc
new file mode 100644
index 000000000000..b80a7b31b26e
--- /dev/null
+++ b/sys-apps/bolt/files/bolt.openrc
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Thunderbolt Security Daemon"
+description="Userspace system daemon to enable security levels for Thunderbolt 3"
+command="/usr/libexec/boltd"
+command_background="true"
+pidfile="/var/run/boltd.pid"
+
+depend() {
+	need dbus
+	before xdm
+}