gentoo resync : 07.07.2018

5 files changed, 30 insertions, 29 deletions

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index df85e94ba0e1..1da138a75f84 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,13 +1,13 @@
 AUX elogind-235.2-docs.patch 652 BLAKE2B c1d5336d18942efb082e39b2278b8af88da5da37c54a9cca0a9fd45f11fc8751da720d80dfad2c2688ebe81cac3101b491a098b516403bd4c46d9c277d39b2e8 SHA512 59179098c638b8b7228ed6013ff133305138b4aff32e8210fddcc8b056e21d2baeb8619debc9c2231f629cd5c99b79040da677f1eddc958119e488a91222f011
 AUX elogind-235.2-drop-logintest.patch 451 BLAKE2B 61c25c176fd85786d899b34831c320e364b91e8f250c323caf1a5badb531cd58281ef5ac43347a4b94f44e7a40232d5cfded4c3ee7a113cbfd440bc24b13fbd9 SHA512 9017ceb04a779dbc5a2dbc5f1fa4c412d8538626696815f9a6ace3acb4c7d3dc1ca7685292b02483a2f80bc6685769efc853dcedd0e71e13bdbd324bb16ceafe
 AUX elogind-235.2-legacy-cgroupmode.patch 2527 BLAKE2B de50970f6c930b2ff35f6ecc4119e06abb23cbc02fcdb649930258b717ab05cb5b4b1ad8de1e89da705c8a1b66093eedba984c0a831fd60cef3d9704e09c6161 SHA512 1c98981db6efc6afb779aef93fd4cd7ba31a1995d74d1edea9b486c4724fe7bc215df95745a3553324750794530466679cbde491bf01ed5bab99a20eda135bb2
-AUX elogind-236.1-docs.patch 791 BLAKE2B fd3c73c92c1a8d84216e68a19890af4acb269e633aa1ea840e51e8e676ccfaa353ae82bc18a85b72da4101d4a71946da567e53eee1d2a33c8f674401b0d31fda SHA512 f94db7e90bbb55dbe44f1d0b3bbc02aa67ec3721990cf43251e92d540d2a0d1685dea031bda7a183c61bfae5a837fe9dd06c61e8d9b1cfe91a6ddd95ada83f57
+AUX elogind-238.1-docs.patch 793 BLAKE2B eb6683d5bf221459fb0ff0aab6f10f179769bcaf6a914f6b41f8526ee2075924f80cee1cd320aa7697d60bed24d5652e6bc8c02451a0da98c4b29cb8a73641ce SHA512 16503a616b511e4cf049260c34b1390844ce06b22a99e31813b11886d1dc12c90aa46b3dc67343b2a33df85923b5cd6116d7338ee9bd32f2d7a9be9db934ca74
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
-DIST elogind-235.4.tar.gz 1019339 BLAKE2B 728e6707f57f43acf9a40e127fe2e53389cbcba1c96b79f96b23dc7d2ffdc3c84efdd55905a22cbeae0442d9278fd1e9371904c2da8aa29c00f79b879522b2c6 SHA512 43a4a25219c234214b1541f17c4aec65847e62ebbeeb223c7890f6648a2ffadc8388e4c526ab49df9ff1f216160810c601c7609098b9b2955bc63142f684b16e
-DIST elogind-236.1.tar.gz 1050387 BLAKE2B d0d295210eb07374cae738f55b472d9410f68c9e7f318dd736b5fcb5c0409c3da144988d8042b1e3b103d34d7a02471b4e316a924c9b1640c605fc73972de3da SHA512 ab4989f4467ef001bb8b837035bee870beaf5ec5fa2389649bdcad2fe7bbf82691bfd3176cf9a3bf3b5c232c77210f431f2d38ebdbfd09f5a7868cd50e476c59
+DIST elogind-235.5.tar.gz 990321 BLAKE2B 03730f449e01ef74a92aa3313f59b93de3941425f95610e2d50dd6a0651682df5f2e245f9eeaeef5c5fd38300102fbccc980a55466ea12100e8904f126a5c44f SHA512 8f12c576f291fb9768e343e8257c74c62686f1a67b10170715b678e0431692cec7b6382102467dd2598a331c20d823d935128d5ff36f5b074dc02802ffec863c
+DIST elogind-238.1.tar.gz 1074179 BLAKE2B 3041e9cfa0d454f653db164db8e59af4db5f3821bbb65cb5482d83f63e410612e121791f7ef3e08c9ac3940c7b6c7931df2b072ba452d2073c3e424e4dfe10c3 SHA512 ba0a74e9b9168b08a54b13ed500e9c713c48bb1648aa6064dbe666a96fa3fbd5b69447c35f686db3a1813476a5585be34b1ae13e3c9017eac8171b73f6311c4c
 EBUILD elogind-235.2-r2.ebuild 3274 BLAKE2B 01b8ed8c003382dc7eaf676a2b95493c442c673306405a832f174dabf025c0787daee1b98bfc584480f78b608fe4281a81b3ed554e14156d3c045ddee6c95da8 SHA512 f866e80c5631e3fae2269f5f12350e76a15ccea6186325319bc7c05ddade5cf0055761b6e01e068391fcda7dcff107437dbba31745a91ed04fefdd81f90c3402
-EBUILD elogind-235.4.ebuild 3248 BLAKE2B ea8412e276879ad063cba63f3385d152464120344d041bc900370344d7a4233a3b3496f428cea8b91703e3b02383e0d0bc2cf00c5683188baadbb9a6acf0fc1f SHA512 12fd4d2a03049406ed12d5c436b6386938e15b5a92b03114a4e1f76c7dd2671c5cbb5a613ac0fb5455cf2d472f287b7bb0344135ef4fb66739381d3da779b6ea
-EBUILD elogind-236.1.ebuild 3116 BLAKE2B bf36f5cc6d55be2443f08bc70fe6a94ab6af175b66491e39676ff7fe868bd95a45efbac4d17facac75a2fa8ea096cbcc12bffc251ce80206ff05f9513a11c7cb SHA512 7f3f17016a3528ea5e7e0550e006cbce0ca5dc438438b6c8c8afd330e788fe18398fd959e65f248b10e894a4898c4d2c2b3dac4fb9f505b107298ac8ec17c004
+EBUILD elogind-235.5.ebuild 3248 BLAKE2B ea8412e276879ad063cba63f3385d152464120344d041bc900370344d7a4233a3b3496f428cea8b91703e3b02383e0d0bc2cf00c5683188baadbb9a6acf0fc1f SHA512 12fd4d2a03049406ed12d5c436b6386938e15b5a92b03114a4e1f76c7dd2671c5cbb5a613ac0fb5455cf2d472f287b7bb0344135ef4fb66739381d3da779b6ea
+EBUILD elogind-238.1.ebuild 3171 BLAKE2B 2097e4ce51024006d51ee7248c29c1d24d9989f83c17da1c6b503582f82a1af258d4873207830a62914cde67dbd94900c457d47adaf11314693b37b651472942 SHA512 f0c93cecc2561a254516f2a0a7c415989a5ecedb0399374d64838c154ebbb7b00c91aabf931597a1938b3a150ee01ccf07d28f317302ad1a3dd416b1a4bb819f
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-235.4.ebuild b/sys-auth/elogind/elogind-235.5.ebuild
index c2dbf0ad0277..c2dbf0ad0277 100644
--- a/sys-auth/elogind/elogind-235.4.ebuild
+++ b/sys-auth/elogind/elogind-235.5.ebuild
diff --git a/sys-auth/elogind/elogind-236.1.ebuild b/sys-auth/elogind/elogind-238.1.ebuild
index 4a29aef92814..c532686d9faa 100644
--- a/sys-auth/elogind/elogind-236.1.ebuild
+++ b/sys-auth/elogind/elogind-238.1.ebuild
@@ -39,6 +39,8 @@ PDEPEND="
 	policykit? ( sys-auth/polkit )
 "
 
+DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+
 PATCHES=( "${FILESDIR}/${P}-docs.patch" )
 
 pkg_setup() {
diff --git a/sys-auth/elogind/files/elogind-236.1-docs.patch b/sys-auth/elogind/files/elogind-236.1-docs.patch
deleted file mode 100644
index 46c6fa9b9ce6..000000000000
--- a/sys-auth/elogind/files/elogind-236.1-docs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/meson.build	2018-04-20 17:19:23.912940283 +0200
-+++ b/meson.build	2018-04-20 17:20:02.265941434 +0200
-@@ -2800,20 +2800,7 @@
- # install_data('modprobe.d/systemd.conf',
- #              install_dir : modprobedir)
- #endif // 0
--install_data('README',
--             'NEWS',
--             'CODING_STYLE',
--#if 0 /// UNNEEDED by elogind
--#              'DISTRO_PORTING',
--#              'ENVIRONMENT.md',
--#endif // 0
--             'LICENSE.GPL2',
--             'LICENSE.LGPL2.1',
--             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
--#if 0 /// UNNEEDED by elogind
--#              'TRANSIENT-SETTINGS.md',
--#              'UIDS-GIDS.md',
--#endif // 0
-+install_data('src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
-              install_dir : docdir)
- 
- #if 0 /// UNNEEDED by elogind
diff --git a/sys-auth/elogind/files/elogind-238.1-docs.patch b/sys-auth/elogind/files/elogind-238.1-docs.patch
new file mode 100644
index 000000000000..2288ddfecb32
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-238.1-docs.patch
@@ -0,0 +1,23 @@
+--- a/meson.build	2018-06-25 16:41:00.000000000 +0200
++++ b/meson.build	2018-06-30 21:45:52.139755680 +0200
+@@ -2928,11 +2928,6 @@
+ # install_data('modprobe.d/systemd.conf',
+ #              install_dir : modprobedir)
+ #endif // 0
+-install_data('LICENSE.GPL2',
+-             'LICENSE.LGPL2.1',
+-             'NEWS',
+-             'README',
+-             'doc/CODING_STYLE',
+ #if 0 /// irrelevant for elogind
+ #              'doc/DISTRO_PORTING',
+ #              'doc/ENVIRONMENT.md',
+@@ -2941,8 +2936,6 @@
+ #              'doc/TRANSLATORS',
+ #              'doc/UIDS-GIDS.md',
+ #endif // 0
+-             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
+-             install_dir : docdir)
+ 
+ #if 0 /// UNNEEDED by elogind
+ # meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))