gentoo resync : 25.01.2018

3 files changed, 3 insertions, 61 deletions

diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index 7f4986d9248e..47a92c9b3a04 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -1,7 +1,4 @@
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-EBUILD freebsd-contrib-8.2.ebuild 1372 BLAKE2B 18990d23b562a13f67d2dae0877253110f83c166354a32e4ef00382e33b52757fbef2b1c24b74adaf134e2e1e43efdc9f04022d7ad043875b021e6cd8cb9a1f5 SHA512 68fc03d8548e7fcc7689b9a80213dcfe4ee804b42fbee1cab8e1d5cf7659f0f68b6922c5134fc09d8ba01e5b2285383cb3222503ec1fe45f0ae2dfa9f3cd265c
-EBUILD freebsd-contrib-9.1.ebuild 1398 BLAKE2B cf228727c77311daab74e338f7c72c042caba9a99573092b7e5fa574ea42afa0e01e35ca0c4ef1dcea69c4f14ce05ad404ef5789ed5cdfd4a51835e04ecff0b2 SHA512 96875155a5ce72b8b96215eb8145b20b67069dc06c0daa0d9d6ec6ceeb227e35a5db112ea4397e2cc810f208bc7e99bdcbbfddcb662365b6d782654f79aebb97
+EBUILD freebsd-contrib-9.1.ebuild 1386 BLAKE2B 10dd9af7dff56f73df7d83206a2afc9967e47ef6ec19772752bd22be3a0532cfc41ed24e06b2892e764ed46c7ce2f7a9afd38c7c58418e70a8cac8b74a241851 SHA512 871e5ec4719be7adc64d9200e9506da4dd5fda49f98ad87a95044655f92ae58b354aa6fa054f5a4d43b21480eee40e4801a618c16dca17b7eb8655e39dcc869a
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild
deleted file mode 100644
index dbb13edb4b59..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="Contributed sources for FreeBSD"
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2+ libodialog"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!dev-util/dialog"
-
-S="${WORKDIR}/gnu"
-
-src_unpack() {
-	echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
-	tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libdialog gnu/usr.bin/sort gnu/usr.bin/patch
-	echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
-	tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
-
-	freebsd_do_patches
-	freebsd_rename_libraries
-}
-
-src_compile() {
-	cd "${S}/lib/libdialog"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/sort"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/patch"
-	freebsd_src_compile
-}
-
-src_install() {
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-
-	cd "${S}/lib/libdialog"
-	mkinstall || die "libdialog install failed"
-
-	cd "${S}/usr.bin/sort"
-	mkinstall BINDIR="/bin/" || die "libdialog install failed"
-
-	cd "${S}/usr.bin/patch"
-	mkinstall BINDIR="/usr/bin/" || die "libdialog install failed"
-}
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
index 0a810660b414..7b6b9ee87f45 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd flag-o-matic multilib
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${GNU}.tar.bz2
 
 LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""