gentoo resync : 16.01.2018

6 files changed, 75 insertions, 5 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 6144a764f990..caa7dcdef185 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index e33225853802..e0275838dc07 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -1,9 +1,10 @@
+AUX 1.5.12-generatordir.patch 2452 BLAKE2B 43b6dacabd148b3aebc41bcf4f9430b72632fa7ff50f8f1e713a020b1050060f07a762640e050419294d0cd28b5947a27fce6b425e45a9924e4a33720040f478 SHA512 9b0bffdae0eb7958f6a5deabd1f60063a8571e16f715f82296e4776106f5f15d65be10a4b67de723b41e0dc92ad8b0e585ab477cde3d81422e0548db11ee9f2f
 DIST systemd-cron-1.5.10.tar.gz 31191 BLAKE2B c58a0cfec82534baf3daba6f706d054347f3bc5a2d272eb003228b48fc58c9df61ed2045526403295aed3edc9a0c84eaa589c5aea66562bf35d531b4f5ffacd7 SHA512 9a4bbf78c81adf74e589cd9431b5742d5dab63b0346a2330403a7e24bdab62833096445d9fd3e5f6a91f722b3f8176e52734dcc5e2ee0ec23b555e6d01805094
 DIST systemd-cron-1.5.12.tar.gz 31417 BLAKE2B d0776d2c4aa2d86289dd8ab5dade47f083ee7abc16f54c9527130f587049064d6100eaccd4a3a0a461d21ac8286910d3cb0590db14ea1d3a32e591b7ede0a59e SHA512 6f85cef0870cde5ff6b397fb640a30a8a567e09e3cac48456498f1f102395f12f174731ca9cc8e826bb6c49a0d3a6dd49a9aec63e7b75648b7dccfaa499dcea4
 DIST systemd-cron-1.5.3.tar.gz 29105 BLAKE2B c7c95df9be0383aa39a8525d3a5179a04ef1edc77d6c0e34095eb0fe26045c139e4d0c340d6999405baa99d00181cc6c2fb14d87ad401a685aaf3ad7adb5e006 SHA512 ea0241f93b8d92497fa020d84630ee153dc299d9b16b17567784a4dcb5ddf0a4589e7e033428562a862218ef79b192245178df2d7dcc69f779ef9156921674c7
 DIST systemd-cron-1.5.4.tar.gz 30436 BLAKE2B 5ce72e30e68cafbf812690704de4841d0436a97e6a9df12802374a0ef7fe2af4294310e4c14c68d5aa2508c9664402c17dcacb7b6a637f7b83853d97c78c557f SHA512 e6fe60de9d6cbc223b8358bd6b1a060e11f1ea16a8f0b24662914ddb18d827f7b4c62fd40dbefed3d0ac38b1e748998ec5e0430d4ea751e8a20b94b9803bcb89
 EBUILD systemd-cron-1.5.10.ebuild 1934 BLAKE2B 89898ee41545514cd1bab1000aec1ed90073a913aea45bad41dfb9e7f05a4f1bac2b744613d1b3b808a1ea7796118ae35c15264f60c18796934039861df27235 SHA512 08ad3edca36f7402aca3e40ef4ce048f6dd4d238fa6cccb4e8fc287c1dbc885321275a8364d9e0a34f0af29dba8c654735622dda62df6e24a10d6cd40e9a4112
-EBUILD systemd-cron-1.5.12.ebuild 1989 BLAKE2B 52f3aac5841c24d227c9c61ce74949b9404036449937738acbebdf994bc653478732e9d26d1ac21026e8f9e6b747e0d0d0fa785b4b035959eddf08a72f5a13ba SHA512 261afa0863dfde45a83aa1f66f3e0a18d0f2064eebb044196a9dc67c880589fd8655588472fb755c7548eb575702d720a69651e5dc9413faea4d0bae0d1424e3
+EBUILD systemd-cron-1.5.12-r1.ebuild 2038 BLAKE2B 1da19673c997792ac515cc297d4924f08eb6ba05ac2797c8809435ec788bb753296afdd9d67904d86e2bc3d1c40b1d8ec6f3e456bd2df41524e491180c3072d1 SHA512 274ac736b4f10ae2b59aa038456eb85b0d7f78ff3d24d3c94407262ca0d07faaa14539f0dd2dec1d6e5a7b4b4d1a41bc1da137eb8d5a4bb0be1985ec919df933
 EBUILD systemd-cron-1.5.3.ebuild 1928 BLAKE2B d62cf3310fa4af92735f0d4552420e07319c87377488e788bf23fd2db7d78d93c41dc3f15b0c4f9f23ea6245092155fb2101bbc3ee67a0fbd28fb862d17387d4 SHA512 5e370da06605db4f6d2366628ecbd498894302278795b530e78c16ef941b79f1aca94b2ae115c76544f53023429990708215b649cee30c18ef46dec45dd397e9
 EBUILD systemd-cron-1.5.4.ebuild 1932 BLAKE2B ffd5b09ab515b37252a43060a9a936a8461c3649699088d94e927cef81189acbd72a75d020809cee93fb78386ceb87a637d8026f0f5d364e8823b7e501135cb8 SHA512 d021886a0c23a7096097467b0794b0cf2756ce09af31a2f510fdefd3a8631c79e79383d153d60cba168d90e602c59d848a884722f44afc76f058af3d3205f519
 MISC metadata.xml 696 BLAKE2B 9487789802e271bb95d8c44c5f279f8c850b928e8a2547ce7a1b47e2db3aef119265c0d8e36b8dfba3c62e3b7d4ccc040ba7983dec6c6328fc11e10e7ffd4ecc SHA512 54efb7e34c7e83c0ac3e964e300705b3b33c2dd93dc711c6e71b9d93d83a627f0318ce757b01feb6d6e1edd228f94ab180394617803dcc23c5e73aece9c9f7c1
diff --git a/sys-process/systemd-cron/files/1.5.12-generatordir.patch b/sys-process/systemd-cron/files/1.5.12-generatordir.patch
new file mode 100644
index 000000000000..71c0abd4d804
--- /dev/null
+++ b/sys-process/systemd-cron/files/1.5.12-generatordir.patch
@@ -0,0 +1,67 @@
+From e9c1dcd5e1a475a1974f0a6464637c4ab731bfae Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 13 Jan 2018 11:42:05 -0500
+Subject: [PATCH] Replace remaining references to
+ @libdir@/systemd/system-generators
+
+---
+ Makefile.in                            | 1 +
+ src/bin/crontab.py                     | 2 +-
+ src/man/systemd-crontab-generator.8.in | 6 +++---
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b9a9b02..e5a2df8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -60,6 +60,7 @@ define in2out
+ 		-e "s|\@bindir\@|$(bindir)|g" \
+ 		-e "s|\@libdir\@|$(libdir)|g" \
+ 		-e "s|\@unitdir\@|$(unitdir)|g" \
++		-e "s|\@generatordir\@|$(generatordir)|g" \
+ 		-e "s|\@runparts\@|$(runparts)|g" \
+ 		-e "s|\@version\@|$(version)|g" \
+ 		-e "s|\@persistent\@|$(persistent)|g" \
+diff --git a/src/bin/crontab.py b/src/bin/crontab.py
+index d95b31e..921db1a 100755
+--- a/src/bin/crontab.py
++++ b/src/bin/crontab.py
+@@ -333,7 +333,7 @@ if __name__ == '__main__':
+             'show': show,
+             }.get(args.action, replace)
+ 
+-    loader = importlib.machinery.SourceFileLoader('name', '@libdir@/systemd/system-generators/systemd-crontab-generator')
++    loader = importlib.machinery.SourceFileLoader('name', '@generatordir@/systemd-crontab-generator')
+     parser = loader.load_module()
+ 
+     action(cron_file, args)
+diff --git a/src/man/systemd-crontab-generator.8.in b/src/man/systemd-crontab-generator.8.in
+index ea69688..dedf1d2 100644
+--- a/src/man/systemd-crontab-generator.8.in
++++ b/src/man/systemd-crontab-generator.8.in
+@@ -4,7 +4,7 @@
+ systemd-crontab-generator - translate cron schedules in systemd Units
+ 
+ .SH SYNOPSIS
+-@libdir@/systemd/system-generators/systemd-crontab-generator output_folder
++@generatordir@/systemd-crontab-generator output_folder
+ 
+ .SH DESCRIPTION
+ systemd-crontab-generator is a generator that translates the legacy cron files (see FILES)
+@@ -77,11 +77,11 @@ to have a overview of timers and know when they will elapse.
+ 
+ If you get errors like
+ .br
+-.B @libdir@/systemd/system-generators/systemd-crontab-generator failed with error code 1.
++.B @generatordir@/systemd-crontab-generator failed with error code 1.
+ .br
+ in the journal, you can manually run
+ .br
+-.B "@libdir@/systemd/system-generators/systemd-crontab-generator /tmp"
++.B "@generatordir@/systemd-crontab-generator /tmp"
+ .br
+ to get a more verbose error message.
+ 
+-- 
+2.16.0.rc0
+
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.12.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
index f3b6cfa0938a..44cfac6b53b7 100644
--- a/sys-process/systemd-cron/systemd-cron-1.5.12.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,8 @@ DEPEND="sys-process/cronbase
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
+	epatch "${FILESDIR}/1.5.12-generatordir.patch"
+
 	python_fix_shebang --force "${S}/src/bin"
 
 	sed -i \
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index f48dc4128d34..6c02c45e0379 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -6,5 +6,5 @@ DIST time-1.7.2.tar.gz 108371 BLAKE2B 17d83faa24974fdd5853d83b0524a9f97780db19c4
 DIST time-1.7.tar.gz 103066 BLAKE2B 900df9031f90fbdab5b778c8ec61b3fe5efb2cb6a21834a31e3eefe845e05977b7c3206579e0bd7959f4dd5a34a909b16cc96f743aaf81cc1edb182a5669c68c SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1
 EBUILD time-1.7-r1.ebuild 557 BLAKE2B 8d590bfbc57301a251d16908277f659d974eb83a4f121903782626b61b8fd852ccd8b38e641eb0c82489fc555a1450e03a5deffa1ff7fe2ffe7c832060d312b3 SHA512 5b627020ad01ba84c38cd154eede8bd1e9cdd8ff26ddb43be298bf1dc06720111d12d583e90997c8fdb582805cef40bd20ad5d54deb26b15c30e801efdc1fd69
 EBUILD time-1.7-r3.ebuild 643 BLAKE2B dd0f80a88ce6217c1e14248ebc51629f745dedb882f7853e249df18424ebda5638775e00233a7299282c5d3173dcdf0c7d6b55172cb336e480f250c1ee246dd3 SHA512 385137702371965342aa1178b21ed070f8bcc26a771d6c3d42e80de0bb2ce71ddebedb0e47fb833edf37aa148acbb06b690200fd3ac2f900ee46326466c2149f
-EBUILD time-1.7.2.ebuild 688 BLAKE2B 86febf3ac3937a78d074d922bec1a48551fc8977db34f542c347644fe78794c2cb9d2b5f4f1618fce528aeba908021a0d9a718442afdb5b8c235e50e905b0298 SHA512 953d0fc78115d4b47649b80e7e5abafe48f0e94459ce23a6dfd2c6e9b98fe502a9b080a65420c9c2f0ec48d6cf53813b72de51cb461503608dad963e13132b53
+EBUILD time-1.7.2.ebuild 686 BLAKE2B 5fc59a26e7d20dfd1facba68f3d3f594d2556849ec04b4bae49ff9f4eca6b7c7b6acd945782a514873cc10a7a5d212faafbfcafd9bd9520818401953fced01c5 SHA512 4b88a0e8c681014c8ec888fc52033bf996cff11fcd67bf0b40f11ce7ad0c37c76e621e8ae21158d2f9c2a7ab8247594e59ca7e80b1740470a8db7a6efe13b035
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/time/time-1.7.2.ebuild b/sys-process/time/time-1.7.2.ebuild
index ed96169755c3..f0fed0f7db1d 100644
--- a/sys-process/time/time-1.7.2.ebuild
+++ b/sys-process/time/time-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://git.savannah.gnu.org/cgit/time.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"