diff options
Diffstat (limited to 'app-admin/openrc-settingsd')
| -rw-r--r-- | app-admin/openrc-settingsd/Manifest | 3 | ||||
| -rw-r--r-- | app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch | 81 | ||||
| -rw-r--r-- | app-admin/openrc-settingsd/metadata.xml | 20 | ||||
| -rw-r--r-- | app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild | 62 | ||||
| -rw-r--r-- | app-admin/openrc-settingsd/openrc-settingsd-1.4.0.ebuild (renamed from app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild) | 31 |
5 files changed, 27 insertions, 170 deletions
diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest index 6199a89dc72a..949a17ea68f6 100644 --- a/app-admin/openrc-settingsd/Manifest +++ b/app-admin/openrc-settingsd/Manifest @@ -1,2 +1 @@ -DIST openrc-settingsd-1.0.1.tar.xz 243552 BLAKE2B 2abf084c59ef310ca72bf2d528c6f8f04b3a502ea421247989e5356e759f2850f1749ffae7592ff30c92a0496db01e9d5e55c2a4ae9dbd3a9954414d4eabd31b SHA512 1f04a4b078a5fb659573daec0962f819af7eaff17a6213c4881726833cf32becd71dd820cd63767e2933465df26b3e4a3475d94f23e203a6977298965c709b21 -DIST openrc-settingsd-v1.1.0.tar.bz2 41781 BLAKE2B 1a508c5751a3b2c734b533ebdf72d4c5fa97b67743caf5e47f06fc505a286e92167715e0ec706528a4e9a74d0aed9d78d6b6b2d542c1df3781d5bd76ff700b91 SHA512 f63aa624097a806094c51a6da8fc6f4962c3302ea0acf02be17744db9d5caf4cfd68294a8e8916e62eeeca722cadc571715b9751730f9d9cf1f9be66e93510f7 +DIST openrc-settingsd-v1.4.0.tar.bz2 41420 BLAKE2B 3890c65e22f1cc55aa8f067ae7d8a46de25618c7ab98acb8e01f38662da4d73f3d0d16583a0526ded3331c4fb4d80bf0b6852917ed875adfa0035d19e19219e6 SHA512 aa5bd4d2afb1b959c4c2d532b30d369ee0bd637010ea75adc8ca7444cdb13bf651ae4c6946141d326c8460f23ba4482c1a3f639a0b48190009a88298a17c22e3 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 deleted file mode 100644 index 7723a44af677..000000000000 --- a/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch +++ /dev/null @@ -1,81 +0,0 @@ -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/metadata.xml b/app-admin/openrc-settingsd/metadata.xml index aefee902e98a..c24b007e3b95 100644 --- a/app-admin/openrc-settingsd/metadata.xml +++ b/app-admin/openrc-settingsd/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="systemd">Use the versions of dbus and polkit files provided by - <pkg>sys-apps/systemd</pkg></flag> -</use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="systemd">Use the versions of dbus and polkit files provided by <pkg>sys-apps/systemd</pkg></flag> + </use> + <upstream> + <remote-id type="gitlab">postmarketOS/openrc-settingsd</remote-id> + </upstream> </pkgmetadata> 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 deleted file mode 100644 index a2c33fcca1a0..000000000000 --- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 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" - -DEPEND=" - >=dev-libs/glib-2.30:2 - dev-libs/libdaemon:0= - sys-apps/dbus - sys-apps/openrc:= - sys-auth/polkit -" -RDEPEND=" - ${DEPEND} - systemd? ( >=sys-apps/systemd-197 ) - !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd ) -" -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 -} - -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 -} diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.4.0.ebuild index 7a0eee93c891..bf6db6a6c1a9 100644 --- a/app-admin/openrc-settingsd/openrc-settingsd-1.1.0.ebuild +++ b/app-admin/openrc-settingsd/openrc-settingsd-1.4.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools +inherit meson DESCRIPTION="System settings D-Bus service for OpenRC" HOMEPAGE="https://gitlab.com/postmarketOS/openrc-settingsd/" @@ -11,20 +11,20 @@ SRC_URI="https://gitlab.com/postmarketOS/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="systemd" DEPEND=" >=dev-libs/glib-2.30:2 - dev-libs/libdaemon:0= sys-apps/dbus - sys-apps/openrc:= sys-auth/polkit + dev-libs/libdaemon:0= + sys-apps/openrc " RDEPEND=" ${DEPEND} systemd? ( >=sys-apps/systemd-197 ) - !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd ) + elibc_glibc? ( !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd ) ) " BDEPEND=" dev-util/gdbus-codegen @@ -33,19 +33,18 @@ BDEPEND=" S="${WORKDIR}/${PN}-v${PV}" -src_prepare() { - default - eautoreconf - 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 + local emesonargs=( + -Dopenrc=enabled + -Denv-update=/usr/bin/env-update + -Dhostname-style=gentoo + -Dlocale-style=gentoo + ) + meson_src_configure } src_install() { - default + meson_src_install 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" |