gentoo resync : 30.12.2017

13 files changed, 27 insertions, 73 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3c11da37ec87..1d7f9abffc10 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 424c08ea9154..e99abc2f7819 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,5 @@
 DIST bleachbit-1.12.tar.bz2 396838 BLAKE2B 1784b5bc6602e5599b29ffbd0ad0f27f05ffe3aaab25756e3e07fff56c72517493b551063975c943a0e16efc2ecb30fdf69878577b8a5b27eccfdfb3bdd59c40 SHA512 b9c13a75b86eebbedaf928394714ac4d7847b8d53d345a4884acee68cd9c46ff1d5f4108479d7695109bad03c0fcdbb6f89e77d8794a60697fd5c6acdb34530c
-DIST bleachbit-1.17.tar.gz 867671 BLAKE2B aca71b2e552ff21aab3e86a4200096d5d22bd451111d38bd487dd6ca77aff862917c324ede679e7860cad3d6671aec900d16f8b08a5eb488780bfb18631efd7c SHA512 c1d7d266e7baef532a9826ce1a0fb8cd247136a335c3236ba7cf6e4f7af4420e4f0f424fb98579c5433ebd55138860657a3fad3ad56ed4f4a3f8163526a73e95
+DIST bleachbit-1.19.tar.gz 881530 BLAKE2B b3a9ebe066828ead728f4393ba9d52b92967004638f7d74a5dd0576693d2e7ee37eb9e4e4352b973602b7bd6179c7b3a5816109f3f57a56e95c5cbfde32472c3 SHA512 2543a121786ae41c535c7faaf9741808bca57bde75da9b7df75c2653e2864441713fe3b3388ff71db2e88dc9626b457c656fa713774899b7a4912d05329b7eb2
 EBUILD bleachbit-1.12.ebuild 1497 BLAKE2B 2f9511605fc483f3f853c1d7b19e1b7884fb075002843b9dba66b1f21b5849c7ba21e1219d5513b92e0a1477eca63c06d6d9383329af9fb10f172ad1119cdeed SHA512 4083aa52a3ae8091bb2532496ad1aa8c7aa48c68c371e8d681fb85c6e6d3745d76ccdb5181f15c61d8a4b07d3ea6220dde37f66848fe2753597da921841ef4fd
-EBUILD bleachbit-1.17.ebuild 1534 BLAKE2B 18049051ad95b835f425bb15ce981a1af5b8a2cf7dde3ce2852133359a5afaeabdc3a530fcee91470b2af71d8fe15b5d293b1189b7e98dc38587f7528c88ad48 SHA512 f0b91c0bc386651ca27a29529cbcc548b3ce2eebbf519b7f5c2d1333eea843eaa689f23da72be3903a663e306b21fc3ab24030e76e906275b186330fe357daa0
+EBUILD bleachbit-1.19.ebuild 1567 BLAKE2B f8f50413837c83750d5cbcd67038e931384edb7b5d653a58f0d83de1faf26b84048601111fde83107451972af84b1c53f592df0827b1ea5a003ae85be58135de SHA512 c0666b6df68ac3c17309e7dcb204232e7c2f5410b9d4e51da28a52f0cb1f9f5d58daf4839fa47f71c3c52a284d58dc39ac1c0a87232eb71a4257e0e3e5ee881c
 MISC metadata.xml 617 BLAKE2B 930c1ca3322834f2a34c95dc13450e265d69f982357f69b746cd21491ff460922f5f2165487b831883433554dada44f57ce75a76684fff7dc9a9a85197e4eff6 SHA512 d33574458859889b096a77c7855cbf02d294abe9ef6c8b01aca43d33dafa41ea4da409483cca276ff2fe5fa96875cc53db8e0c18108116f4c5c4e9f8dda9f212
diff --git a/sys-apps/bleachbit/bleachbit-1.17.ebuild b/sys-apps/bleachbit/bleachbit-1.19.ebuild
index 997d4a6fd02d..f6f51d048670 100644
--- a/sys-apps/bleachbit/bleachbit-1.17.ebuild
+++ b/sys-apps/bleachbit/bleachbit-1.19.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=6
 
-PLOCALES="ar ast be bg bn bs ca cs da de el en_AU en_CA en_GB eo es et eu \
-fa fi fo fr gl he hi hr hu hy ia id it ja ko ku ky lt lv ms my nb nds nl nn \
-pl pt pt_BR ro ru se si sk sl sq sr sv ta te th tr ug uk uz vi zh_CN zh_TW"
+PLOCALES="
+	ar ast be bg bn bs ca cs da de el en_AU en_CA en_GB eo es et eu fa fi fo fr
+	gl he hi hr hu hy ia id it ja ko ku ky lt lv ms my nb nds nl nn pl pt pt_BR
+	ro ru se si sk sl sq sr sv ta te th tr ug uk uz vi zh_CN zh_TW"
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
+PYTHON_REQ_USE="sqlite(+)"
 
 inherit distutils-r1 eutils l10n
 
@@ -27,18 +28,20 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-DOCS=( README.md )
-
 python_prepare_all() {
 	rem_locale() {
-		rm "po/${1}.po" || die "removing of ${1}.po failed"
+		rm "po/${1}.po" &>/dev/null
+		if [[ $? -ne 0 ]]; then
+			eerror "Removing of ${1}.po failed"
+			die
+		fi
 	}
 
 	l10n_find_plocales_changes po "" ".po"
 	l10n_for_each_disabled_locale_do rem_locale
 
 	# choose correct Python implementation, bug #465254
-	sed -i -e 's/python/$(PYTHON)/g' po/Makefile || die
+	sed -i 's/python/$(PYTHON)/g' po/Makefile || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index abfac87dee4b..7ce6e020fbc8 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -16,7 +16,7 @@ DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178
 EBUILD coreutils-8.25.ebuild 5839 BLAKE2B 118fc33f8b2ce4dcb1b797af0630e3aa6ba45f491d220a700841f53201578afabb3088ad06552080a42137db7ff9d930c25d232d4c71b082c0e1e16f5d732348 SHA512 86a917921cfd7c20755c2570c58438f7bfe923f8838e91508300a745a4417038cc81112a50972f288a02ff3acbb0405ac01784170fbebd62c9ac4c1e40294816
 EBUILD coreutils-8.26.ebuild 5858 BLAKE2B 9247499208fc8e9155b0b107dea5cd99b7e1da3ebc55c2cac9c25c4939d7a522afb8de33398169635c678fae8a0f58ee981d9542074e47aa0a6fe56041ae478e SHA512 fc8a6d01fb2e3885b876756dbc0c4a78e0300d470ca2e845de5045f6dc79f8d004b7069ca5df40bfee05662bbc01d05107ad793c868e2b6451b757fb2e149e14
 EBUILD coreutils-8.27.ebuild 5901 BLAKE2B e15c043848f33eb817f0237b1428928feb5063b2b2e553667aff0b7ed5b81062fcb8e078d4419da2c6196de56d5dfeab7a849ee25afa4bdc80109f90d43c508a SHA512 a230b81b5913e0b98efe30f2876587178539c9dd462424c4eb71f5572fd496e4b0224f76cef92be973601f022f439ee36da393fabf4b70c2bfec71785321e8cd
-EBUILD coreutils-8.28-r1.ebuild 6520 BLAKE2B 463623c05335243d7b35ec6b4c7642079a453cb0b72b836698c68ee45f4b62fe414b03fff36e22b95edd98c9a66c4884bf2a2f1d2e7087ba1cfab7b2e169e4d1 SHA512 de62d39fc94f065075072cdd4ddf1f953742779699bb3568d3b52d45d82460cd8aa859befecf788024258ad6cf8598265421960ccb7e1a42cbae82e81e3464e2
+EBUILD coreutils-8.28-r1.ebuild 6519 BLAKE2B 729b4c09c9f077f25dd4635966b41d84ee1e5b04ae57953c2fa9e65ec67c31a986e172398d485e8c27fbab9b607e4d72fb28f98e537f14066658c6fe33af08b4 SHA512 8e8ea79d2641a27bf93eb6b915fb36623bff128a5e213886d293a255d7b3d72467959264f0dd1fd1203d88f9d7dd49211d4a195fd15d0010b927fbc2753b98ef
 EBUILD coreutils-8.28.ebuild 5871 BLAKE2B de4df961f1615d7acec165054e2118b81eb091d09ba7bdb773bb6592234643312713d78d09ad9def4cea37e0f41618426b089e4b5f4e9f14f95d751f1f90cc4b SHA512 e3f725bf850b21e6881465b29dca4984dc61a6cf0efc24f7c5ae970142cee83cdfd3fd1a8a8ab8801a66d99e40acffe655c6739c4c026c5c2deebdc19abd58bf
 EBUILD coreutils-8.29.ebuild 6063 BLAKE2B 3582ae6e941fa7d6dc47729939ebec016d6d682d616069cac70c58dc34ecf13820820191be18c353f0fc4d86bb6af7becd888024fa5cf21c718c005c26bebd90 SHA512 095b2958618e972ae9f6d04f7868acc97996a3fbd8bede850d6f215d392736cfe046ee5afb99919e10f34b1dfbcbdd501ef37880f9d6ab0a697d68e342231196
 MISC metadata.xml 869 BLAKE2B 397aa866d67eb1d6ff5f604194cf071be0f75606092d78e1cf7f0ced85cf4474d67677307e7e8566ba402c1f94ae2f3e3906ef5006a50e73d6673edb25d517fa SHA512 19e07c93cbe1cfe087eb7fdc8647aa4c264f1e6a193a0ed4e1ceb302bda92565aa76966b6ef2efa15d7535082ef0e6a1454fee20eca4797466f5de5e37ac4957
diff --git a/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
index 53444b8ef631..5557723c9a86 100644
--- a/sys-apps/coreutils/coreutils-8.28-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index ad339dd2dbf7..f10545708d92 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -3,5 +3,5 @@ DIST UnicodeData-6.1.0.txt.xz 129972 BLAKE2B 52836b9db627cbc8608a148eb179f982679
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
 EBUILD miscfiles-1.5-r1.ebuild 1683 BLAKE2B 72bbc5e04b22a712ad54a9d8015ea679d805924684250ad253b7a5e457599afe9804b1e963ea50e70336eda9ef7c035afdc7c538f6b2f896656e579c37cdb24f SHA512 f3d4498d846974f4a7afb0fc09ac4755ccaa0c4dcba7f5ff7184942ebd0b45c786a58525e12d0c8d3b38890c263511432f78f699ac7768a398abfa8eb6e6bf95
 EBUILD miscfiles-1.5-r2.ebuild 1847 BLAKE2B f6671e00682d3d4f37d95e14805df13f0bdba76ae062c3aa8bc9c44c1095cd08c1b7605396820d778750b8a109e9fc26f2d843e988abac0a0615af546b649e2a SHA512 a5bd1e9d5df82ad02d567a2b73e8ba71bffc73c8ab1406222f19ecdc09bb81c9aadf906fae02af4b749a095dc62e1fa515d8754873c6fe03bd46f8057794324b
-EBUILD miscfiles-1.5-r3.ebuild 1859 BLAKE2B 1b4019d20ff82b1e1f95ffef65984f7248aaeab98411780123db383c037473bdc74dd9c9ba57158b71534795007860a877f08a3231bb1cb07147dc2976ca590b SHA512 901d0b1c1766df36166a8182dda2ea375871b2ebf0b056387eb3db7e6ddf001221b9d3af23984b94e5676101f6c29c338c42aa04739c4e0e23f4953fa3ec9115
+EBUILD miscfiles-1.5-r3.ebuild 1858 BLAKE2B b2b0f77852bd43a3e431ec8814f1a339d339f0dd50945d2109adbdb01170679f8eac20d4641bce0767032a6a50a6a21aeb4ab05ee77ddd2e3feb526f0c55d880 SHA512 b43c31213159e7631e8f927b03a0a0f38a78f744eafca4a18acae7964500ef662b4b68f8d83082942122cae5fbc37946728dcd6f8eb7e4ce3c513e4d1b88cccc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 6ace16972edc..bea4785a2fad 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="minimal"
 
 # Collides with older versions/revisions
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 87f529603341..f5d278c56bf8 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -8,6 +8,6 @@ AUX shadow-4.4-prototypes.patch 1232 BLAKE2B 757a6db113b6873994dcacfd6867a14e7d3
 AUX shadow-4.4-su-snprintf.patch 849 BLAKE2B 62cb1498bd79991373b1bc8241a07dfcd731ebba7a39406958b30bd0287c8acab65a9a22bcee8ba95073e36c7a8d0b1931b988b4b5963041f61db9ef4c5dbdeb SHA512 2aaa1c847ec34002c6e63af66fb36664e0fc5dc0b719ab38959043f990e84191f5e2f85c2dc44e324abcfe67691c9a9b8181da49077031e2eaaf979dde95b2d9
 DIST shadow-4.4.tar.gz 3706812 BLAKE2B b4dc056643ea507af975df68a1775193c942227aef4ff0d19fcc70392e5410da076d3cc9ad1c58082ec992f2aaa35037dd7de9e6563f783aaed96b2007055ab1 SHA512 c1e0f65a4fbd0f9d8de38e488b4a374cac5c476180e233269fc666988d9201c0dcc694605c5e54d54f81039c2e30c95b14c12f10adef749a45cc31f0b4b5d5a6
 DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40058b44c401bbbdf83c238fcf48e6e6e663d8a61f614b6291ea524862d9d2425d7d839340a10f8fb7c8eaa85 SHA512 02d6482a1159689e404dd49a68b4e2db85e9ffdcdfbacc8efcbd9043f14a1ec3fc4d749700df915d375df67d589219b6b0f57a6cfd9fb5b197012888a608913b
-EBUILD shadow-4.4-r2.ebuild 5520 BLAKE2B e1b1d599a269ffbc0022965747f3e3503eaffd46d961850e8f8846223bbc203c2e4fc4da39accde53e2d7792066bc7ec345b797378c886d9290b7c9100476662 SHA512 c6becedeaf7faf85960cd3e198dff4c0e60d13af6b27127110f146f049bac0fdf068b65ba472ff035c97afc18aa3e9f5d2cdf2f17869b76828329ba7f481a51b
-EBUILD shadow-4.5.ebuild 5361 BLAKE2B db2210f9fc0a3a0eee802b419db020f25116b77b3e847483efd2b7fd8d9ab22533bdabb56e3a4c6c71460a3b4ef1e7a90b46dc329b5fac49ed8cad7aa46f8c52 SHA512 64e19d0303790ec1145b02e207b97e63d1c0fa41f4f9ea6e697fffff3f122fb989f1d84a6e188ccc533529050f286969b3b0b326e6a318dde31f5e1cf43a82aa
+EBUILD shadow-4.4-r2.ebuild 5521 BLAKE2B 0f4da4a37cf2ceefb74b489c13c0dd5dc2d548b0c7bfd70d0959d00d986bb78ccd6cfc621c7392af639d6899450ea2c814d605c27def9308f70aac04497e529d SHA512 db3958bf4835aba1ae029add8c6b43ba3698c198c47707b96ef4e5a10145baac3124bd22139bb4051f90defcfafc0b94d83f502e63a8fde2760117374594cbd0
+EBUILD shadow-4.5.ebuild 5362 BLAKE2B 80152730e266e66c14b16763a639dd309c233733080955fb41b1b4c4e625b45b0f961728eca75b4df89c48d71a206a6c16f01752386285eeaf0c5213eeb5af5b SHA512 745123831ab15d52b9f7f6871af87e8d13c2baaf4ecbcbd8e13549ace90b111a3ec92a5a35deb418d5ef62229641cef1e2add485a8a22e2405cdd0a651991117
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.4-r2.ebuild b/sys-apps/shadow/shadow-4.4-r2.ebuild
index c14915cc1965..429fa198d37f 100644
--- a/sys-apps/shadow/shadow-4.4-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="acl audit cracklib nls pam selinux skey xattr"
+IUSE="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
diff --git a/sys-apps/shadow/shadow-4.5.ebuild b/sys-apps/shadow/shadow-4.5.ebuild
index 901900f22324..e1ca2b3ce598 100644
--- a/sys-apps/shadow/shadow-4.5.ebuild
+++ b/sys-apps/shadow/shadow-4.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="acl audit cracklib nls pam selinux skey xattr"
+IUSE="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 9ad06c4ab728..a66a30fad5e6 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -4,7 +4,6 @@ AUX 233-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022f
 AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376
 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78
-AUX 236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch 1826 BLAKE2B 5df29b904142e88e33f133b53e4ad3bffd6e6698fdfdb6ffe66c0b7142305c5f119b1d6e5a02f5122d357cdc923af35ee07eb628833964148d3790b5254c6c3e SHA512 8ae19a0b8143eb45a566ce81ae37e2a0783cf352700842751ac817995c733b5e1fd7d594ebde7a504880cfe3358d59cd65ff139b50d3b7fb034b91cc9f2a8bc5
 AUX 236-uucp-group.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
 AUX CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9
 AUX generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
@@ -13,9 +12,10 @@ DIST systemd-233-man.tar.gz 31386 BLAKE2B e4947e658db3efeec6b5a6adf340d2cc8e8aff
 DIST systemd-233-patches.tar.gz 12553 BLAKE2B 5d19f2dc82cc6cbd9b2e9393f932dfa3c88a981358b282fe56d43cd432d0ee0c0245e9c13d5460b94d83908b84a382dad3348b999f2356ab3ef2ae2c542a867d SHA512 3081f4cf64542ba64a28fe2eff11d8040af42255eb99b5210db9d583fc4b4360a4a4bb8769a1e43d38474d69ead681974cb98d4605968b38f98fd3d9b40bf211
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
+DIST systemd-236-patches-0.tar.gz 2545 BLAKE2B 9c5aa8e845726b4324cefa41397b0be283b8583cec4b7ded08b3e8909747015bc55fafd8502eac38c62985d5a8a6364e9d3eb71b68b1950c400bde11c14335d9 SHA512 1951fec7ccb1856c7a893a47c6d1931e60465d71ccb9d5a6ace3595d5a2bea75fa92c89aac2791e4deb2df19e580dec87eb0252ed81ed3b8dd4cdf2ca587cf83
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 EBUILD systemd-233-r6.ebuild 13575 BLAKE2B a4d8da1fe7fbc67f679524228512e4bd400573ac144327af395ea82ebfee22f58d30bd2b4407ad2f0ee73f6499289ef2fca57568993e9699849463d6c6a9171c SHA512 848b2868bea39128b1163f3fe1e0ba4ae4533225fe054e81f157970795feedded32d7df145ee834010b65943d4c4407839814f1d540a53c8cf82c4333fe0a2d3
 EBUILD systemd-235-r1.ebuild 13484 BLAKE2B 9a037516042b6d8527b1eb4fd248883112b605563ef01492a3ffd98b39d0e51092656824677d46d13e48c4f36ddf5f1d30e3866821bc93ee2b581caa52b71cdc SHA512 76d568a6a97965d9bf38c5e5409da1db6fedde7186f3cebca5a19cfc5b27ce2d711d99cdadefd92630887d4254e87b0355310bb865c122e958b817dc52d8df37
-EBUILD systemd-236-r1.ebuild 12905 BLAKE2B 1399a68779188d424f1f1232ac530f04ecc0c65e94d8e859418a8819c4c91fae800582d71624a24deecb1dc5733776eba67de5f2536306e11bfc2d3fd58b3c06 SHA512 e2ff9d00e3940d24761363c67a83f83264fc0fd3a3ff0e64940932f64c4f996b00cf5f6f9c16765d5eec0afd8d3096619212e6a30547d5a560da3721ddc9123f
+EBUILD systemd-236-r2.ebuild 12882 BLAKE2B 3091b2e72f9b340141a7492de9a3bcc632fbbf9d00ef9d401c89be736a83d45046437d4d9484745c97c416b80874038d3441dab5d47d15786689973e05a5461e SHA512 2bb6da515ca51b86d14977f762f624eeffb9416062164eca5466befc3a425b7105b06027e9d80b5e0a1b3e7845501c38502797065f553f561a05fcdb94705d13
 EBUILD systemd-9999.ebuild 12821 BLAKE2B 20927186d7ea6bc4a734e9e15d2536ed13a07ab76d95a6e38ad31d366ff78de1c6a7e84b7082af311392e4b38fc0d9e53ec1e5ea225647d3f5e4b18d4bfa868e SHA512 7b1b08bda5299f584db913893a2d90e66aa08bc9df19343202c8847399813e89782de78ea208a9082155a07194da9c9e360cf24243f0459c13c16680dc3142ec
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch b/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch
deleted file mode 100644
index d1c451835e31..000000000000
--- a/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 357ffd95294e1f9a1e91f8ca01213fb7db2b7614 Mon Sep 17 00:00:00 2001
-From: Jan Alexander Steffens <jan.steffens@gmail.com>
-Date: Mon, 18 Dec 2017 14:47:18 +0100
-Subject: [PATCH] cryptsetup-generator: Don't mistake NULL input as OOM (#7688)
-
-Since systemd v236, several Arch users complained that
-systemd-cryptsetup-generator exits with an OOM error and that it
-prevents the boot from continuing.
-
-Investigating the diff of cryptsetup-generator between v235 and v236 I
-noticed that create_disk allowed for the `password` and `filtered`
-variables to be NULL (they're handled with `strempty()`) but not their
-`*_escaped` versions, and returned OOM errors in those cases.
-
-Fix this by checking that the input string is non-NULL before deciding
-that `specifier_escape` had an OOM error.
-
-I could not test this fix myself, but some users have reported success.
-
-Downstream bug: https://bugs.archlinux.org/task/56733
----
- src/cryptsetup/cryptsetup-generator.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 7e61332e5..f91451353 100644
---- a/src/cryptsetup/cryptsetup-generator.c
-+++ b/src/cryptsetup/cryptsetup-generator.c
-@@ -111,7 +111,7 @@ static int create_disk(
-                 return log_error_errno(r, "Failed to generate unit name: %m");
- 
-         password_escaped = specifier_escape(password);
--        if (!password_escaped)
-+        if (password && !password_escaped)
-                 return log_oom();
- 
-         f = fopen(p, "wxe");
-@@ -184,7 +184,7 @@ static int create_disk(
-                 return r;
- 
-         filtered_escaped = specifier_escape(filtered);
--        if (!filtered_escaped)
-+        if (filtered && !filtered_escaped)
-                 return log_oom();
- 
-         fprintf(f,
--- 
-2.15.1
-
diff --git a/sys-apps/systemd/systemd-236-r1.ebuild b/sys-apps/systemd/systemd-236-r2.ebuild
index d0d9d387688a..276c398c8a9a 100644
--- a/sys-apps/systemd/systemd-236-r1.ebuild
+++ b/sys-apps/systemd/systemd-236-r2.ebuild
@@ -7,7 +7,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -147,9 +148,10 @@ src_unpack() {
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch"
 	)
 
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
 	if ! use vanilla; then
 		PATCHES+=(
 			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
@@ -160,8 +162,6 @@ src_prepare() {
 		)
 	fi
 
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
 	default
 }