[gentoo-commits] repo/gentoo:master commit in: app-admin/openrc-settingsd/, app-admin/openrc-settingsd/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/openrc-settingsd/, app-admin/openrc-settingsd/files/

[Sam James]

commit:     eb7a00e00ea5619385930a3893bb6c40928a2c4a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 15 01:24:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 01:31:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb7a00e0

app-admin/openrc-settingsd: fix build with non-Bash

Thanks-to: Kerin Millar
Closes: https://bugs.gentoo.org/754987
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../openrc-settingsd-1.0.1-remove-bashisms.patch   | 81 ++++++++++++++++++++++
 .../openrc-settingsd-1.0.1-r1.ebuild               |  4 ++
 2 files changed, 85 insertions(+)

diff --git a/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch b/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch
new file mode 100644
index 00000000000..7723a44af67
--- /dev/null
+++ b/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch
@@ -0,0 +1,81 @@
+https://bugs.gentoo.org/754987
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -123,31 +123,31 @@
+ 	$(NULL)
+ 
+ $(hostnamed_built_sources) : data/org.freedesktop.hostname1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdHostnamed \
+ 	--generate-c-code hostname1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.hostname1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ $(localed_built_sources) : data/org.freedesktop.locale1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdLocaled \
+ 	--generate-c-code locale1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.locale1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ $(timedated_built_sources) : data/org.freedesktop.timedate1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdTimedated \
+ 	--generate-c-code timedate1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.timedate1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ BUILT_SOURCES = \
+ 	$(hostnamed_built_sources) \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1315,31 +1315,31 @@
+ 	$(do_subst) < $(srcdir)/$< > $(srcdir)/$@
+ 
+ $(hostnamed_built_sources) : data/org.freedesktop.hostname1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdHostnamed \
+ 	--generate-c-code hostname1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.hostname1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ $(localed_built_sources) : data/org.freedesktop.locale1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdLocaled \
+ 	--generate-c-code locale1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.locale1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ $(timedated_built_sources) : data/org.freedesktop.timedate1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdTimedated \
+ 	--generate-c-code timedate1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.timedate1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

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
index e4a68aca3d9..fe4a85bc57b 100644
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.1-remove-bashisms.patch
+)
+
 src_prepare() {
 	default
 	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:g' data/init.d/openrc-settingsd.in || die