Update to 6.1-RELEASE.

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

3 files changed, 15 insertions, 67 deletions

diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 7e6ed588ce1d..841f47894703 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -26,19 +26,19 @@ MD5 252ec73a62c30ee7a502aab5f4ed4c3b files/freebsd-pam-modules-6.0-gentoo.patch
 RMD160 f907769f6f0ded416fac03a1fb6b5531ff682070 files/freebsd-pam-modules-6.0-gentoo.patch 701
 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d files/freebsd-pam-modules-6.0-gentoo.patch 701
 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
 EBUILD freebsd-pam-modules-6.0.ebuild 1314 RMD160 3ff22b76d89ddc271518b5e8237387944adab479 SHA1 464a3ca4167a0ad7f96ee5b6028ab0d8ae139b49 SHA256 1ef6c0be49991f23577f282dcf252a60034cd07cd2dda53febe3630068d8458c size 1314
 MD5 0c5072a8ce386c4c91203999f8af4097 freebsd-pam-modules-6.0.ebuild 1314
 RMD160 3ff22b76d89ddc271518b5e8237387944adab479 freebsd-pam-modules-6.0.ebuild 1314
 SHA256 1ef6c0be49991f23577f282dcf252a60034cd07cd2dda53febe3630068d8458c freebsd-pam-modules-6.0.ebuild 1314
-EBUILD freebsd-pam-modules-6.1_rc2.ebuild 1287 RMD160 1b89c7adf140485a75ef867c6be5e4ca1ba6e92f SHA1 d09486011b0a89003ffa155e0bfdffb21a1b94ab SHA256 8481a7ec3ab176e0e3c416bf4d23a02c36debf2ee690e1d99d7bbd1453209e6a size 1287
-MD5 631de3d975f39f4eb9ba2b076d4cc223 freebsd-pam-modules-6.1_rc2.ebuild 1287
-RMD160 1b89c7adf140485a75ef867c6be5e4ca1ba6e92f freebsd-pam-modules-6.1_rc2.ebuild 1287
-SHA256 8481a7ec3ab176e0e3c416bf4d23a02c36debf2ee690e1d99d7bbd1453209e6a freebsd-pam-modules-6.1_rc2.ebuild 1287
-MISC ChangeLog 2832 RMD160 e0fdf93047128cb5a09d01bd2a843ed09d2b57bd SHA1 66b52a66ec3a94d82b70945cd34463ca1005af57 SHA256 414c01ee3edfb7c1b311de29e7e9e5759bbd398aef3887bd4a432184ecb4cbd8 size 2832
-MD5 157afae44451e7da90209619e67a0a17 ChangeLog 2832
-RMD160 e0fdf93047128cb5a09d01bd2a843ed09d2b57bd ChangeLog 2832
-SHA256 414c01ee3edfb7c1b311de29e7e9e5759bbd398aef3887bd4a432184ecb4cbd8 ChangeLog 2832
+EBUILD freebsd-pam-modules-6.1.ebuild 1283 RMD160 ad12bdf87865995f33b468f9dc99abf4b100e6e0 SHA1 60886560ba6db6f76b571a07653a181e8ac253b6 SHA256 54f27223e5b30916b3243a626dc63a22764c24f15f31520548370aecdc6d9f3c size 1283
+MD5 398d139a45d7547703d482cba8f14074 freebsd-pam-modules-6.1.ebuild 1283
+RMD160 ad12bdf87865995f33b468f9dc99abf4b100e6e0 freebsd-pam-modules-6.1.ebuild 1283
+SHA256 54f27223e5b30916b3243a626dc63a22764c24f15f31520548370aecdc6d9f3c freebsd-pam-modules-6.1.ebuild 1283
+MISC ChangeLog 3023 RMD160 704b17be8f8b6d6df7055775e3f7aba237633afd SHA1 71dce62a6d4a56c3441116fb3ce63a0c6b789c29 SHA256 887db07a0acb20e81c6062905ce198fdae6460eb6dd3dd7b685143901acfa513 size 3023
+MD5 fceca7f4b46b6efa8bec183e4b5c4e10 ChangeLog 3023
+RMD160 704b17be8f8b6d6df7055775e3f7aba237633afd ChangeLog 3023
+SHA256 887db07a0acb20e81c6062905ce198fdae6460eb6dd3dd7b685143901acfa513 ChangeLog 3023
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -46,13 +46,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 3f8b30a7524ee60de45cfe483e4a98ef files/digest-freebsd-pam-modules-6.0 253
 RMD160 ddc8cde12a8205b150fa1584831471d8e6edc26f files/digest-freebsd-pam-modules-6.0 253
 SHA256 19259c95eb76120fb8b21ac7f9dc26d985edc4eae7828df6c41fe6d0d6bff59d files/digest-freebsd-pam-modules-6.0 253
-MD5 149608fee7d4956de1e2a38f9cad3d30 files/digest-freebsd-pam-modules-6.1_rc2 265
-RMD160 82fb841537780fec91cbae8e2d5597e701e60a0c files/digest-freebsd-pam-modules-6.1_rc2 265
-SHA256 94da21e6c258eaa31249ea7bdf9248799d981cc684e2cea1e92c64913d3345d4 files/digest-freebsd-pam-modules-6.1_rc2 265
+MD5 28f38d75ce4d75e9729c3a6b307a1ad5 files/digest-freebsd-pam-modules-6.1 253
+RMD160 5b8810953e6bf6bd851c5666f9aac0c6f1410326 files/digest-freebsd-pam-modules-6.1 253
+SHA256 8272117e05da623b3d53d7f2e637d1c3f649ff2516ceeb0966bc884df138c25f files/digest-freebsd-pam-modules-6.1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9WfAiZjviIA2XgRAhyBAKCv/qkDsWJm/7gepKoLZ7v9jXmeaQCeMLuZ
-/Y1G6qO+dS4x9fObKRm8ei8=
-=IDKl
+iD8DBQFEYEcCAiZjviIA2XgRAoBxAJ9OgEt3id8s3IZd6PA0X1EApaPzBwCfUQpq
+Iwu7OxQeyQu4oH9i3tu0jf0=
+=KWmx
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1_rc2 b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1_rc2
deleted file mode 100644
index 1b25ae0e5a49..000000000000
--- a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc2.ebuild
deleted file mode 100644
index b11da47fac8f..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc2.ebuild
+++ /dev/null
@@ -1,49 +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-pam-modules/freebsd-pam-modules-6.1_rc2.ebuild,v 1.1 2006/05/02 21:56:40 flameeyes Exp $
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="kerberos nis"
-
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} NO_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${WORKDIR}/lib
-
-	for module in pam_deny pam_passwdqc pam_permit; do
-		sed -i -e "s:${module}::" ${S}/modules.inc
-	done
-
-	# Avoid using static versions; use gentoo /lib/security dir
-	epatch ${FILESDIR}/${PN}-6.0-gentoo.patch
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/5.4/README.pamd"
-	dopamd "${FILESDIR}/5.4/pam.d/"*
-}