gentoo resync : 21.05.2019

7 files changed, 16 insertions, 23 deletions

diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
index 2a37504795be..2b1cdf985b06 100644
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ b/profiles/default/bsd/fbsd/package.use.mask
@@ -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
 
 # Michał Górny <mgorny@gentoo.org> (06 Apr 2018)
@@ -112,4 +112,3 @@ sys-apps/hwloc numa
 # Naohiro Aota <naota@gentoo.org> (07 Jul 2014)
 # xattr support is not available on BSD #501534
 sys-apps/portage xattr
-sys-apps/portage-mgorny xattr
diff --git a/profiles/default/linux/amd64/13.0/developer/make.defaults b/profiles/default/linux/amd64/13.0/developer/make.defaults
index f74d4f114ab6..28426a7b24f1 100644
--- a/profiles/default/linux/amd64/13.0/developer/make.defaults
+++ b/profiles/default/linux/amd64/13.0/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/amd64 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/amd64 dev profile
 # This will help developers track packages, that don't respect LDFLAGS, down
 # more effectively
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/profiles/default/linux/amd64/17.0/developer/make.defaults b/profiles/default/linux/amd64/17.0/developer/make.defaults
index f74d4f114ab6..28426a7b24f1 100644
--- a/profiles/default/linux/amd64/17.0/developer/make.defaults
+++ b/profiles/default/linux/amd64/17.0/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/amd64 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/amd64 dev profile
 # This will help developers track packages, that don't respect LDFLAGS, down
 # more effectively
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/profiles/default/linux/amd64/17.1/developer/make.defaults b/profiles/default/linux/amd64/17.1/developer/make.defaults
index f74d4f114ab6..28426a7b24f1 100644
--- a/profiles/default/linux/amd64/17.1/developer/make.defaults
+++ b/profiles/default/linux/amd64/17.1/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/amd64 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/amd64 dev profile
 # This will help developers track packages, that don't respect LDFLAGS, down
 # more effectively
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/profiles/default/linux/uclibc/arm/package.use.mask b/profiles/default/linux/uclibc/arm/package.use.mask
index de5fa3dc4237..621faba08873 100644
--- a/profiles/default/linux/uclibc/arm/package.use.mask
+++ b/profiles/default/linux/uclibc/arm/package.use.mask
@@ -5,12 +5,6 @@
 # Requires dev-libs/mongo-c-driver which isn't keyworded
 >=app-admin/rsyslog-8.31 mongodb
 
-# Thomas Deutschmann <whissi@whissi.de> (25 Apr 2016), on behalf of
-# Ian Delaney <idella4@gentoo.org> (25 Apr 2016)
-# for the proxy-maintainers project
-# Unkeyworded deps, bug #581180
-app-admin/rsyslog grok
-
 # Thomas Deutschmann <whissi@whissi.de> (19 Mar 2016), on behalf of
 # Ian Delaney <idella4@gentoo.org> (19 Mar 2016)
 # for the proxy-maintainers project
diff --git a/profiles/default/linux/x86/13.0/developer/make.defaults b/profiles/default/linux/x86/13.0/developer/make.defaults
index 79e030eb8d8e..e0cc9679f948 100644
--- a/profiles/default/linux/x86/13.0/developer/make.defaults
+++ b/profiles/default/linux/x86/13.0/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/x86 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/x86 dev profile
 # This will help developers track down packages, that don't respect LDFLAGS,
 # more easily
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/profiles/default/linux/x86/17.0/developer/make.defaults b/profiles/default/linux/x86/17.0/developer/make.defaults
index 79e030eb8d8e..e0cc9679f948 100644
--- a/profiles/default/linux/x86/17.0/developer/make.defaults
+++ b/profiles/default/linux/x86/17.0/developer/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Adding -Wl,--hash-style=gnu to default LDFLAGS for linux/x86 dev profile
+# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/x86 dev profile
 # This will help developers track down packages, that don't respect LDFLAGS,
 # more easily
-LDFLAGS="-Wl,--hash-style=gnu ${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"