Make sys-apps/openrc dep conditional on !system USE

sakaki- · sakaki- · commit 6b3f2e076a94 · 2019-11-24T16:43:48.000Z
NB systemd is not yet formally supported; for example almost all
of the custom init scripts do not have unit file equivalents; however
this change at least allows a system to be built with systemd global
USE. PRs to add missing units etc. welcome ^-^

Closes sakaki-/gentoo-on-rpi-64bit#105
diff --git a/dev-embedded/rpi-64bit-meta/rpi-64bit-meta-1.5.2-r4.ebuild b/dev-embedded/rpi-64bit-meta/rpi-64bit-meta-1.5.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~arm64"
-IUSE="+boot-fw +kernel-bin -porthash +weekly-genup +innercore +core +xfce pitop apps"
+IUSE="apps +boot-fw +core +innercore +kernel-bin pitop -porthash -systemd +weekly-genup +xfce"
 REQUIRED_USE="
 	core? ( innercore )
 	xfce? ( core )
@@ -22,7 +22,8 @@ REQUIRED_USE="
 S="${WORKDIR}"
 
 DEPEND="
-	>=sys-apps/openrc-0.42.1-r2[swclock-fix(-)]
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.42.1-r2[swclock-fix(-)] )
 	>=app-shells/bash-5.0"
 # pi3multiboot flag pulls in matching bcmrpi3-kernel{,-bis}-bin package also
 RDEPEND="
@@ -315,4 +316,9 @@ pkg_postinst() {
 		# otherwise assume user knows what they are doing and is using the
 		# main gentoo repo or similar
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
diff --git a/media-video/pi-ffcam/pi-ffcam-1.0.5-r1.ebuild b/media-video/pi-ffcam/pi-ffcam-1.0.5-r1.ebuild
@@ -27,7 +27,6 @@ RDEPEND="${DEPEND}
 	>=gnome-extra/zenity-3.28.1
 	>=media-video/ffmpeg-4.1.1-r2[sdl,v4l]
 	>=media-libs/raspberrypi-userland-1.20190114
-	>=sys-apps/openrc-0.21
 "
 
 src_install() {
diff --git a/media-video/pi-ffplay/pi-ffplay-1.0.6-r1.ebuild b/media-video/pi-ffplay/pi-ffplay-1.0.6-r1.ebuild
@@ -26,7 +26,6 @@ RDEPEND="${DEPEND}
 	>=gnome-extra/zenity-3.28.1
 	>=media-video/ffmpeg-4.1.1-r2[sdl,v4l]
 	>=media-libs/raspberrypi-userland-1.20190114
-	>=sys-apps/openrc-0.21
 	>=sys-process/procps-3.3.15-r1
 "
 
diff --git a/net-misc/rpi3-ethfix/rpi3-ethfix-1.0.0-r2.ebuild b/net-misc/rpi3-ethfix/rpi3-ethfix-1.0.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/sakaki-/gentoo-on-rpi3-64bit"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 
 # required by Portage, as we have no SRC_URI...
@@ -20,7 +20,8 @@ S="${WORKDIR}"
 DEPEND=""
 RDEPEND="${DEPEND}
 	>=sys-apps/ethtool-4.16
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	>=app-shells/bash-4.0"
 
 src_install() {
@@ -32,4 +33,9 @@ pkg_postinst() {
 		rc-update add "${PN}" default
 		elog "The ${PN} service has been added to your default runlevel."
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
diff --git a/net-wireless/rpi3-bluetooth/rpi3-bluetooth-1.1-r7.ebuild b/net-wireless/rpi3-bluetooth/rpi3-bluetooth-1.1-r7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://aur.archlinux.org/packages/pi-bluetooth/"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 
 EGIT_REPO_URI="https://aur.archlinux.org/pi-bluetooth.git"
@@ -24,7 +24,8 @@ DEPEND=""
 RDEPEND="
 	${DEPEND}
 	~sys-firmware/bcm4340a1-firmware-${PV}
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	|| (	~net-wireless/bluez-5.43
 		>=net-wireless/bluez-5.44[deprecated] )
 	>=virtual/udev-215
@@ -48,4 +49,9 @@ pkg_postinst() {
 		elog "  rc-update add ${PN} default"
 		elog "to enable the ${PN} service"
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
diff --git a/net-wireless/rpi3-wifi-regdom/rpi3-wifi-regdom-1.1-r1.ebuild b/net-wireless/rpi3-wifi-regdom/rpi3-wifi-regdom-1.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/sakaki-/gentoo-on-rpi3-64bit"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 
 # required by Portage, as we have no SRC_URI...
@@ -20,7 +20,8 @@ S="${WORKDIR}"
 DEPEND=""
 RDEPEND="${DEPEND}
 	>=net-wireless/iw-4.9
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	>=app-shells/bash-4.0"
 
 src_install() {
@@ -37,4 +38,9 @@ pkg_postinst() {
 		elog "Please check /etc/conf.d/${PN}, and set an"
 		elog "appropriate ISO / IEC 3166 alpha2 country code therein."
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
diff --git a/sys-apps/pitop-poweroff/pitop-poweroff-1.0.2-r6.ebuild b/sys-apps/pitop-poweroff/pitop-poweroff-1.0.2-r6.ebuild
@@ -11,15 +11,16 @@ HOMEPAGE="https://github.com/sakaki-/gentoo-on-rpi3-64bit"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 
 # required by Portage, as we have no SRC_URI...
 S="${WORKDIR}"
 
 RDEPEND="
 	>=dev-embedded/pitop-utils-1.20170723-r1
-	>=sys-apps/openrc-0.21"
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )"
 DEPEND="${RDEPEND}"
 
 src_install() {
@@ -36,5 +37,10 @@ pkg_postinst() {
 		elog "You will also need SPI turned on"
                 elog "(set 'dtparam=spi=on' in /boot/config.txt)."
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
 
diff --git a/sys-apps/pyconfig_gen/pyconfig_gen-1.1.9-r1.ebuild b/sys-apps/pyconfig_gen/pyconfig_gen-1.1.9-r1.ebuild
@@ -16,14 +16,15 @@ RESTRICT="mirror"
 SLOT="0"
 LICENSE="GPL-3+"
 KEYWORDS="~arm ~arm64"
-IUSE=""
+IUSE="-systemd"
 
 DEPEND="${PYTHON_DEPS}
 	>=xfce-base/xfce4-meta-4.12
 "
 
 RDEPEND="${DEPEND}
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	>=app-shells/bash-4.0
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	>=media-libs/raspberrypi-userland-1.20190808
@@ -63,6 +64,11 @@ pkg_postinst() {
 		elog "Both autostart and regular .desktop files have also"
 		elog "been installed."
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
 
 pkg_postrm() {
diff --git a/sys-apps/rpi-gpio/rpi-gpio-1.0.0-r1.ebuild b/sys-apps/rpi-gpio/rpi-gpio-1.0.0-r1.ebuild
@@ -22,7 +22,6 @@ ACCT_DEPEND="
 "
 DEPEND="
 	${ACCT_DEPEND}
-	>=sys-apps/openrc-0.21
 	>=virtual/udev-215
 	>=app-shells/bash-4.0"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/rpi-i2c/rpi-i2c-1.0.0-r3.ebuild b/sys-apps/rpi-i2c/rpi-i2c-1.0.0-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/sakaki-/gentoo-on-rpi-64bit"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 
 # required by Portage, as we have no SRC_URI...
@@ -23,7 +23,8 @@ ACCT_DEPEND="
 DEPEND="
 	${ACCT_DEPEND}
 	!sys-apps/rpi3-i2cdev
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	>=virtual/udev-215
 	>=app-shells/bash-4.0"
 RDEPEND="${DEPEND}"
@@ -53,4 +54,9 @@ pkg_postinst() {
 			elog "in /boot/config.txt, and reboot."
 		fi
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
diff --git a/sys-apps/rpi-onetime-startup/rpi-onetime-startup-1.0-r4.ebuild b/sys-apps/rpi-onetime-startup/rpi-onetime-startup-1.0-r4.ebuild
@@ -11,15 +11,16 @@ HOMEPAGE="https://github.com/sakaki-/gentoo-on-rpi-64bit"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 
 # required by Portage, as we have no SRC_URI...
 S="${WORKDIR}"
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	>=app-shells/bash-4.0"
 
 src_install() {
@@ -34,4 +35,9 @@ pkg_postinst() {
 		rc-update add "${PN}" default
 		elog "The ${PN} service has been added to your default runlevel."
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
diff --git a/sys-apps/rpi-serial/rpi-serial-1.0.0-r1.ebuild b/sys-apps/rpi-serial/rpi-serial-1.0.0-r1.ebuild
@@ -18,7 +18,6 @@ RESTRICT="mirror"
 S="${WORKDIR}"
 
 DEPEND="
-	>=sys-apps/openrc-0.21
 	>=virtual/udev-215
 	>=app-shells/bash-4.0"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/rpi-spi/rpi-spi-1.0.0-r2.ebuild b/sys-apps/rpi-spi/rpi-spi-1.0.0-r2.ebuild
@@ -23,7 +23,6 @@ ACCT_DEPEND="
 DEPEND="
 	${ACCT_DEPEND}
 	!sys-apps/rpi3-spidev
-	>=sys-apps/openrc-0.21
 	>=virtual/udev-215
 	>=app-shells/bash-4.0"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/rpi-video/rpi-video-1.0.0-r1.ebuild b/sys-apps/rpi-video/rpi-video-1.0.0-r1.ebuild
@@ -22,7 +22,6 @@ ACCT_DEPEND="
 "
 DEPEND="
 	${ACCT_DEPEND}
-	>=sys-apps/openrc-0.21
 	>=virtual/udev-215
 	>=app-shells/bash-4.0"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/rpi3-expand-swap/rpi3-expand-swap-1.0-r5.ebuild b/sys-apps/rpi3-expand-swap/rpi3-expand-swap-1.0-r5.ebuild
@@ -11,15 +11,16 @@ HOMEPAGE="https://github.com/sakaki-/gentoo-on-rpi3-64bit"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 
 # required by Portage, as we have no SRC_URI...
 S="${WORKDIR}"
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	>=app-shells/bash-4.0"
 
 src_install() {
@@ -33,4 +34,9 @@ pkg_postinst() {
 		elog "The ${PN} service has been added to your default runlevel."
 		elog "Please check /etc/conf.d/${PN} for settings."
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
diff --git a/sys-apps/rpi3-i2cdev/rpi3-i2cdev-1.0.1-r3.ebuild b/sys-apps/rpi3-i2cdev/rpi3-i2cdev-1.0.1-r3.ebuild
@@ -11,14 +11,15 @@ HOMEPAGE="https://github.com/sakaki-/gentoo-on-rpi3-64bit"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 
 # required by Portage, as we have no SRC_URI...
 S="${WORKDIR}"
 
 DEPEND="
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	>=virtual/udev-215
 	>=app-shells/bash-4.0"
 RDEPEND="${DEPEND}"
@@ -39,4 +40,9 @@ pkg_postinst() {
 			elog "in /boot/config.txt, and reboot."
 		fi
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
diff --git a/sys-apps/rpi3-init-scripts/rpi3-init-scripts-1.1.5-r1.ebuild b/sys-apps/rpi3-init-scripts/rpi3-init-scripts-1.1.5-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/sakaki-/gentoo-on-rpi3-64bit"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 AR_SVCNAME="autoexpand-root"
 
@@ -22,7 +22,8 @@ DEPEND=""
 RDEPEND="${DEPEND}
 	>=net-misc/networkmanager-1.8.2
 	>=x11-apps/xdm-1.1.11-r3
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	>=app-shells/bash-4.0"
 
 src_install() {
@@ -53,5 +54,10 @@ pkg_postinst() {
 		elog "New managed version is in /usr/share/X11/xorg.conf.d"
 		rm "${OLDRULE}"
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
 
diff --git a/sys-apps/rpi3-ondemand-cpufreq/rpi3-ondemand-cpufreq-1.1.1-r1.ebuild b/sys-apps/rpi3-ondemand-cpufreq/rpi3-ondemand-cpufreq-1.1.1-r1.ebuild
@@ -11,15 +11,16 @@ HOMEPAGE="https://github.com/sakaki-/gentoo-on-rpi3-64bit"
 SRC_URI=""
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="-systemd"
 RESTRICT="mirror"
 
 # required by Portage, as we have no SRC_URI...
 S="${WORKDIR}"
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	>=sys-apps/openrc-0.21
+	systemd?  ( >=sys-apps/systemd-242-r6 )
+	!systemd? ( >=sys-apps/openrc-0.41 )
 	>=app-shells/bash-4.0"
 
 src_install() {
@@ -32,5 +33,10 @@ pkg_postinst() {
 		elog "  rc-update add rpi3-ondemand sysinit"
 		elog "to enable on-demand CPU frequency scaling"
 	fi
+	if use systemd; then
+		ewarn "You are running with the systemd USE flag set!"
+		ewarn "However, this package does not yet formally support systemd, so"
+		ewarn "you are on your own to get things working ><"
+	fi
 }
 
diff --git a/sys-apps/rpi3-zswap/rpi3-zswap-1.0-r2.ebuild b/sys-apps/rpi3-zswap/rpi3-zswap-1.0-r2.ebuild
diff --git a/x11-misc/rpi3-safecompositor/rpi3-safecompositor-1.0.3-r1.ebuild b/x11-misc/rpi3-safecompositor/rpi3-safecompositor-1.0.3-r1.ebuild
diff --git a/x11-misc/rpi3-safecursor/rpi3-safecursor-1.0.1-r1.ebuild b/x11-misc/rpi3-safecursor/rpi3-safecursor-1.0.1-r1.ebuild
diff --git a/xfce-extra/xfce4-fixups-rpi3/xfce4-fixups-rpi3-1.0.4-r1.ebuild b/xfce-extra/xfce4-fixups-rpi3/xfce4-fixups-rpi3-1.0.4-r1.ebuild
diff --git a/xfce-extra/xfce4-keycuts-pitop/xfce4-keycuts-pitop-1.0.2-r1.ebuild b/xfce-extra/xfce4-keycuts-pitop/xfce4-keycuts-pitop-1.0.2-r1.ebuild
diff --git a/xfce-extra/xfce4-noblank/xfce4-noblank-1.0.0-r3.ebuild b/xfce-extra/xfce4-noblank/xfce4-noblank-1.0.0-r3.ebuild

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ RDEPEND="${DEPEND}`
`27`	`27`	`>=gnome-extra/zenity-3.28.1`
`28`	`28`	`>=media-video/ffmpeg-4.1.1-r2[sdl,v4l]`
`29`	`29`	`>=media-libs/raspberrypi-userland-1.20190114`
`30`		`- >=sys-apps/openrc-0.21`
`31`	`30`	`"`
`32`	`31`
`33`	`32`	`src_install() {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ RDEPEND="${DEPEND}`
`26`	`26`	`>=gnome-extra/zenity-3.28.1`
`27`	`27`	`>=media-video/ffmpeg-4.1.1-r2[sdl,v4l]`
`28`	`28`	`>=media-libs/raspberrypi-userland-1.20190114`
`29`		`- >=sys-apps/openrc-0.21`
`30`	`29`	`>=sys-process/procps-3.3.15-r1`
`31`	`30`	`"`
`32`	`31`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ ACCT_DEPEND="`
`22`	`22`	`"`
`23`	`23`	`DEPEND="`
`24`	`24`	`${ACCT_DEPEND}`
`25`		`- >=sys-apps/openrc-0.21`
`26`	`25`	`>=virtual/udev-215`
`27`	`26`	`>=app-shells/bash-4.0"`
`28`	`27`	`RDEPEND="${DEPEND}"`