gentoo auto-resync : 06:12:2022 - 09:09:23

3 files changed, 44 insertions, 2 deletions

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 280f75401680..1a124bb78b60 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,11 +1,12 @@
 AUX elogind-241.4-broken-test.patch 436 BLAKE2B 204591800f415b00535bcd520435ea91ca59077438a1f07d1ecaf1cd68556cf1915460cacb2e3a062702dd84c8ca9729e7c4dfdd385a0435329784c8a33b4a66 SHA512 55435fa4cf902299f4957361393e7d1c5394970193fd814019d4dd5f9abddce3a7ea1da507eee4712f2f98284a989af8b22b6e1ff8a71e8faeb82417d1891c97
 AUX elogind-243.7-nodocs.patch 999 BLAKE2B f4fc95f14ce0412e88bb8b2a001975fae3b42bdf82c1f23b28e4b2cc635d92722c6317ac919bedd1dfbcc47faf4a177d6662b3b04569ce993e1b8fd5ce8bde15 SHA512 87c6072f95b9fe752324ae8dce576a70f795c31115f4b7478cd66c0ab22e50d0035620b5a278f042bc95635423056b1a7984ed81b32e9011dee84b9a5dec7566
 AUX elogind-246.10-clang-undefined-symbol.patch 1090 BLAKE2B aaad5048696084e0a010c9a6716a91af686d76199e4e7e83d7857c02f782e18e2c7c8a716677372dda115d19b54290db55c62a5c32deb3553d0341495aa73937 SHA512 6766eb5d34135cd581d50f8a9eabda4826731368234522d1c5a94775d54f4d90b1195348ad7a0f6f2af0e2460a9d359859072c57c41085b92707f7044ab46956
+AUX elogind-246.10-loong.patch 1493 BLAKE2B 40fbeae11f4f8387e0880e0ad91dc42577e0e8b160a0d916471ae852b5e40ff425b85668c04cb1e54c7f7087d05f3fcf0216938616b07bb413dfcc7be2220f34 SHA512 befb95281c83ec0421a16e26402c58a49d8a3c9e3100c8c164c1537073be5af2416ac2561271d7e4965d88c2693e8e2face3ca0b486bbef2f00216fa0c20396f
 AUX elogind-246.10-revert-polkit-automagic.patch 1345 BLAKE2B 115c8f38f23b140b5f232cb80fa2486ad90895a0fad3717d79302ac2205fa260d35aab9fdbc98bf490790749b109d32f59cfee166da26a9457676943cf6a57b7 SHA512 84e7b8e09ffd41bd0ea466e4f7fbc333c42544d9ed6877b881dc68c55607e81406ca977c3c0c045db8e151f76df1c7c813395ccb73b6e38583ddd40c642244f1
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
 DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
 EBUILD elogind-246.10-r1.ebuild 4195 BLAKE2B 58f3f967c18d83290c4e10d74eddb8578d2bccf98884853f3e4a4654248d33c4374621435d79e1e4c29263b17c071391721308310334b4ad373d967c8127833f SHA512 1097833faf17b97c3266a6b17f133b8d84d81c2175a7d989c9433014a53322cf75016093a661acac1178c4c3b95d14ce839477b65203d269f5db3ec5a7245244
-EBUILD elogind-246.10-r2.ebuild 4144 BLAKE2B 014c286c48d17589780d8b1b2257b5f5eaaca874b73350128ad438bdcdfcf205fb0b5e2ad3c5bf8bb274a3115a97256928d61dad5ffead253de4725396ba4545 SHA512 0e25086eff13432909aa3e93359239f9ccf7dfaebd0ec339c99a49842dfa91d22d45f7d11404be409d885a3ef8d282f4f441e41da2d3a0af7bbdc53da736a56f
+EBUILD elogind-246.10-r2.ebuild 4183 BLAKE2B 2fac55ebc686ec66ed534174e61b1b9beb5b6483a4fc902835bdd8bda99f115b4b7d272b1241f48212d7e13d26b63ecdb313e3f3704b9ea9a2de6ccbd25ba9f2 SHA512 696260bb904982ed9204034c81bbc8d0c80e6d1afec2b293cac218bc8528973af05f668ef47101829fd7fbf07350a8e055daeaa324a62e4649c12de5ae244440
 MISC metadata.xml 643 BLAKE2B 8304073654ac908cfb0e65493afc49a3f4925ba1c4adb8d571b57ddf3d7cf22a8e79dfbc6e3e3eb4fd8fe7f23f2edf2e1f0df908342add9c39e488bc1676ba39 SHA512 8c745c007f86f8c6a867a8c6e747111c4cc3e8f0faf4ad50b2dc4bf92b756b5d3f7b15af9a51e1c7353a45afeced6ad56b420f2af76706fe7d8e542db50ac952
diff --git a/sys-auth/elogind/elogind-246.10-r2.ebuild b/sys-auth/elogind/elogind-246.10-r2.ebuild
index 58f402657a19..614ab85f2f98 100644
--- a/sys-auth/elogind/elogind-246.10-r2.ebuild
+++ b/sys-auth/elogind/elogind-246.10-r2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 inherit linux-info meson pam udev xdg-utils
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116
 	"${FILESDIR}/${P}-revert-polkit-automagic.patch"
 	"${FILESDIR}/${P}-clang-undefined-symbol.patch"
+	"${FILESDIR}/${P}-loong.patch"
 )
 
 pkg_setup() {
diff --git a/sys-auth/elogind/files/elogind-246.10-loong.patch b/sys-auth/elogind/files/elogind-246.10-loong.patch
new file mode 100644
index 000000000000..f2b418f1384a
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-246.10-loong.patch
@@ -0,0 +1,40 @@
+https://github.com/elogind/elogind/pull/231, but made minimal.
+From: Wu Xiaotian <wuxiaotian@loongson.cn>
+Date: Tue, 1 Sep 2020 12:13:18 +0800
+Subject: [PATCH] architecture: Add support for the LoongArch architecture
+
+(cherry picked from commit 5c0968a2d14d5e1afb40a36c55d3f89805712904)
+[resolved merge conflict for minimal diff, also use __loongarch_lp64
+instead of __loongarch64 -- xen0n]
+
+basic: update the Arch tuples for LoongArch
+
+(cherry picked from commit 017228934833d8618774353dcccbc5ec9f78ce98)
+--- a/src/basic/architecture.h
++++ b/src/basic/architecture.h
+@@ -44,6 +44,7 @@ enum {
+         ARCHITECTURE_RISCV64,
+         ARCHITECTURE_ARC,
+         ARCHITECTURE_ARC_BE,
++        ARCHITECTURE_LOONGARCH64,
+         _ARCHITECTURE_MAX,
+         _ARCHITECTURE_INVALID = -1
+ };
+@@ -200,6 +201,17 @@ int uname_architecture(void);
+ #  elif defined(__SH4A__)
+ #    define LIB_ARCH_TUPLE "sh4a-linux-gnu"
+ #  endif
++#elif defined(__loongarch_lp64)
++#  define native_architecture() ARCHITECTURE_LOONGARCH64
++#  if defined(__loongarch_double_float)
++#    define LIB_ARCH_TUPLE "loongarch64-linux-gnuf64"
++#  elif defined(__loongarch_single_float)
++#    define LIB_ARCH_TUPLE "loongarch64-linux-gnuf32"
++#  elif defined(__loongarch_soft_float)
++#    define LIB_ARCH_TUPLE "loongarch64-linux-gnusf"
++#  else
++#    error "Unrecognized loongarch architecture variant"
++#  endif
+ #elif defined(__m68k__)
+ #  define native_architecture() ARCHITECTURE_M68K
+ #  define LIB_ARCH_TUPLE "m68k-linux-gnu"