gentoo resync : 15.09.2018

5 files changed, 4 insertions, 11 deletions

diff --git a/profiles/releases/17.0/package.mask b/profiles/releases/17.0/package.mask
index 10e18dec100e..d02a1c3d9f13 100644
--- a/profiles/releases/17.0/package.mask
+++ b/profiles/releases/17.0/package.mask
@@ -17,7 +17,6 @@ dev-java/ecj-gcj
 dev-java/gcj-jdk
 <dev-util/nvidia-cuda-toolkit-9
 <dev-util/nvidia-cuda-sdk-9
-<dev-libs/dietlibc-0.34_pre20140729-r1
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
 # The following packages require pdftk and are therefore
diff --git a/profiles/releases/freebsd-11.1/package.mask b/profiles/releases/freebsd-11.1/package.mask
index d977a2e2e323..c2612711475c 100644
--- a/profiles/releases/freebsd-11.1/package.mask
+++ b/profiles/releases/freebsd-11.1/package.mask
@@ -24,8 +24,6 @@
 >sys-freebsd/freebsd-usbin-11.1.99
 <sys-freebsd/freebsd-share-11.1_alpha
 >sys-freebsd/freebsd-share-11.1.99
-<sys-freebsd/freebsd-contrib-11.1_alpha
->sys-freebsd/freebsd-contrib-11.1.99
 <sys-freebsd/freebsd-cddl-11.1_alpha
 >sys-freebsd/freebsd-cddl-11.1.99
 <sys-freebsd/boot0-11.1_alpha
diff --git a/profiles/releases/freebsd-11.1/packages b/profiles/releases/freebsd-11.1/packages
index a68d7505d934..2f2822721a66 100644
--- a/profiles/releases/freebsd-11.1/packages
+++ b/profiles/releases/freebsd-11.1/packages
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
 
 *>=sys-apps/baselayout-2.0.0
 *>=sys-apps/openrc-0.2.5
 
-# dev-libs/libiconv and freebsd-contrib aren't necessary in 10.0 and later.
+# dev-libs/libiconv isn't necessary in 10.0 and later.
 -*dev-libs/libiconv
--*sys-freebsd/freebsd-contrib
 
 # sys-freebsd/freebsd-libexec was merged into freebsd-lib in 11.1 and later.
 -*sys-freebsd/freebsd-libexec
diff --git a/profiles/releases/freebsd-11.1/packages.build b/profiles/releases/freebsd-11.1/packages.build
index a6ca5a9327c9..eb15f165044a 100644
--- a/profiles/releases/freebsd-11.1/packages.build
+++ b/profiles/releases/freebsd-11.1/packages.build
@@ -1,7 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
 
 -dev-libs/libiconv
--sys-freebsd/freebsd-contrib
 -sys-freebsd/freebsd-libexec
 sys-freebsd/freebsd-share
diff --git a/profiles/releases/freebsd-9.1/package.mask b/profiles/releases/freebsd-9.1/package.mask
index 686dc81d524e..305aae620478 100644
--- a/profiles/releases/freebsd-9.1/package.mask
+++ b/profiles/releases/freebsd-9.1/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
 
 # Make sure we don't get wrong versions
@@ -24,8 +24,6 @@
 >sys-freebsd/freebsd-usbin-9.1.99
 <sys-freebsd/freebsd-share-9.1_alpha
 >sys-freebsd/freebsd-share-9.1.99
-<sys-freebsd/freebsd-contrib-9.1_alpha
->sys-freebsd/freebsd-contrib-9.1.99
 <sys-freebsd/freebsd-cddl-9.1_alpha
 >sys-freebsd/freebsd-cddl-9.1.99
 <sys-freebsd/boot0-9.1_alpha