Update to 6.1-RELEASE.

(Portage version: 2.1_pre10-r5)
 (Signed Manifest commit)

3 files changed, 20 insertions, 125 deletions

diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index eab6172d6945..c947366bde6d 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -26,29 +26,29 @@ MD5 edcf04ea876f3ac2275867633fa4e96d files/sysctl.initd 778
 RMD160 09ed017c2dd767db57cfa71da6c9d656a8fbb23b files/sysctl.initd 778
 SHA256 12f1bbcd72244579ae3b23d2455a00739cc6ff074f68cbb7db1410d19c0f69f4 files/sysctl.initd 778
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
+DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 size 184045
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
+DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 size 277860
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
+DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 size 1156163
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
+DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e size 2664570
 EBUILD freebsd-sbin-6.0-r1.ebuild 2127 RMD160 b0bc72f6c2a9a62b23297e431feedc12f32c76e6 SHA1 2093aae1c6d5c9fc3c7575b8aec98a1d069122a4 SHA256 09ece1d5395fbb75a039746906ad4fc4d0cb815763188eac38c9282b765e958f size 2127
 MD5 226f3c852e244b961b05828ee84cef56 freebsd-sbin-6.0-r1.ebuild 2127
 RMD160 b0bc72f6c2a9a62b23297e431feedc12f32c76e6 freebsd-sbin-6.0-r1.ebuild 2127
 SHA256 09ece1d5395fbb75a039746906ad4fc4d0cb815763188eac38c9282b765e958f freebsd-sbin-6.0-r1.ebuild 2127
-EBUILD freebsd-sbin-6.1_rc2.ebuild 2194 RMD160 869c2e5baf55b29c5a81f5d1511c0b5a4290d3b6 SHA1 9768a8914f889bd0a89e72f58ffd3823c8637900 SHA256 ff789006715eb680f4d86049e195d50422448c44e6fd570a8a2641056e9667fc size 2194
-MD5 ca8a19d175a7557a32d1ae71f1683c92 freebsd-sbin-6.1_rc2.ebuild 2194
-RMD160 869c2e5baf55b29c5a81f5d1511c0b5a4290d3b6 freebsd-sbin-6.1_rc2.ebuild 2194
-SHA256 ff789006715eb680f4d86049e195d50422448c44e6fd570a8a2641056e9667fc freebsd-sbin-6.1_rc2.ebuild 2194
-MISC ChangeLog 4583 RMD160 ee21175e6bac32a9a5dde29004cc6507839ab668 SHA1 d4829b75a33a9484409a5f0f4f8c7f10ac5fe1f2 SHA256 8140b0c94c36b98254e9bf4407f272f0e80d85cdf31bf4e0ff69e6474274293b size 4583
-MD5 8872834568a0871ff0c85b1d4e97b46e ChangeLog 4583
-RMD160 ee21175e6bac32a9a5dde29004cc6507839ab668 ChangeLog 4583
-SHA256 8140b0c94c36b98254e9bf4407f272f0e80d85cdf31bf4e0ff69e6474274293b ChangeLog 4583
+EBUILD freebsd-sbin-6.1.ebuild 2190 RMD160 444bf8b5cebb733282f1d9b74d3e7005b86da889 SHA1 d6e8cd5a0e2b0d895f6e5981da5b2fc0e1c24dfc SHA256 7e5d761da5161cc47e62d8ae377c1f1b425c9f1bff35ac077891d8e8b61ea138 size 2190
+MD5 aef27a1c0dbff639ec24180e31ceb4df freebsd-sbin-6.1.ebuild 2190
+RMD160 444bf8b5cebb733282f1d9b74d3e7005b86da889 freebsd-sbin-6.1.ebuild 2190
+SHA256 7e5d761da5161cc47e62d8ae377c1f1b425c9f1bff35ac077891d8e8b61ea138 freebsd-sbin-6.1.ebuild 2190
+MISC ChangeLog 4753 RMD160 2e20621f052a77190563bb6a4da714a8e1f4bf00 SHA1 a210847d3a4b33cb6188de05757875d044c00cd1 SHA256 cca15930bdd74134926591d51984e805201231702c55fd3d57115be35947b228 size 4753
+MD5 26e1379ccb96e8f720dd5563ea43e775 ChangeLog 4753
+RMD160 2e20621f052a77190563bb6a4da714a8e1f4bf00 ChangeLog 4753
+SHA256 cca15930bdd74134926591d51984e805201231702c55fd3d57115be35947b228 ChangeLog 4753
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -56,13 +56,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 5fd83bcbf48686bcd615b60799613cce files/digest-freebsd-sbin-6.0-r1 1548
 RMD160 bf64735bbceeed83ebccd22f2b3a989100e6ec31 files/digest-freebsd-sbin-6.0-r1 1548
 SHA256 c10cfdca82d0a375d105c9ec1834a52f8ebab8e1ab244cedb63ff06f29d39c05 files/digest-freebsd-sbin-6.0-r1 1548
-MD5 1d07ec06d5e2c43bf7e3832813d71deb files/digest-freebsd-sbin-6.1_rc2 1620
-RMD160 b91ef2a5cfd9e7f37b982410975a889c13251cae files/digest-freebsd-sbin-6.1_rc2 1620
-SHA256 587e973d251300bb09571b9ca2a35031ac20cbd1e95fbc1c99a691d97807bc9c files/digest-freebsd-sbin-6.1_rc2 1620
+MD5 4afd3864120ad05017029f351a0d66d9 files/digest-freebsd-sbin-6.1 1548
+RMD160 86cc454e257ee1b32116424de0ef07518905d51e files/digest-freebsd-sbin-6.1 1548
+SHA256 3ede2f3a4050bce0bce2b41f1e338e87f862e2362d7a922d7b540c495f61d8da files/digest-freebsd-sbin-6.1 1548
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9ZYAiZjviIA2XgRAuz6AJ4n4bBwifXf3uh1pnflqQ4iTwkHYQCdEpBz
-hC3KPmdzyLUfZFikr0KM3zQ=
-=6Q29
+iD8DBQFEYEe2AiZjviIA2XgRAi3iAJ0UR7SUj7mOby/1teNavFEGwtA5zwCglVUu
+XZQu0PCvjhv9Jie2ZCosPPQ=
+=Qk+E
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc2 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc2
deleted file mode 100644
index 6db4abe3c317..000000000000
--- a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc2
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 1d2d7469eb731dcff01781fb757ad6ef freebsd-etc-6.1_rc2.tar.bz2 183869
-RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 freebsd-etc-6.1_rc2.tar.bz2 183869
-SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be freebsd-etc-6.1_rc2.tar.bz2 183869
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
-MD5 24f9fb6752c6800db5a98da9c4bb19c9 freebsd-libexec-6.1_rc2.tar.bz2 277785
-RMD160 7e6c035b414287241d22a48e809aae8a243bff38 freebsd-libexec-6.1_rc2.tar.bz2 277785
-SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 freebsd-libexec-6.1_rc2.tar.bz2 277785
-MD5 db39af0d7136e230fa609356ec0c87fd freebsd-sbin-6.1_rc2.tar.bz2 1157065
-RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 freebsd-sbin-6.1_rc2.tar.bz2 1157065
-SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f freebsd-sbin-6.1_rc2.tar.bz2 1157065
-MD5 f2c82f1d20cb8b9eae56c129b0b78549 freebsd-usbin-6.1_rc2.tar.bz2 2663193
-RMD160 f183a024fcbce51156330410ba08bae2aeae055f freebsd-usbin-6.1_rc2.tar.bz2 2663193
-SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 freebsd-usbin-6.1_rc2.tar.bz2 2663193
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc2.ebuild
deleted file mode 100644
index 019543223c56..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc2.ebuild,v 1.1 2006/05/02 21:59:39 flameeyes Exp $
-
-inherit flag-o-matic bsdmk freebsd
-
-DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~x86-fbsd"
-SLOT="0"
-
-SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	ssl? ( dev-libs/openssl )
-	sys-libs/readline
-	sys-process/vixie-cron"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-PROVIDE="virtual/dev-manager
-	virtual/dhcpc"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter ipv6 vinum suid ssl"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use vinum || mymakeopts="${mymakeopts} NO_VINUM= "
-	use suid || mymakeopts="${mymakeopts} NO_SUID= "
-
-	# O3 breaks this, apparently
-	replace-flags -O3 -O2
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd"
-
-PATCHES="${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-zlib.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-6.1-devd-conf.patch"
-}
-
-src_install() {
-	freebsd_src_install
-	keepdir /var/log
-
-	newinitd ${FILESDIR}/ipfw.initd ipfw
-	newinitd ${FILESDIR}/sysctl.initd sysctl
-
-	cd ${WORKDIR}/etc/
-	insinto /etc
-	doins devd.conf pccard_ether defaults/pccard.conf minfree rc.firewall \
-		sysctl.conf
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ip6fwlimit \
-		security/*.ip6fwdenied \
-		security/*.ipfwdenied
-
-	use ipfilter && doperiodic security \
-		security/*.ipf6denied \
-		security/*.ipfdenied
-}