gentoo resync : 03.11.2019

5 files changed, 0 insertions, 71 deletions

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 18f7dda88c69..8328c2f2d993 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,8 +1,4 @@
-AUX nix-1.11.6-respect-CXXFLAGS.patch 164 BLAKE2B ff171c369d1628d530e49520d1655dcc5ad9e342618f9c79dc1feccd1caae594fec82a5ec50a000d0ae57236c8d6bd5fde4baf45f3bdf48f717599b987fd3d6b SHA512 2508d26888050bb4099f1654cee91d44405b00ca4dfdd6c1b1cf0f24e004333b106cc461b306404b1d56f41bb928ed1069536c09f9390b5ba287ca70b9bcb0c6
-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-2.3-bootstrap.patch 1688 BLAKE2B 4bcb38019f1d310a8a888a76009942986881e426f030b626dbeeba1ece37f2e0c94fc2f44f37535bc89a1b946979cd827e33c5d407896989a9771bffa0a90143 SHA512 3f23dfc1941c848d7ef82c1990f0eed946241f6f331bd85f511ed72096b2685a285e2c2248fb30499376f3a80fa19e411543819d16a4fae732dd0ae98bb55236
 AUX nix-2.3-libpaths.patch 2856 BLAKE2B 06f6dba50811e353908e5faad56671e433c88a8054a4f0056c6b24930bfc7747baf8f138db64c8da0a0e73847568277238801f0a13436f38ca78e3037092fc82 SHA512 aac5f322f6a0565e4d38c272e51c49a31b9388b9ac29ee3aae509630e8fc1c7f02a726bc60a1d3c8400768b84f93088cc59d88f2cec79ae86814dba501bc72b7
 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
diff --git a/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch b/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch
deleted file mode 100644
index 091fdcacba76..000000000000
--- a/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 3a24053..1b99702 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,4 +57,2 @@ fi
- 
--CFLAGS=
--CXXFLAGS=
- AC_PROG_CC
diff --git a/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch b/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch
deleted file mode 100644
index 12c094eb6180..000000000000
--- a/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Makefile.config.in b/Makefile.config.in
-index f0de4da..c82fbfd 100644
---- a/Makefile.config.in
-+++ b/Makefile.config.in
-@@ -5,2 +5,3 @@ CXX = @CXX@
- CXXFLAGS = @CXXFLAGS@
-+LDFLAGS = @LDFLAGS@
- HAVE_SODIUM = @HAVE_SODIUM@
-diff --git a/mk/libraries.mk b/mk/libraries.mk
-index 3cd7a53..f7bd015 100644
---- a/mk/libraries.mk
-+++ b/mk/libraries.mk
-@@ -88,3 +88,3 @@ define build-library
-     $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
--	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
-+	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
- 
-@@ -102,3 +102,3 @@ define build-library
-     $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
--	$$(trace-ld) $(CXX) -o $$@ -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-+	$$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
- 
-diff --git a/mk/programs.mk b/mk/programs.mk
-index 3ac6449..f553ce2 100644
---- a/mk/programs.mk
-+++ b/mk/programs.mk
-@@ -34,3 +34,3 @@ define build-program
-   $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
--	$$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
-+	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
- 
-@@ -48,3 +48,3 @@ define build-program
-     $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
--	$$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-+	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
- 
diff --git a/sys-apps/nix/files/nix-1.11.6-systemd.patch b/sys-apps/nix/files/nix-1.11.6-systemd.patch
deleted file mode 100644
index 5a77d7c77e5c..000000000000
--- a/sys-apps/nix/files/nix-1.11.6-systemd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Make 'nix-daemon' a good unit for 'systemctl enable nix-daemon.service'.
-diff --git a/misc/systemd/nix-daemon.service.in b/misc/systemd/nix-daemon.service.in
-index 5fc04a3..2565520 100644
---- a/misc/systemd/nix-daemon.service.in
-+++ b/misc/systemd/nix-daemon.service.in
-@@ -9 +9,4 @@ ExecStart=@@bindir@/nix-daemon nix-daemon --daemon
- KillMode=process
-+
-+[Install]
-+WantedBy=multi-user.target
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
deleted file mode 100644
index ff37f48e3607..000000000000
--- a/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-