Update to 6.1_rc2.

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

3 files changed, 19 insertions, 93 deletions

diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index bfe7632b00e2..225cda946454 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -14,27 +14,27 @@ MD5 63bc3f738d51075d091f6c6e5d7f5de6 files/pf.initd 921
 RMD160 ea7ae600979120282cc653a056309a1826507d6f files/pf.initd 921
 SHA256 03f35f86697fcdd6667ea4688304f7331b8c0aa56c755cad780563d65b8e6c25 files/pf.initd 921
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
+DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc1.tar.bz2 1156116 RMD160 f1931df3003d17320be5f898f318af646aae704c SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b size 1156116
+DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 EBUILD freebsd-pf-6.0-r1.ebuild 1329 RMD160 c1bc8c2aa307b8005378369b0c8d4691f0f77efd SHA1 3772f6d20515a2689469612fc3618fe19ee1ac12 SHA256 5230e829058399b3d0eabbe69d069ce7d05a1ca952a37a67f5dec012bfded212 size 1329
 MD5 f93b3c42a4a9135686df3ba810adaff8 freebsd-pf-6.0-r1.ebuild 1329
 RMD160 c1bc8c2aa307b8005378369b0c8d4691f0f77efd freebsd-pf-6.0-r1.ebuild 1329
 SHA256 5230e829058399b3d0eabbe69d069ce7d05a1ca952a37a67f5dec012bfded212 freebsd-pf-6.0-r1.ebuild 1329
-EBUILD freebsd-pf-6.1_rc1.ebuild 1352 RMD160 c228ddaa324179938dcac3c4034f38e9fb5c7fb8 SHA1 6e43189b4c354cc9a6f70344c87cbddc1d534540 SHA256 4d4e714b53f0ef102defcb83a75c343623f32dc61365172e158439a99f6538a0 size 1352
-MD5 a7325383e418609ce7abe5c26d3ad15b freebsd-pf-6.1_rc1.ebuild 1352
-RMD160 c228ddaa324179938dcac3c4034f38e9fb5c7fb8 freebsd-pf-6.1_rc1.ebuild 1352
-SHA256 4d4e714b53f0ef102defcb83a75c343623f32dc61365172e158439a99f6538a0 freebsd-pf-6.1_rc1.ebuild 1352
-MISC ChangeLog 1832 RMD160 72ecb6a808c0fb3ed728bf9c2ecb51bd11db957d SHA1 4cb0a77df7c2b6a00681b044591d509934e7756c SHA256 6de41b382a6e48a11be53fdea13467f217f5b3b77567661ac638b35c9d9d017c size 1832
-MD5 8ae55c4d18aaf9625b30e706e5e9fff7 ChangeLog 1832
-RMD160 72ecb6a808c0fb3ed728bf9c2ecb51bd11db957d ChangeLog 1832
-SHA256 6de41b382a6e48a11be53fdea13467f217f5b3b77567661ac638b35c9d9d017c ChangeLog 1832
+EBUILD freebsd-pf-6.1_rc2.ebuild 1352 RMD160 6987b1bb44ff781c6200c524d594c0ebb41c19ec SHA1 1fdac861aa725ff94ab5c1d7fd5028e868a3a8d2 SHA256 9cd4dfc2ddfb599c615bf3955b09b8bb44089144f0d8029bdaae695f3c073e94 size 1352
+MD5 36b8ece04fd4670f2b5a8899c82b82e0 freebsd-pf-6.1_rc2.ebuild 1352
+RMD160 6987b1bb44ff781c6200c524d594c0ebb41c19ec freebsd-pf-6.1_rc2.ebuild 1352
+SHA256 9cd4dfc2ddfb599c615bf3955b09b8bb44089144f0d8029bdaae695f3c073e94 freebsd-pf-6.1_rc2.ebuild 1352
+MISC ChangeLog 2000 RMD160 54a97b9676364e12f78f7b930f76f27168543da0 SHA1 b0dfc59f1c9f9f7b7f7dc52e9fca5a08a3950880 SHA256 370e09062842a8b28130e72f841f740c4b1df1656575b41d0fe9b6845c6a69a5 size 2000
+MD5 b912bfaacec0b44b2c768b9d6bdd251f ChangeLog 2000
+RMD160 54a97b9676364e12f78f7b930f76f27168543da0 ChangeLog 2000
+SHA256 370e09062842a8b28130e72f841f740c4b1df1656575b41d0fe9b6845c6a69a5 ChangeLog 2000
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -42,13 +42,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 85901762b1b5797d4c97aa0cdd7be3e1 files/digest-freebsd-pf-6.0-r1 1295
 RMD160 dfaa6acbcc3a5282d41b3204342dda0e0c906fa8 files/digest-freebsd-pf-6.0-r1 1295
 SHA256 24290e8449f22ded1c68fe86e421e332e96d5dc384d37a79b93aa68cbb8d2b60 files/digest-freebsd-pf-6.0-r1 1295
-MD5 fda308919fddaeddb718a6b6866d7815 files/digest-freebsd-pf-6.1_rc1 1355
-RMD160 eee0734bceb854e315f1b4185a64912739438c75 files/digest-freebsd-pf-6.1_rc1 1355
-SHA256 7fff603ee0036025c0310bd7bcebdcf69e9b8a5f15f03f7ec729d1fbd392e645 files/digest-freebsd-pf-6.1_rc1 1355
+MD5 88f9a516b656f762ce99377e79bbc717 files/digest-freebsd-pf-6.1_rc2 1355
+RMD160 16c148ddc7a0d1c48c793276b4befbb14398cd57 files/digest-freebsd-pf-6.1_rc2 1355
+SHA256 a22186b248c3e99bf6505f7cca752dbbfd4466b17d51534728fe563d7c40e8e3 files/digest-freebsd-pf-6.1_rc2 1355
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVWZcAiZjviIA2XgRAn92AKDf6ylMOWmBgpqp8KW1X5SXHyjAJACgrGBh
-R+i9nUCyoht9Bn/JMm9WV5I=
-=mUj/
+iD8DBQFEV9XZAiZjviIA2XgRAkAoAKCWmhM4fy1Wr9TCwyf6Tqatpj/6twCdE6M5
+89nlVl0bGiinNN/ctmpDe3Y=
+=gBlS
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc1 b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc1
deleted file mode 100644
index 7ae252c25993..000000000000
--- a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
-RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
-SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
-MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
-RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
-SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild
deleted file mode 100644
index f67529290735..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc1.ebuild
+++ /dev/null
@@ -1,59 +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-pf/freebsd-pf-6.1_rc1.ebuild,v 1.1 2006/05/01 01:37:19 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	sys-freebsd/freebsd-mk-defs
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="libexec/ftp-proxy usr.sbin/authpf sbin/pfctl sbin/pflogd"
-
-PATCHES="${FILESDIR}/${PN}-6.0-pcap.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}"
-		mkmake || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}"
-		mkinstall || die "Install ${dir} failed"
-	done
-
-	cd ${WORKDIR}/etc
-	insinto /etc
-	doins pf.os
-	newdoc pf.conf pf.conf.example
-
-	newinitd "${FILESDIR}/pf.initd" pf
-	newconfd "${FILESDIR}/pf.confd" pf
-}