diff options
author | 2024-02-04 11:37:18 +0100 | |
---|---|---|
committer | 2024-02-04 11:37:18 +0100 | |
commit | 768ed2579a6462d27ee1f56863228f850d36e91c (patch) | |
tree | 7ed37ae511e2ba47465788316db72a39b8aac91a | |
parent | sys-auth/elogind: add 255.9999, drop 246.9999 (diff) | |
download | seden-768ed2579a6462d27ee1f56863228f850d36e91c.tar.gz seden-768ed2579a6462d27ee1f56863228f850d36e91c.tar.bz2 seden-768ed2579a6462d27ee1f56863228f850d36e91c.zip |
Modernize and update elogind live ebuilds
Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
-rw-r--r-- | profiles/package.mask/elogind | 8 | ||||
-rw-r--r-- | sys-auth/elogind/Manifest | 10 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-252.9.ebuild | 9 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-252.9999.ebuild | 32 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-255.9999.ebuild | 31 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-252.9-musl-lfs.patch | 51 |
6 files changed, 105 insertions, 36 deletions
diff --git a/profiles/package.mask/elogind b/profiles/package.mask/elogind index a346464..e8e8ead 100644 --- a/profiles/package.mask/elogind +++ b/profiles/package.mask/elogind @@ -1,7 +1,5 @@ -# Sven Eden <yamakuzure@gmx.net> (10 Nov 2016) +# Sven Eden <sven@eden-worx.com> (04 Feb 2024) # Testing ebuilds for elogind -=sys-auth/elogind-239.9999 -=sys-auth/elogind-241.9999 -=sys-auth/elogind-243.9999 -=sys-auth/elogind-246.9999 +=sys-auth/elogind-252.9999 +=sys-auth/elogind-255.9999 diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index 4a1bd60..a3a0dd1 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -2,13 +2,11 @@ AUX elogind-238.1-docs.patch 836 BLAKE2B bf7c644c4c46e54d76d3a1f5d4dc4dba415e558 AUX elogind-241.1-docs.patch 855 BLAKE2B 08fc89a264ab0408c13caa059649a004b775ec2e75ca0561d658106c9947ee0f6b9594ede8a40eb0fb7d0d0454123411f7c408e4701b88d20e0c4042a84b6916 SHA512 9260d94e77512ab8dede225d01c56194b01a0140be66489991ec17f6e1d09f7ab9f9b2efa0205fe3c6c3dedcd2145d6b9eb6126aef047a02e228cd4270972124 AUX elogind-243.6-docs.patch 985 BLAKE2B 93c9f6080ccd9816fadfa2642dcf2f0109be8888073c0d9d19b0a10ce54cdb63ab0eb40063ae433c6e6cf5266804307127c0b570aa50b5d51da66040f3004afe SHA512 7239841d018dcfeb8e87c01f20599a146be25da82f4f072bd98dd1e8d25fd472473ee31e4925310ff3667025eabfb7dad9a2305f51f971873216e7a72c97efe7 AUX elogind-252-docs.patch 907 BLAKE2B c21e75964594354544861597be56dfbf48b2689a8a3df949e4afac2121a620ee19d3466d141fd1785505eaeb4df1aa4bc36fc49e84a478d9d8e6869c9dd35762 SHA512 ffd6b480ab3e39b0a24d09b87326c89b673745b2dc7998d42ee691b5410f58ac07c8926e39cba6f1d3e0856ee35e4ae2105d6467c75f2f7387740a83a2650b8c +AUX elogind-252.9-musl-lfs.patch 2152 BLAKE2B cad592f4cec32add7acc62ba1de3d9706fe4f872709704bf1ee43c8ff1ec1ec067d50d5db66932fc2fc3049cf9ca165679939bfea063dec392639bface036245 SHA512 64865ab3c84bc59b1b9df993014ee68cb41c03140c28a3c58875de7cb54cc5a94a33c355a4ae068b275686850f540ca92e2cec792297fc6a440cc9df2440d444 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7 AUX elogind.init 710 BLAKE2B e8ea4bd17525080cf34c122cdfc14318a136e2b15ffcb1066b0945d65c9854e9964d73215dfd405bd4b1a7e6cbd1aad317bf221832d4f17c5ee60c42e981c691 SHA512 ef0a89dbfbc8571c2fa04c0ee24cab1f4afaa4608e57a748242d82ee5ae3ab4fc3917c7a3a27bcf1b2f645e4bf7f75e58412746a2fe21c454e9f2d2fd7a309c7 DIST elogind-252.9.tar.gz 1922777 BLAKE2B dd566125e407b3479a44b007890f97c9c87a325b3fed2d3505499d2163f113affd998e14b1c1fc50b9b86b0d155b51dae344dcc1cddafb6a48c631d0a0f00c9a SHA512 eed620cbc2f03bfeae6a80c9a421c21d3293fa40adffb96c7e4d86508c06712041f6623fb2bac15ecbb85faca4b5674ea6423b3067840809fb27d023fd9e5ffd -EBUILD elogind-239.9999.ebuild 3425 BLAKE2B f7215d234109d726268febb35732885fbe94ffff00bf47c8e23d04557a055217083b9ae4fc057a376eb74bab0ffe83d9a375818ad90498434b21438c2841081a SHA512 7eaf1241585fc25d7d1ece37b3037ae47e8186924735d368dc1992ba5e924d8c80f5605175c47762680272deacc4433f9f404d435a3bdda2763a0c5460ad12f7 -EBUILD elogind-241.9999.ebuild 3425 BLAKE2B a4a866d0c5450b74ab930ca887693d1d0c3f4c14c960ff76d663cb03d8428d4c40bd9ca1a56abeb8878e069732b31a4e187f269845e41b5a4ff35c68a7279a13 SHA512 8e964ff8540f21f62bd30cd7bbfcee18ff02e28cc642da2b162f32942dfaa132e3c975227ba42cf8985e6bd175825584f8f5da3aefd3c057eef6e8fd516c7837 -EBUILD elogind-243.9999.ebuild 3460 BLAKE2B b6e80a4d066da7e474c3d17ae4c39a6b6e668d37cdcc9540440000e5dd5f7c9bf1483d62be0c7eb4d3f67dc2da80d3c3f83b4809057b44a187cf7d67816c6975 SHA512 b4780a401f7dff43d907827529cec99ba0ca59264a0d7c85fbe0bd2af79e489fa21f64de50d08edaf8bb29f47c1dfb7761efe80ffdab1f19ca8d33e0ce2282d7 -EBUILD elogind-246.9999.ebuild 3460 BLAKE2B c3d2b66f154b20f506df1e35b0d735a1504a805dcb86ccee7f72866a6b4feecf610b373ee8c6704c66a7ac31acca079ca337429fd1cdda9764198f1a72f7f202 SHA512 68d73b64f44a08b0dbe7cde68ebbb3d4368bf0271627be943382ea80c7d2c6cce624b06df1f5a30a2512c0bb594c51e37e7e71cdfdec233f023016660a4fdb88 -EBUILD elogind-252.9.ebuild 4001 BLAKE2B fa80e014d8d10d9340d831bb210f0e460a87275bdf0a878143fe47d0eb08e9189679871e6781b9aa05964f3653360b4121668fe9e077beab525184344f686a78 SHA512 3590455a0371f26505d6e5fcb29bb84728c66c881a1283adb462af621bcd805ca7ff13a198e70fb56d73591d60695172900c452a38fe0d7f4af7c4eeeeca0746 -EBUILD elogind-252.9999.ebuild 3156 BLAKE2B 8f315eadda484f83f53b3eb7eb83c876db31138b3840f8e8d95134873e9a1f17b850cecf30c1fd7de9a6802fe720466fcacafd3b65515b0c7184e7e96e114b0e SHA512 fdb6d207d34c8a0bee6bd02dd1c05f172817c9595063f330e467a46a1b6c6e6345ee93e904d2d60b0223bd3324c3bafe21ca2caadca05a5a69f71e4149c694ab +EBUILD elogind-252.9.ebuild 4192 BLAKE2B 9bb8c7e823dd5b339bb1598d7d88a183612be255b3ed1e92387043b511b683a86dfb855e4a67284e4025292b3c52e1bfe13738dcd97f3a7fa9e742a297b478fc SHA512 db4e0d552b4c22c1859543f1a24cf9dcab0d2920e0b55a8272b0982fce19ee25de199f7c0632085def607287ed004237a99df8b67855f746af3bab95f6367ae1 +EBUILD elogind-252.9999.ebuild 3441 BLAKE2B a2cf3ba74631bf40457e87bda6387856ca69afecc14d77e92bb87b3e1f1c00456291bf8384184a95f6e6e5017283db4a5a85e3da1e693a97d85f63c66fdbef7a SHA512 0463e7265768c0f37e600a01ace430254bf6856c9216da393eb1291e9ab18f6e79b540e9ac89ba8803da6e7e8ae3855c58e6fc42ef6b03f4700b3f3befd76818 +EBUILD elogind-255.9999.ebuild 3399 BLAKE2B 1c6b70abd6109cf1013e123e044be37399f2299f4e5a8db44196faeca82509c96e93ae4b623c61f3bc7e03e3e9eca8b8bda0b8213d08d6b498a644cf0908880c SHA512 2ebc8a6629ab09211a01b6dd0989886206337142ffeb82f91e30dc95879b64062fe1d4a958b6d705a2995931d4117f8c70b48ce18df59235327f1ee5a30bdc8d MISC metadata.xml 447 BLAKE2B b8fc20f4e04261ccbb05131677e3d106691cd1f9072b38b9797a117763a6d457a89903181ec72eb632bd71ef9119104ba595152cc7da9aac24ec88e870f33690 SHA512 cd30dbc3bfd38f06686b6b9645042617c91b331cf03a95e9c7dba428f21e163d771b10fcfa899f3dc2de4028a7589f8aa0160b7d7b7505186b87a4eda2380dc7 diff --git a/sys-auth/elogind/elogind-252.9.ebuild b/sys-auth/elogind/elogind-252.9.ebuild index 3ff5f38..73209e1 100644 --- a/sys-auth/elogind/elogind-252.9.ebuild +++ b/sys-auth/elogind/elogind-252.9.ebuild @@ -3,6 +3,8 @@ EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) + if [[ ${PV} = *9999* ]]; then EGIT_BRANCH="v252-stable" EGIT_REPO_URI="https://github.com/elogind/elogind.git" @@ -12,7 +14,7 @@ else KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi -inherit linux-info meson pam udev xdg-utils +inherit linux-info meson pam python-any-r1 udev xdg-utils DESCRIPTION="The systemd project's logind, extracted to a standalone package" HOMEPAGE="https://github.com/elogind/elogind" @@ -52,6 +54,11 @@ PATCHES=( "${FILESDIR}/${PN}-252-docs.patch" ) +python_check_deps() { + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" && + python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" +} + pkg_setup() { local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" diff --git a/sys-auth/elogind/elogind-252.9999.ebuild b/sys-auth/elogind/elogind-252.9999.ebuild index ffa4a5e..9098afd 100644 --- a/sys-auth/elogind/elogind-252.9999.ebuild +++ b/sys-auth/elogind/elogind-252.9999.ebuild @@ -3,7 +3,9 @@ EAPI=8 -inherit git-r3 linux-info meson pam udev xdg-utils +PYTHON_COMPAT=( python3_{10..12} ) + +inherit git-r3 linux-info meson pam python-any-r1 udev xdg-utils DESCRIPTION="The systemd project's logind, extracted to a standalone package" HOMEPAGE="https://github.com/elogind/elogind" @@ -16,7 +18,16 @@ SLOT="0" KEYWORDS="" IUSE="+acl audit debug doc efi +pam +policykit selinux" -COMMON_DEPEND=" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-util/gperf + virtual/pkgconfig + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') +" +DEPEND=" audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap @@ -25,16 +36,7 @@ COMMON_DEPEND=" pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) " -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-util/gperf - dev-util/intltool - sys-devel/libtool - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !sys-apps/systemd " PDEPEND=" @@ -44,8 +46,14 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-252-docs.patch" + "${FILESDIR}/${PN}-252.9-musl-lfs.patch" ) +python_check_deps() { + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" && + python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" +} + pkg_setup() { local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" diff --git a/sys-auth/elogind/elogind-255.9999.ebuild b/sys-auth/elogind/elogind-255.9999.ebuild index d94f171..882ae78 100644 --- a/sys-auth/elogind/elogind-255.9999.ebuild +++ b/sys-auth/elogind/elogind-255.9999.ebuild @@ -3,7 +3,9 @@ EAPI=8 -inherit git-r3 linux-info meson pam udev xdg-utils +PYTHON_COMPAT=( python3_{10..12} ) + +inherit git-r3 linux-info meson pam python-any-r1 udev xdg-utils DESCRIPTION="The systemd project's logind, extracted to a standalone package" HOMEPAGE="https://github.com/elogind/elogind" @@ -16,7 +18,16 @@ SLOT="0" KEYWORDS="" IUSE="+acl audit debug doc efi +pam +policykit selinux" -COMMON_DEPEND=" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-util/gperf + virtual/pkgconfig + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') +" +DEPEND=" audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap @@ -25,16 +36,7 @@ COMMON_DEPEND=" pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) " -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-util/gperf - dev-util/intltool - sys-devel/libtool - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !sys-apps/systemd " PDEPEND=" @@ -46,6 +48,11 @@ PATCHES=( "${FILESDIR}/${PN}-252-docs.patch" ) +python_check_deps() { + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" && + python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" +} + pkg_setup() { local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" diff --git a/sys-auth/elogind/files/elogind-252.9-musl-lfs.patch b/sys-auth/elogind/files/elogind-252.9-musl-lfs.patch new file mode 100644 index 0000000..4faa929 --- /dev/null +++ b/sys-auth/elogind/files/elogind-252.9-musl-lfs.patch @@ -0,0 +1,51 @@ +https://github.com/systemd/systemd/pull/27599 + +From d096e05c625ea825eb4d781216ded717b7f71cca Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 10 May 2023 01:47:13 +0100 +Subject: [PATCH] dirent: conditionalize dirent assert based on dirent64 + existence + +>=musl-1.2.4 doesn't define dirent64 and its LFS friends as its "native" +functions are already LFS-aware. + +Check for dirent64 in meson.build and only assert if it exists. + +Bug: https://bugs.gentoo.org/905900 +Closes: https://github.com/systemd/systemd/pull/25809 +--- a/meson.build ++++ b/meson.build +@@ -599,6 +599,7 @@ decl_headers = ''' + # define _GNU_SOURCE 1 + # endif // _GNU_SOURCE + #endif // 1 ++#include <dirent.h> + #include <uchar.h> + #include <sys/mount.h> + #include <sys/stat.h> +@@ -608,6 +609,7 @@ foreach decl : ['char16_t', + 'char32_t', + 'struct mount_attr', + 'struct statx', ++ 'struct dirent64', + ] + + # We get -1 if the size cannot be determined +--- a/src/basic/dirent-util.h ++++ b/src/basic/dirent-util.h +@@ -39,6 +39,7 @@ struct dirent *readdir_no_dot(DIR *dirp); + /* Only if 64bit off_t is enabled struct dirent + struct dirent64 are actually the same. We require this, and + * we want them to be interchangeable to make getdents64() work, hence verify that. */ + assert_cc(_FILE_OFFSET_BITS == 64); ++#if HAVE_STRUCT_DIRENT64 + assert_cc(sizeof(struct dirent) == sizeof(struct dirent64)); + assert_cc(offsetof(struct dirent, d_ino) == offsetof(struct dirent64, d_ino)); + assert_cc(sizeof_field(struct dirent, d_ino) == sizeof_field(struct dirent64, d_ino)); +@@ -50,6 +51,7 @@ assert_cc(offsetof(struct dirent, d_type) == offsetof(struct dirent64, d_type)); + assert_cc(sizeof_field(struct dirent, d_type) == sizeof_field(struct dirent64, d_type)); + assert_cc(offsetof(struct dirent, d_name) == offsetof(struct dirent64, d_name)); + assert_cc(sizeof_field(struct dirent, d_name) == sizeof_field(struct dirent64, d_name)); ++#endif + + #define FOREACH_DIRENT_IN_BUFFER(de, buf, sz) \ + for (void *_end = (uint8_t*) ({ (de) = (buf); }) + (sz); \ |