gentoo resync : 19.03.2019

3 files changed, 16 insertions, 2 deletions

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 5fb5d0a2ae80..57a905812b69 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -2,13 +2,14 @@ AUX nix-1.11.6-respect-CXXFLAGS.patch 164 BLAKE2B ff171c369d1628d530e49520d1655d
 AUX nix-1.11.6-respect-LDFLAGS.patch 2332 BLAKE2B 83382d89c3ca40404460629f42dcdf447dce57677e1fbe7d4abc40a506397c3962fbbdb38e0e01342380115d011ace02cb10f97219a7ccd3cb92da993a79fc25 SHA512 aefc9b045794038b6513211ecaf18c469b7aa52110fcaa5168a1ca9f9af9b663aa6e90fe27c3c500bf9adc2714a8f73fc5243f3096fabe6bbb7e855e0ae7aa87
 AUX nix-1.11.6-systemd.patch 394 BLAKE2B 144b5e2c4f55077bb0c722ff71bf0a587f20858c27fe4a3bb9cd44bec159a30122382b7fff3b998478aaa4f93519247708926a6369f9ac2fa1a3d43cc5808a38 SHA512 2c5a701815e1c3091c5568b01d6709a9a227c18967a7c0eff7676f741c87f5082a49842427022991656cac079734741820bb8a895679a65cce657a29df86ddcd
 AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a9285d1dabdfe06cfa55c8ab578160f940537cc9ed7ba7ef408d167f23cc914127313bed992baac747f49a9dd054 SHA512 3eab6ae522767bd8c1f2adf6a00544f7fecb698dedff68835a880a7ac533dd4e188661a955f111769525828d761612c49669a36ccf25f16bab6d325313da3232
+AUX nix-2.0.4-bdwgc-8.patch 421 BLAKE2B 2aafeee37b282d890dfd54dc958f708bb09e86d50904ea71be9b02b88d05075076f4406d77c0b566b67ecc98c53a445726eb0f14834e7cebabf21544ff194e8f SHA512 04166538207f644b1ceb552b58742dcfa36ed759792a1e5f5d6c2acb31c089b88e406ce1a063288a00988cffb6790fe000cfa00ddd6aaf5d48d515893e41676f
 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990 SHA512 605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.3.tar.xz 816396 BLAKE2B 9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760 SHA512 d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
 DIST nix-2.2.1.tar.xz 818648 BLAKE2B 2e836bd40ea1ee22c308bd287b1ad1e5607729574b5cfe3494fbf017c618d7475d6150a9b97966f1aaea6bcb37b6535db1b2d693f0fedd0598881efe1a8c538e SHA512 42055fcbecc664899203d90d47f85ce2b12987fac6cb776f09dc202d5f3e07a4b2d6a7ee67fe8d6094062dc516dfe42eeb4acc05dfebd31f2b5670c0979bddd4
 EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
-EBUILD nix-2.0.4.ebuild 3288 BLAKE2B 7c2fc988eb075af7977e0a2252357779382856c288e6e9aedfe00a414726c7fc933dd4393fa9851b6b2c1fc1d5f57b20f4fdeec99debc50401f6651ae6b9dfd1 SHA512 729b481d24a1af5d9465820d4531ee807a37a9a7cfef8551de5e4f1464a2f50d803915c2eae332e2be8a05954b48838c72216631747ca2f5385df2c18aef1a48
+EBUILD nix-2.0.4.ebuild 3329 BLAKE2B 1093e5ef73fc38e907718d3b23083b4de9e51c79e3f60cb9ff6fa1bf0aeaca292981dee1d9db63774e04f0770d0be48275a699cb6b54fc287fe823f2ff9f1c0b SHA512 9efd2e7ddcab6f63a08fe0eb3554aaa8f4de7e8274b4a9bbb3784175dc024634a7b2fa7378c62cd51d4797d8ffaacbed99b9fd8eae05a8960c2c6c11a6a18a38
 EBUILD nix-2.1.3.ebuild 3359 BLAKE2B f91cae5d9562ea976222b7f893d4beba3f2f99967dac16381270afe69ecda3df6ffbf1896fe487999c80648477ac22431dc3af9cd3b7fcf09778bc92f9f1c0fa SHA512 f6c9c8a0b1fd25e5484f6c13e9c564868b432c84961e600ae9b3cdb5646c2e4286b8cd6b5dff43f63c58646583d70c6445ce61530f143f4654903bb8e1380971
 EBUILD nix-2.2.1-r1.ebuild 3464 BLAKE2B 9b8dc5694712babc5f87aada82909f5b5cbfe93528a4bba3a9b55f051ca8365bdc0ff9aaf8dbf5c12daee85e98c0d527085c2441064961f0fe8d21a0ceba43d3 SHA512 21441ce424c2c667ae2df383e2f41551b907218aa473b85ac3a91e9b8c744d6ed5ed57e24276f9185937eb4430f04992a4f5e34938d26143f4fdd981f742b596
 MISC metadata.xml 681 BLAKE2B 53ec9e4c35af4d73756dabebcc9d0423c3708c24e085d35ec589334971d2b76b40408793b5202d625043fe3bd23399a457b7cae4eea665156e2ba3c0d60fc292 SHA512 b473a72e96cc53eeca793b60acd627ebafb918a05fc328126d3a3f32fe8f09d95ebd4643c17f27a69ac64c0b3bee87f6c0818b0316ab2e5e7158999adc8e8a94
diff --git a/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch b/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch
new file mode 100644
index 000000000000..ff37f48e3607
--- /dev/null
+++ b/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch
@@ -0,0 +1,12 @@
+Add a missing library for gdwgc-8
+--- a/configure.ac
++++ b/configure.ac
+@@ -226,6 +226,8 @@ AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc],
+ if test "$gc" = yes; then
+   PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
+   CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS"
++  # a workaround for https://bugs.gentoo.org/679834
++  BDW_GC_LIBS="$BDW_GC_LIBS -lgccpp"
+   AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.])
+ fi
+ 
diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild
index 965584cf6f01..a39c4d53087c 100644
--- a/sys-apps/nix/nix-2.0.4.ebuild
+++ b/sys-apps/nix/nix-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-2.0-user-path.patch
+	"${FILESDIR}"/${PN}-2.0.4-bdwgc-8.patch
 )
 
 DISABLE_AUTOFORMATTING=yes