Update to 6.1_rc2.

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

3 files changed, 20 insertions, 131 deletions

diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index c7b63996f8b6..79982a9e7423 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -42,29 +42,29 @@ MD5 764135d89f71d46bd96de7271f1083fc files/su.pamd 420
 RMD160 9888acbac2c2c79b64ec274cc7d96b13b86d8ad8 files/su.pamd 420
 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 files/su.pamd 420
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc1.tar.bz2 405949 RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 size 405949
+DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
 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-include-6.0.tar.bz2 127219 RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b size 127219
-DIST freebsd-include-6.1_rc1.tar.bz2 127236 RMD160 b978bf654921e9f58f71b372881c494b39482b56 SHA256 4adecf2a0517b1c9040afe1df9f18873e76f6312ced22a7ed98ee1e7f61245ad size 127236
+DIST freebsd-include-6.1_rc2.tar.bz2 127237 RMD160 4235464be16e87e2f05022fe7024ee77f2afc3ae SHA256 5d346a1410f3daa2bbe2c2a4a158f7e0abf52f696b33ea332b2ad7c6aa14f730 size 127237
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc1.tar.bz2 1762943 RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 size 1762943
+DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
 EBUILD freebsd-ubin-6.0-r1.ebuild 2617 RMD160 292aab8acc32189d68a4a3fabc625b5896598bae SHA1 4186dc8c109934922b27d754e03f8c69e2659293 SHA256 e0ef405e4c278df67e25df85922161867e8286550f3a7f8f34770c89984e90f4 size 2617
 MD5 da749ba3892845a9be31236cdbd1faa0 freebsd-ubin-6.0-r1.ebuild 2617
 RMD160 292aab8acc32189d68a4a3fabc625b5896598bae freebsd-ubin-6.0-r1.ebuild 2617
 SHA256 e0ef405e4c278df67e25df85922161867e8286550f3a7f8f34770c89984e90f4 freebsd-ubin-6.0-r1.ebuild 2617
-EBUILD freebsd-ubin-6.1_rc1.ebuild 2581 RMD160 c30a21d4236d0c18b2a462d30c6a2972f0b3343a SHA1 39569cd64fefe1b5de0aa22386ebefac0828dbb1 SHA256 1ac0deee82f8f9cf942d29a7fc04d9028a086a0e7516e9644489bd0596714741 size 2581
-MD5 2cdefc5e7ea23af55776eeb9637185db freebsd-ubin-6.1_rc1.ebuild 2581
-RMD160 c30a21d4236d0c18b2a462d30c6a2972f0b3343a freebsd-ubin-6.1_rc1.ebuild 2581
-SHA256 1ac0deee82f8f9cf942d29a7fc04d9028a086a0e7516e9644489bd0596714741 freebsd-ubin-6.1_rc1.ebuild 2581
-MISC ChangeLog 6012 RMD160 145168eff4bc422ca953568201e674993c341efb SHA1 3a752c0dd010f46959b34fe3d3b045e1cd4f372a SHA256 24fcd7226cb84597a10df5e544d68104a13cf5dc6396c78704c9f3374025bd76 size 6012
-MD5 8f48e50a6e06815bd0e13738d08cbc49 ChangeLog 6012
-RMD160 145168eff4bc422ca953568201e674993c341efb ChangeLog 6012
-SHA256 24fcd7226cb84597a10df5e544d68104a13cf5dc6396c78704c9f3374025bd76 ChangeLog 6012
+EBUILD freebsd-ubin-6.1_rc2.ebuild 2581 RMD160 01760be2fdcf8f00b8062391139ee0b037f58019 SHA1 3f8b7c4dc50fb49408d57144ca6b8fd2c1e3d394 SHA256 300af2a3618293f678f628c66a83834044ae134c777586b41203732c1cad145b size 2581
+MD5 721a7483b095ef6f279ad3bc144e7ecd freebsd-ubin-6.1_rc2.ebuild 2581
+RMD160 01760be2fdcf8f00b8062391139ee0b037f58019 freebsd-ubin-6.1_rc2.ebuild 2581
+SHA256 300af2a3618293f678f628c66a83834044ae134c777586b41203732c1cad145b freebsd-ubin-6.1_rc2.ebuild 2581
+MISC ChangeLog 6186 RMD160 59e69cd5ae56ea3cbabb52d35fda00cad559b3b7 SHA1 0ef3964f2d5a0294355cb463c72f389948d3a298 SHA256 440e71490f26d28b47f0f879185be5da7b13c429048ee5ac42fa24ace3c0c995 size 6186
+MD5 5661005b993c40b47ee21d607c65e015 ChangeLog 6186
+RMD160 59e69cd5ae56ea3cbabb52d35fda00cad559b3b7 ChangeLog 6186
+SHA256 440e71490f26d28b47f0f879185be5da7b13c429048ee5ac42fa24ace3c0c995 ChangeLog 6186
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -72,13 +72,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 613424f0099cad1ce85a06d47bcb49f6 files/digest-freebsd-ubin-6.0-r1 1539
 RMD160 d39f6c71d301f5e62cfcd5624afd871e6ef9442d files/digest-freebsd-ubin-6.0-r1 1539
 SHA256 6841a99d17c9cf21996c35a5b0edeefb23aca499ff9479f825a733e1b31d1dec files/digest-freebsd-ubin-6.0-r1 1539
-MD5 5de7b32af95e66e9aa56e3002b246577 files/digest-freebsd-ubin-6.1_rc1 1611
-RMD160 65bec23d278a8a537d884329076a7c2bd3926b4f files/digest-freebsd-ubin-6.1_rc1 1611
-SHA256 73f3b36a5ccdd69a6d083d9b9488f44b28e551082c849f7f1d37218fe28fb162 files/digest-freebsd-ubin-6.1_rc1 1611
+MD5 dd09739ad90d047a3892abeee8935bd4 files/digest-freebsd-ubin-6.1_rc2 1611
+RMD160 25912fe8f0cdfe8f3d594150829eb20528c3049a files/digest-freebsd-ubin-6.1_rc2 1611
+SHA256 58912450dbd68c9c99fe7a91c72d47e769b737b0a81626cc7f801f9e73ac0221 files/digest-freebsd-ubin-6.1_rc2 1611
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVWL2AiZjviIA2XgRAgRsAJ9amw5nveSxFXAXwBbRZn5IxqV4+wCfboAG
-VCcpT4yQO/xSKR9wZANqntI=
-=Kb3h
+iD8DBQFEV9cGAiZjviIA2XgRAsL1AJ97P9PlZHRGP82w7t2aRNCqApzUVACg7/5j
+Q8L8j7iylnbTPJWu3kAzA/M=
+=zwv1
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1_rc1 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1_rc1
deleted file mode 100644
index c43b574278dd..000000000000
--- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1_rc1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 5dcbd5450bcc3bcfd592f0ec86e55921 freebsd-bin-6.1_rc1.tar.bz2 405949
-RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f freebsd-bin-6.1_rc1.tar.bz2 405949
-SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 freebsd-bin-6.1_rc1.tar.bz2 405949
-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 8b52d1055322cf2b0cad3fc9c4c066b2 freebsd-include-6.1_rc1.tar.bz2 127236
-RMD160 b978bf654921e9f58f71b372881c494b39482b56 freebsd-include-6.1_rc1.tar.bz2 127236
-SHA256 4adecf2a0517b1c9040afe1df9f18873e76f6312ced22a7ed98ee1e7f61245ad freebsd-include-6.1_rc1.tar.bz2 127236
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 0198e4c8f064d5f060c15510a87c5f35 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e freebsd-ubin-6.1_rc1.tar.bz2 1762943
-SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 freebsd-ubin-6.1_rc1.tar.bz2 1762943
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc1.ebuild
deleted file mode 100644
index 65e7166d0046..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc1.ebuild
+++ /dev/null
@@ -1,93 +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-ubin/freebsd-ubin-6.1_rc1.ebuild,v 1.1 2006/05/01 01:22:49 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2"
-
-RDEPEND="sys-freebsd/freebsd-lib
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	sys-libs/zlib
-	virtual/pam"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-pkg_setup() {
-	use nls || mymakeopts="${mymakeopts} NO_NLS= "
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use usb || mymakeopts="${mymakeopts} NO_USB= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= "
-}
-
-# List of patches to apply
-PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch
-	${FILESDIR}/${PN}-6.0-fixmakefiles.patch
-	${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-lint-stdarg.patch
-	${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar
-	tput tset
-	less lessecho lesskey
-	dig nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1
-}
-
-src_install() {
-	freebsd_src_install
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.pamd" ${pamdfile}
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb
-}