gentoo resync : 19.04.2018

6 files changed, 5 insertions, 13 deletions

diff --git a/profiles/default/bsd/package.mask b/profiles/default/bsd/package.mask
index bbd7655d6767..6dee40709090 100644
--- a/profiles/default/bsd/package.mask
+++ b/profiles/default/bsd/package.mask
@@ -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
 
 # Mask out the GNU versions of various packages.
@@ -10,7 +10,6 @@ net-misc/iputils
 sys-apps/hardened-shadow
 sys-apps/shadow
 sys-apps/utempter
-sys-apps/util-linux
 sys-apps/which
 sys-libs/glibc
 sys-libs/libcap
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 36c55aea30d4..f1326439248d 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -28,7 +28,6 @@ app-text/asciidoc test highlight
 # iproute2 - linux only
 net-vpn/openvpn iproute2
 
-app-admin/sshguard -ipfilter
 media-video/ffmpeg ieee1394 iec61883
 net-libs/c-client pam
 net-proxy/squid -ipf-transparent -pf-transparent
diff --git a/profiles/default/linux/musl/amd64/package.mask b/profiles/default/linux/musl/amd64/package.mask
index 2d46a562aced..e6bfd5387f92 100644
--- a/profiles/default/linux/musl/amd64/package.mask
+++ b/profiles/default/linux/musl/amd64/package.mask
@@ -3,5 +3,5 @@
 
 # Ulrich Müller <ulm@gentoo.org> (18 Mar 2013)
 # Packages that rely on multilib
-=app-editors/emacs-18*
+app-editors/emacs:18
 net-misc/icaclient
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index 313dfc4b59a8..00db1412867c 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -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
 
 sys-libs/uclibc
@@ -16,9 +16,6 @@ sys-fs/udev
 dev-libs/elfutils
 >virtual/libelf-2
 
-# packages that unconditionally depend on dev-libs/elfutils
-<net-firewall/fwbuilder-5.3.7
-
 # packages that need masked packages or multilib
 dev-games/gtkradiant
 dev-games/ps2-packer
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index a864e077b43c..82dd641f675f 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -7,7 +7,7 @@ app-accessibility/mbrola
 app-accessibility/perlbox-voice
 app-arch/stuffit
 app-benchmarks/cpuburn
-=app-editors/emacs-18*
+app-editors/emacs:18
 app-emulation/crossover-bin
 app-emulation/playonlinux
 app-emulation/q4wine
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index b94a8ca92688..69d4b596c387 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -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
 
 sys-libs/musl
@@ -13,9 +13,6 @@ sys-fs/udev
 dev-libs/elfutils
 >virtual/libelf-2
 
-# packages that unconditionally depend on dev-libs/elfutils
-<net-firewall/fwbuilder-5.3.7
-
 # These binary pkgs have a hard dep on glibc; make repoman shut up
 app-arch/rar
 dev-games/gtkradiant