gentoo resync : 28.04.2021

3 files changed, 91 insertions, 4 deletions

diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
index d9f737613c63..0babc34cacb2 100644
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@@ -1,3 +1,4 @@
+AUX openrc-settingsd-1.0.1-remove-bashisms.patch 2670 BLAKE2B 06b61db1c40ae4a99b5fd46c3f83eecb8428c5bef150be1f7d6b0e25ab4667cae40a4664720586540a7d180218e5b4e23ad4fafeaaadce112a9566e412c4f9a3 SHA512 c4715aa4bdf35011400d02971d2739db347aeed96bbffe42c56a47714a0554c69137fa4b239b0b8ad3eed118d1da2af8c26bd4eaf8e39fa19176c85ed9c289fa
 DIST openrc-settingsd-1.0.1.tar.xz 243552 BLAKE2B 2abf084c59ef310ca72bf2d528c6f8f04b3a502ea421247989e5356e759f2850f1749ffae7592ff30c92a0496db01e9d5e55c2a4ae9dbd3a9954414d4eabd31b SHA512 1f04a4b078a5fb659573daec0962f819af7eaff17a6213c4881726833cf32becd71dd820cd63767e2933465df26b3e4a3475d94f23e203a6977298965c709b21
-EBUILD openrc-settingsd-1.0.1-r1.ebuild 1424 BLAKE2B 67980a3686127e56fd90582c251e2cc7b9a5ea0f35fa1ce85535cefde036aa73adc4eb465ffd00cf38a6bf3fe1baaa72e45a499a3bdf348cff7cad6a07e820d6 SHA512 d3c7c7e15742ff8941827c05a5bd110feeb3cd0e78ac720b999635e228934b8c6fe6dd9ae6b656cbde30445eae4cc9845f7b143711e41a7decafc7357d5464e5
+EBUILD openrc-settingsd-1.0.1-r1.ebuild 1459 BLAKE2B c6c15c6f92b560645982b0558585f7cdff35957e8eb7bb7b090fef2d30f7b0582c9dff2a547e1fbdd52eb2c3aff0684c8f8b32d3399a94be7127d5dbd8cc076f SHA512 a0a81314af123503b312cac28b6e2d4394ad1d1ae2f5c35f4f505919c3d278620a907ec111565c8f04021483cbba4bcd5648598f3dd2fb6e5f38f1d1d63e197a
 MISC metadata.xml 375 BLAKE2B 2ef1245cabf20154d53ca5b9161f9e5055d38ede47687bc2314cf787c804dbff40a1278769fec061468c95139a8c5f9f573e06e901c580e6923e93b29e3db398 SHA512 489eae3aa828d6aeb43f3b24783777644f7abd7522d842c44918ba6c5fecf0ca9f02f91764f7f2566960283737f4a2c17f307f4f26e9d1c8ff92ee9e2e99e8fc
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 000000000000..7723a44af677
--- /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 e4a68aca3d92..a2c33fcca1a0 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
@@ -12,22 +12,27 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="systemd"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.30:2
 	dev-libs/libdaemon:0=
 	sys-apps/dbus
 	sys-apps/openrc:=
 	sys-auth/polkit
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
 	systemd? ( >=sys-apps/systemd-197 )
 	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-util/gdbus-codegen
 	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